diff options
| -rw-r--r-- | man/radeon.man | 8 | ||||
| -rw-r--r-- | src/radeon.h | 5 | ||||
| -rw-r--r-- | src/radeon_driver.c | 1 | ||||
| -rw-r--r-- | src/radeon_modes.c | 39 | ||||
| -rw-r--r-- | src/radeon_output.c | 9 |
5 files changed, 17 insertions, 45 deletions
diff --git a/man/radeon.man b/man/radeon.man index 9168254..35dd701 100644 --- a/man/radeon.man +++ b/man/radeon.man @@ -383,14 +383,6 @@ case. This is only useful for LVDS panels (laptop internal panels). The default is .B on. .TP -.BI "Option \*qLVDSBiosNativeMode\*q \*q" boolean \*q -On some laptops, the LVDS mode from the timing tables in the bios does -not work properly. In those cases, a CVT mode seems to work better. -If you get a blank screen or have LVDS display problems, disable this -option to use a CVT mode. -The default is -.B on. -.TP .BI "Option \*qDRI\*q \*q" boolean \*q Enable DRI support. This option allows you to enable to disable the DRI. The default is diff --git a/src/radeon.h b/src/radeon.h index 6ee43b2..7f9ff76 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -157,8 +157,7 @@ typedef enum { #if defined(__powerpc__) OPTION_MAC_MODEL, #endif - OPTION_DEFAULT_TMDS_PLL, - OPTION_LVDS_BIOS_NATIVE_MODE + OPTION_DEFAULT_TMDS_PLL } RADEONOpts; @@ -817,8 +816,6 @@ typedef struct { RADEONMacModel MacModel; #endif - Bool LVDSBiosNativeMode; - Rotation rotation; void (*PointerMoved)(int, int, int); CreateScreenResourcesProcPtr CreateScreenResources; diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 9bb1933..8ebdd96 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -190,7 +190,6 @@ static const OptionInfoRec RADEONOptions[] = { #if defined(__powerpc__) { OPTION_MAC_MODEL, "MacModel", OPTV_STRING, {0}, FALSE }, #endif - { OPTION_LVDS_BIOS_NATIVE_MODE, "LVDSBiosNativeMode", OPTV_BOOLEAN, {0}, TRUE }, { -1, NULL, OPTV_NONE, {0}, FALSE } }; diff --git a/src/radeon_modes.c b/src/radeon_modes.c index e01c1e1..45e5169 100644 --- a/src/radeon_modes.c +++ b/src/radeon_modes.c @@ -104,29 +104,22 @@ static DisplayModePtr RADEONFPNativeMode(xf86OutputPtr output) radeon_output->PanelYRes != 0 && radeon_output->DotClock != 0) { - if (info->LVDSBiosNativeMode) { - new = xnfcalloc(1, sizeof (DisplayModeRec)); - sprintf(stmp, "%dx%d", radeon_output->PanelXRes, radeon_output->PanelYRes); - new->name = xnfalloc(strlen(stmp) + 1); - strcpy(new->name, stmp); - new->HDisplay = radeon_output->PanelXRes; - new->VDisplay = radeon_output->PanelYRes; - - new->HTotal = new->HDisplay + radeon_output->HBlank; - new->HSyncStart = new->HDisplay + radeon_output->HOverPlus; - new->HSyncEnd = new->HSyncStart + radeon_output->HSyncWidth; - new->VTotal = new->VDisplay + radeon_output->VBlank; - new->VSyncStart = new->VDisplay + radeon_output->VOverPlus; - new->VSyncEnd = new->VSyncStart + radeon_output->VSyncWidth; - - new->Clock = radeon_output->DotClock; - new->Flags = 0; - - } else { - /* Add native panel size */ - new = xf86CVTMode(radeon_output->PanelXRes, radeon_output->PanelYRes, 60.0, FALSE, FALSE); - - } + new = xnfcalloc(1, sizeof (DisplayModeRec)); + sprintf(stmp, "%dx%d", radeon_output->PanelXRes, radeon_output->PanelYRes); + new->name = xnfalloc(strlen(stmp) + 1); + strcpy(new->name, stmp); + new->HDisplay = radeon_output->PanelXRes; + new->VDisplay = radeon_output->PanelYRes; + + new->HTotal = new->HDisplay + radeon_output->HBlank; + new->HSyncStart = new->HDisplay + radeon_output->HOverPlus; + new->HSyncEnd = new->HSyncStart + radeon_output->HSyncWidth; + new->VTotal = new->VDisplay + radeon_output->VBlank; + new->VSyncStart = new->VDisplay + radeon_output->VOverPlus; + new->VSyncEnd = new->VSyncStart + radeon_output->VSyncWidth; + + new->Clock = radeon_output->DotClock; + new->Flags = 0; if (new) { new->type = M_T_DRIVER | M_T_PREFERRED; diff --git a/src/radeon_output.c b/src/radeon_output.c index 6acbb53..214167f 100644 --- a/src/radeon_output.c +++ b/src/radeon_output.c @@ -2450,15 +2450,6 @@ RADEONGetLVDSInfo (xf86OutputPtr output) } } - info->LVDSBiosNativeMode = TRUE; - if (!xf86ReturnOptValBool(info->Options, OPTION_LVDS_BIOS_NATIVE_MODE, TRUE)) { - info->LVDSBiosNativeMode = FALSE; - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using CVT mode for LVDS\n"); - } else { - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using LVDS Native Mode\n"); - } - - /* The panel size we collected from BIOS may not be the * maximum size supported by the panel. If not, we update * it now. These will be used if no matching mode can be |