]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
staging/xgifb: Remove unsupported mode LCD_320x480
authorPeter Huewe <peterhuewe@gmx.de>
Sun, 15 Jan 2012 19:34:52 +0000 (20:34 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Feb 2012 17:21:55 +0000 (09:21 -0800)
This patch removes the probed mode LCD_320x480 which isn't supported
anyway since this mode falls through to the default (=invalid) mode in
the
XGIfb_validate_mode function (see line 529 ff. for details. the
commented out code for this mode is also removed).

By removing this assignment, we can use the LCD_TYPEs from the sis
driver without modifications.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/xgifb/XGI_main_26.c

index 2502c49c9c5b35efcaed87364064e3d80df4f07d..e618aa6d63b96cf74422b8a4f99fda6ca767aada 100644 (file)
@@ -526,12 +526,6 @@ static int XGIfb_validate_mode(struct xgifb_video_info *xgifb_info, int myindex)
                        xres = 1600;
                        yres = 1200;
                        break;
-               /* case LCD_320x480: */ /* TW: FSTN */
-                       /*
-                       xres =  320;
-                       yres =  480;
-                       break;
-                       */
                default:
                        xres = 0;
                        yres = 0;
@@ -2117,10 +2111,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
                        reg = xgifb_reg_get(XGICR, IND_XGI_LCD_PANEL);
                        reg &= 0x0f;
                        hw_info->ulCRT2LCDType = XGI310paneltype[reg];
-
-               } else {
-                       /* TW: FSTN/DSTN */
-                       hw_info->ulCRT2LCDType = LCD_320x480;
                }
        }