diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2006-09-18 02:28:32 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-09-18 06:19:47 +1000 |
| commit | 9b5c4cf8a98b0c20bb821f5003495481fbd0c10c (patch) | |
| tree | 1187aef39f8b5e9212a510357e3dd991ec2febd3 /src/radeon_driver.c | |
| parent | 311e776c4429485d29aaf11d350cab8e6fe7564b (diff) | |
radeon: add pre init controller function
Diffstat (limited to 'src/radeon_driver.c')
| -rw-r--r-- | src/radeon_driver.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 0a6bbd9..30f7ad5 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -3556,6 +3556,18 @@ static Bool RADEONPreInitXv(ScrnInfoPtr pScrn) return TRUE; } +static Bool RADEONPreInitControllers(ScrnInfoPtr pScrn, xf86Int10InfoPtr pInt10) +{ + RADEONGetBIOSInfo(pScrn, pInt10); + if (!RADEONQueryConnectedMonitors(pScrn)) + goto fail; + RADEONGetClockInfo(pScrn); + + return TRUE; + fail: + return FALSE; +} + static void RADEONProbeDDC(ScrnInfoPtr pScrn, int indx) { @@ -3879,9 +3891,8 @@ _X_EXPORT Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) RADEONPreInitDDC(pScrn); - RADEONGetBIOSInfo(pScrn, pInt10); - if (!RADEONQueryConnectedMonitors(pScrn)) goto fail; - RADEONGetClockInfo(pScrn); + if (!RADEONPreInitControllers(pScrn, pInt10)) + goto fail; /* collect MergedFB options */ /* only parse mergedfb options on the primary head. |