diff options
author | Kristian Høgsberg <krh@redhat.com> | 2008-12-06 19:19:21 -0500 |
---|---|---|
committer | Kristian Høgsberg <krh@redhat.com> | 2008-12-06 19:19:21 -0500 |
commit | 70af658d4e94cc372f9e9c831611f70b3c1cecab (patch) | |
tree | 97f6f8209f90d918ad491e9362a5228bc7d7e495 | |
parent | 3ad9c9a82d7b359b9b711070628e6ff07a2aa9f7 (diff) |
Simplify crtc preinit a bit.
-rw-r--r-- | src/i830_driver.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index 40312224..42ceb7cd 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -1475,9 +1475,6 @@ I830PreInitCrtcConfig(ScrnInfoPtr pScrn) I830Ptr pI830 = I830PTR(pScrn); int max_width, max_height; - if (pI830->use_drm_mode) - return; - /* check quirks */ i830_fixup_devices(pScrn); @@ -1869,14 +1866,13 @@ I830PreInit(ScrnInfoPtr pScrn, int flags) xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "VBIOS initialization failed.\n"); - I830PreInitCrtcConfig(pScrn); - if (pI830->use_drm_mode) { if (!I830DrmModeInit(pScrn)) return FALSE; } else { - if (!I830AccelMethodInit(pScrn)) - return FALSE; + I830PreInitCrtcConfig(pScrn); + if (!I830AccelMethodInit(pScrn)) + return FALSE; } I830XvInit(pScrn); |