Fix x width mapping when 720x480 mode is forced using -M1

ch7036_monitor.c

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <string.h>
@@ skipping 704 matching lines @@
   if (verbose)
     fprintf(stderr, "Found revision ID 0x%02x\n", 
             ch_read_reg(i2cdev, CH7036_REVID));
 
   if (gpiofile != NULL) {
     gpiodev = open(gpiofile, O_RDONLY);
     if (gpiodev < 0) {
       fprintf(stderr, "Could not open %s: %s\n", gpiofile, strerror(errno));
       exit(1);
     }
-  }
+  } else
+    gpiodev = 0;
 
   dpy = XOpenDisplay(":0.0");
   if (dpy == NULL) {
     fprintf(stderr, "%s: Can't open display :0.0\n", argv[0]);
     exit(1);
   }
   screen = DefaultScreen (dpy);
   root = RootWindow (dpy, screen);
   xmode = get_x_mode_info(dpy, root);
   if (verbose) showmode(xmode);
@@ skipping 137 matching lines @@
       if (verbose) {
         show_edid_data(stdout, &edid[0], 128, 0);
         if (edid[126] > 0)
           show_edid_data(stdout, &edid[128], 128, 128);
         show_edid(stdout, &edid[0], (edid[126] > 0) ? 1:0);
       }
       if (force_mode >= 0) {
         mon_timing = &known_modes[force_mode];
         aspect = find_aspect(mon_timing->ha, mon_timing->va);
         enable_audio = 1;
+        if (verbose) printf("Force mode %d with aspect %d\n",
+                            force_mode, aspect);
         why_res = "Mode forced on command line";
         why_aud = "Audio forced on";
       } else if ((forcen_x == 0) && 
           get_native(&edid[0], &prefer, &aspect, forcen_a, verbose)){
         mon_timing = &prefer;
         why_res = "preferred/native resolution requested in EDID";
      
         /* HDMI TVs tend to assume overscan (i.e. junk round the real frame)*/
         /* even when we tell them otherwise with the AVI INFO frame         */
         /* even if they set the 'underscan' flag that says they should      */
@@ skipping 24 matching lines @@
           printf("%s: Fall back to default output 640x480@60\n", argv[0]);
         why_res = "default resolution because nothing better was identified";
         /* First in table is default 640x480@60 */
         mon_timing = known_modes;
         aspect = ASPECT_4_3;
       }
       if (verbose) {
         show_ch_timing(&lcd_timing, "input (laptop lcd)");
         show_ch_timing(mon_timing, "output (hdmi port)");
       }
-      if (width_fix != NULL)
+      if ((width_fix != NULL) && (aspect >= 0))
         new_width = width_fix[aspect];
       else
         new_width = xmode->width;
 
       lcd_timing.ha = new_width;
       lcd_timing.ho = xmode->hSyncStart - new_width;
 
       set_ch7036_config(i2cdev);      
       err = GenTableCH7036(&lcd_timing, mon_timing, &reglist);
 
@@ skipping 29 matching lines @@
     ch_write_reg_sequence(i2cdev, reglist);
     ch_calculate_incs(i2cdev);
     ch_monitor_on(i2cdev);
     /* Audio requires HDMI selected rather than DVI */
     /* reset datapath (in monitor on) seems to zap this bit */
     if (enable_audio) {
       ch_write_reg(i2cdev, CH7036_PWRST5, 0x4);
     }
     hdmiOn = 1;
 
-    if (new_width != xmode->width)
+    if (new_width != xmode->width) {
+      if (verbose) printf("Change X active width to %d\n", new_width);
       set_x_size(dpy, root, new_width, xmode->height, 1, bwin);
+    }
     if (verbose) printf("Monitor should be on!\n");
     if ((edidlog = fopen(EDID_LOG, "w")) != NULL) {
       fprintf(edidlog, "HDMI output %dx%d%s. Use %dx%d on local LCD.\n",
               mon_timing->ha, mon_timing->va,
               (mon_timing->scale != MK_SCALE(0,0)) ? "(scaled)":"",
               new_width, xmode->height);
       fprintf(edidlog, "Use %s\n", why_res);
       fprintf(edidlog, "%s audio pass through because %s\n\n", 
               enable_audio ? "Enable" : "No", why_aud);
       fprintf(edidlog, "EDID Data read from HDMI:\n");
@@ skipping 30 matching lines @@
           }
           if (verbose) printf("Monitor back on with DPMS On\n");
           hdmiOn = 1;
         }
       }
       /* If we need a reload, don't wait! -- moved sleep to start for fw 1.2 */
       //      if (!needReload) sleep(5);
     } while (!needReload && ch_hdmi_detected(i2cdev));
     if (verbose) printf("Exit displaying needReload = %d, hdmiOn = %d\n", 
                         needReload, hdmiOn);
-    if (new_width != xmode->width)
+    if (new_width != xmode->width) {
+      if (verbose) printf("Change X active width to %d\n", xmode->width);
       set_x_size(dpy, root, xmode->width, xmode->height, 0, bwin);
+    }
     if (hdmiOn && !needReload) {
       ch_monitor_off_keep_ddc(i2cdev);
       hdmiOn = 0;
       if (verbose) printf("Monitor should be off!\n");
       sleep(YIELD_CHRONTEL_TURN_OFF_SECS);
     }
   }
   close(i2cdev);
   return 0;
 }