diff options
| author | Dave Airlie <airlied@linux.ie> | 2006-09-23 07:19:43 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-09-23 07:19:43 +1000 |
| commit | 6f63b3dc8b3e2299f5f02abc1c565176d2d46cee (patch) | |
| tree | 00d9215f77855fed6baeec995edf210ef57a8fbb /src/radeon_display.c | |
| parent | c9f3ced3b1c194cacf1ab9436ee6c2d4efd3a8e9 (diff) | |
radeon: some minor alignments and cleanups for info->
Diffstat (limited to 'src/radeon_display.c')
| -rw-r--r-- | src/radeon_display.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/src/radeon_display.c b/src/radeon_display.c index cf2d1ef4..5207e125 100644 --- a/src/radeon_display.c +++ b/src/radeon_display.c @@ -921,12 +921,7 @@ BOOL RADEONQueryConnectedMonitors(ScrnInfoPtr pScrn) unsigned char *RADEONMMIO = info->MMIO; const char *s; Bool ignore_edid = FALSE; - int i = 0, second = 0, max_mt; - - - - max_mt = 5; - + int i = 0, second = 0, max_mt = 5; /* We first get the information about all connectors from BIOS. * This is how the card is phyiscally wired up. @@ -962,6 +957,7 @@ BOOL RADEONQueryConnectedMonitors(ScrnInfoPtr pScrn) pRADEONEnt->PortInfo[1].TMDSType = TMDS_EXT; pRADEONEnt->PortInfo[1].ConnectorType = CONNECTOR_CRT; + /* Some cards have the DDC lines swapped and we have no way to * detect it yet (Mac cards) */ @@ -1143,7 +1139,6 @@ BOOL RADEONQueryConnectedMonitors(ScrnInfoPtr pScrn) pRADEONEnt->Controller[0].pPort = &pRADEONEnt->PortInfo[0]; pRADEONEnt->Controller[1].pPort = &pRADEONEnt->PortInfo[1]; - info->MergeType = MT_NONE; info->DisplayType = pRADEONEnt->Controller[0].pPort->MonType; xf86DrvMsg(pScrn->scrnIndex, X_INFO, @@ -1215,6 +1210,8 @@ Bool RADEONMapControllers(ScrnInfoPtr pScrn) RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); unsigned char *RADEONMMIO = info->MMIO; + info->MergeType = MT_NONE; + if (!info->IsSecondary) { RADEONQueryConnectedMonitors(pScrn); @@ -1316,6 +1313,17 @@ Bool RADEONMapControllers(ScrnInfoPtr pScrn) xf86DrvMsg(pScrn->scrnIndex, X_INFO, "---- Secondary Head: Not used ----\n"); } + info->HBlank = 0; + info->HOverPlus = 0; + info->HSyncWidth = 0; + info->VBlank = 0; + info->VOverPlus = 0; + info->VSyncWidth = 0; + info->DotClock = 0; + info->UseBiosDividers = FALSE; + + info->OverlayOnCRTC2 = FALSE; + return TRUE; } |