Simplify crtc preinit a bit.

This commit is contained in:
Kristian Høgsberg 2008-12-06 19:19:21 -05:00
parent 3ad9c9a82d
commit 70af658d4e
1 changed files with 3 additions and 7 deletions

View File

@ -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);