diff options
| author | Alex Deucher <alex@t41p.hsd1.va.comcast.net> | 2007-09-24 23:01:20 -0400 |
|---|---|---|
| committer | Alex Deucher <alex@t41p.hsd1.va.comcast.net> | 2007-09-24 23:01:20 -0400 |
| commit | 21593d04d222b05dbba9abd31eaa3bfb91d999b6 (patch) | |
| tree | ad08cac8224f73157dd3c573f9e888b8510276c8 /src | |
| parent | 22cccb99d762567757d3fd38795f71e943f1faf9 (diff) | |
RADEON: more clean up of mode code
also print out LVDS mode info from bios for both
legacy and atom bioses
Diffstat (limited to 'src')
| -rw-r--r-- | src/radeon_bios.c | 18 | ||||
| -rw-r--r-- | src/radeon_modes.c | 16 |
2 files changed, 13 insertions, 21 deletions
diff --git a/src/radeon_bios.c b/src/radeon_bios.c index cb96022..48758c5 100644 --- a/src/radeon_bios.c +++ b/src/radeon_bios.c @@ -715,14 +715,6 @@ Bool RADEONGetLVDSInfoFromBIOS (xf86OutputPtr output) radeon_output->PanelPwrDly = 2000; radeon_output->Flags = 0; - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "LVDS Info:\n" - "XRes: %d, YRes: %d, DotClock: %d\n" - "HBlank: %d, HOverPlus: %d, HSyncWidth: %d\n" - "VBlank: %d, VOverPlus: %d, VSyncWidth: %d\n", - radeon_output->PanelXRes, radeon_output->PanelYRes, radeon_output->DotClock, - radeon_output->HBlank, radeon_output->HOverPlus, radeon_output->HSyncWidth, - radeon_output->VBlank, radeon_output->VOverPlus, radeon_output->VSyncWidth); } else { xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "No LVDS Info Table found in BIOS!\n"); @@ -793,6 +785,16 @@ Bool RADEONGetLVDSInfoFromBIOS (xf86OutputPtr output) } } } + + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, + "LVDS Info:\n" + "XRes: %d, YRes: %d, DotClock: %d\n" + "HBlank: %d, HOverPlus: %d, HSyncWidth: %d\n" + "VBlank: %d, VOverPlus: %d, VSyncWidth: %d\n", + radeon_output->PanelXRes, radeon_output->PanelYRes, radeon_output->DotClock, + radeon_output->HBlank, radeon_output->HOverPlus, radeon_output->HSyncWidth, + radeon_output->VBlank, radeon_output->VOverPlus, radeon_output->VSyncWidth); + return TRUE; } diff --git a/src/radeon_modes.c b/src/radeon_modes.c index af56cdf..51b5366 100644 --- a/src/radeon_modes.c +++ b/src/radeon_modes.c @@ -135,17 +135,10 @@ static DisplayModePtr RADEONFPNativeMode(xf86OutputPtr output) DisplayModePtr RADEONProbeOutputModes(xf86OutputPtr output) { - ScrnInfoPtr pScrn = output->scrn; RADEONOutputPrivatePtr radeon_output = output->driver_private; xf86MonPtr edid_mon; DisplayModePtr modes = NULL; -#if 0 - /* force reprobe */ - radeon_output->MonType = MT_UNKNOWN; - - RADEONConnectorFindMonitor(pScrn, output); -#endif ErrorF("in RADEONProbeOutputModes\n"); if (output->status == XF86OutputStatusConnected) { @@ -168,17 +161,14 @@ RADEONProbeOutputModes(xf86OutputPtr output) modes = xf86OutputGetEDIDModes (output); return modes; - } else + } else { /* add native panel mode */ modes = RADEONFPNativeMode(output); + return modes; + } } } - if (modes) { - xf86ValidateModesUserConfig(pScrn, modes); - xf86PruneInvalidModes(pScrn, &modes, FALSE); - } - return modes; } |