diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-01-04 12:43:03 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-01-04 12:43:03 +1100 |
| commit | 249ec67c296b34d0c7c1d78602628d2f7ce6a045 (patch) | |
| tree | 8e7bca568a95748205e2065dd9fdb02bfcb3fea3 | |
| parent | a43c1d55f5f855d9e6ae939dd4eec1c607b6d514 (diff) | |
more minor fixes to get radeon up to speed
| -rw-r--r-- | src/radeon_display.c | 8 | ||||
| -rw-r--r-- | src/radeon_driver.c | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/radeon_display.c b/src/radeon_display.c index dcf65f2c..5e69def1 100644 --- a/src/radeon_display.c +++ b/src/radeon_display.c @@ -2465,15 +2465,15 @@ radeon_detect(xf86OutputPtr output) ScrnInfoPtr pScrn = output->scrn; RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); RADEONOutputPrivatePtr radeon_output = output->driver_private; -#if 0 + // RADEONConnectorFindMonitor(pScrn, id); - if (pRADEONEnt->PortInfo[id].MonType == MT_UNKNOWN) + if (radeon_output->MonType == MT_UNKNOWN) return XF86OutputStatusUnknown; - else if (pRADEONEnt->PortInfo[id].MonType == MT_NONE) + else if (radeon_output->MonType == MT_NONE) return XF86OutputStatusDisconnected; else return XF86OutputStatusConnected; -#endif + } static DisplayModePtr diff --git a/src/radeon_driver.c b/src/radeon_driver.c index fb0fa80c..ab9e9b7c 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -449,7 +449,7 @@ RADEONCreateScreenResources (ScreenPtr pScreen) if (!(*pScreen->CreateScreenResources)(pScreen)) return FALSE; - if (!RADEONRandRCreateScreenResources(pScreen)) + if (!xf86RandR12CreateScreenResources(pScreen)) return FALSE; return TRUE; @@ -2850,12 +2850,13 @@ static Bool RADEONPreInitControllers(ScrnInfoPtr pScrn, xf86Int10InfoPtr pInt10 RADEONGetBIOSInfo(pScrn, pInt10); + RADEONSetupConnectors(pScrn); + if (!info->IsSecondary) { if (!RADEONAllocateConnectors(pScrn)) return FALSE; } - RADEONSetupConnectors(pScrn); RADEONMapControllers(pScrn); RADEONGetClockInfo(pScrn); @@ -3220,7 +3221,7 @@ _X_EXPORT Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) info->directRenderingEnabled = RADEONPreInitDRI(pScrn); #endif - xf86CrtcSetSizeRange (pScrn, 320, 200, 16384, 2048); + xf86CrtcSetSizeRange (pScrn, 320, 200, 2048, 2048); if (!RADEONPreInitVRAM(pScrn)) goto fail; |