From 7bba2c13310ed5ac22a355a3cc0ec8b7afaa79cf Mon Sep 17 00:00:00 2001 From: Zhenyu Wang Date: Fri, 28 Mar 2008 11:41:24 +0800 Subject: [PATCH] Disable DRI earlier if fb width > 2048 --- src/i830_driver.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/i830_driver.c b/src/i830_driver.c index 94f07125..a19c8ebf 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -2685,6 +2685,12 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) pScrn->videoRam &= ~3; } + if (!IS_I965G(pI830) && pScrn->displayWidth > 2048) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Cannot support DRI with frame buffer width > 2048.\n"); + pI830->directRenderingDisabled = TRUE; + } + #ifdef XF86DRI /* If DRI hasn't been explicitly disabled, try to initialize it. * It will be used by the memory allocator. @@ -2762,12 +2768,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) pI830->XvEnabled = !pI830->XvDisabled; #endif - if (!IS_I965G(pI830) && pScrn->displayWidth > 2048) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Cannot support DRI with frame buffer width > 2048.\n"); - pI830->tiling = FALSE; - pI830->directRenderingEnabled = FALSE; - } /* Need MMIO mapped to do GTT lookups during memory allocation. */ I830MapMMIO(pScrn);