Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / drivers / video / nvidia / nv_setup.c

diff --git a/drivers/video/nvidia/nv_setup.c b/drivers/video/nvidia/nv_setup.c
index 61dc46f..a18a9ae 100644 (file)
--- a/drivers/video/nvidia/nv_setup.c
+++ b/drivers/video/nvidia/nv_setup.c
@@ -359,7 +359,6 @@ int NVCommonSetup(struct fb_info *info)
        case 0x0186:
        case 0x0187:
        case 0x018D:
-       case 0x0228:
        case 0x0286:
        case 0x028C:
        case 0x0316:
@@ -383,10 +382,6 @@ int NVCommonSetup(struct fb_info *info)
        case 0x034C:
        case 0x0160:
        case 0x0166:
-       case 0x0169:
-       case 0x016B:
-       case 0x016C:
-       case 0x016D:
        case 0x00C8:
        case 0x00CC:
        case 0x0144:
@@ -644,23 +639,12 @@ int NVCommonSetup(struct fb_info *info)
                par->fpHeight = NV_RD32(par->PRAMDAC, 0x0800) + 1;
                par->fpSyncs = NV_RD32(par->PRAMDAC, 0x0848) & 0x30000033;
 
-               printk("nvidiafb: Panel size is %i x %i\n", par->fpWidth, par->fpHeight);
+               printk("Panel size is %i x %i\n", par->fpWidth, par->fpHeight);
        }
 
        if (monA)
                info->monspecs = *monA;
 
-       if (!par->FlatPanel || !par->twoHeads)
-               par->FPDither = 0;
-
-       par->LVDS = 0;
-       if (par->FlatPanel && par->twoHeads) {
-               NV_WR32(par->PRAMDAC0, 0x08B0, 0x00010004);
-               if (par->PRAMDAC0[0x08b4] & 1)
-                       par->LVDS = 1;
-               printk("nvidiafb: Panel is %s\n", par->LVDS ? "LVDS" : "TMDS");
-       }
-
        kfree(edidA);
        kfree(edidB);
 done: