diff options
| author | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-03-28 11:41:24 +0800 |
|---|---|---|
| committer | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-03-28 11:41:24 +0800 |
| commit | 7bba2c13310ed5ac22a355a3cc0ec8b7afaa79cf (patch) | |
| tree | 865e0bb230cdfb015ffb5a02d6e3786327c34f7c /src/i830_driver.c | |
| parent | b1f358ba97473b792ec2b7ed5170152faebe7262 (diff) | |
Disable DRI earlier if fb width > 2048
Diffstat (limited to 'src/i830_driver.c')
| -rw-r--r-- | src/i830_driver.c | 12 |
1 files 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); |