diff options
| author | Dave Airlie <airlied@linux.ie> | 2006-09-22 07:03:52 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-09-22 07:03:52 +1000 |
| commit | 75bf69c868be6164d0041a32f52244f1ef83e050 (patch) | |
| tree | c6da44baf419bbd04d646c9cc32dc6f474145f59 | |
| parent | 8ba5abd1329347c7fbf4b4d09c95da0d23b4884a (diff) | |
radeon: add simple map controllers call
| -rw-r--r-- | src/radeon.h | 3 | ||||
| -rw-r--r-- | src/radeon_display.c | 4 | ||||
| -rw-r--r-- | src/radeon_driver.c | 8 |
3 files changed, 11 insertions, 4 deletions
diff --git a/src/radeon.h b/src/radeon.h index 247cc6f9..e8cd54c8 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -878,7 +878,10 @@ extern Bool RADEONGetHardCodedEDIDFromBIOS (ScrnInfoPtr pScrn); extern void RADEONInitDispBandwidth(ScrnInfoPtr pScrn); extern Bool RADEONI2cInit(ScrnInfoPtr pScrn); extern void RADEONSetSyncRangeFromEdid(ScrnInfoPtr pScrn, int flag); +extern Bool RADEONMapControllers(ScrnInfoPtr pScrn); +extern void RADEONEnableDisplay(ScrnInfoPtr pScrn, RADEONController* pCRTC, BOOL bEnable); extern void RADEONGetPanelInfo(ScrnInfoPtr pScrn); +extern void RADEONGetTVDacAdjInfo(ScrnInfoPtr pScrn); extern void RADEONUnblank(ScrnInfoPtr pScrn); extern void RADEONBlank(ScrnInfoPtr pScrn); extern void RADEONDisplayPowerManagementSet(ScrnInfoPtr pScrn, diff --git a/src/radeon_display.c b/src/radeon_display.c index a6151f75..930c9b18 100644 --- a/src/radeon_display.c +++ b/src/radeon_display.c @@ -1267,6 +1267,10 @@ BOOL RADEONQueryConnectedMonitors(ScrnInfoPtr pScrn) return TRUE; } +Bool RADEONMapControllers(ScrnInfoPtr pScrn) +{ + return RADEONQueryConnectedMonitors(pScrn); +} /* * Powering done DAC, needed for DPMS problem with ViewSonic P817 (or its variant). diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 5ef7d15d..72cb22a7 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -3561,14 +3561,14 @@ static Bool RADEONPreInitXv(ScrnInfoPtr pScrn) static Bool RADEONPreInitControllers(ScrnInfoPtr pScrn, xf86Int10InfoPtr pInt10) { RADEONGetBIOSInfo(pScrn, pInt10); - if (!RADEONQueryConnectedMonitors(pScrn)) - goto fail; + + RADEONMapControllers(pScrn); + RADEONGetClockInfo(pScrn); + RADEONGetPanelInfo(pScrn); RADEONGetTVDacAdjInfo(pScrn); return TRUE; - fail: - return FALSE; } static void |