diff options
| author | Eric Anholt <eric@anholt.net> | 2007-03-06 12:23:43 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-03-06 12:23:43 -0800 |
| commit | 30bb719ca0abc2599ffb89e59f297fa9a0a00c3c (patch) | |
| tree | 5509d1b09a767277c2b48bbe9f12cca02fb55115 | |
| parent | 1e1b45fa6ed1683cba4ae73ac98933e74c3ab9d6 (diff) | |
Continue to allocate the legacy texture pool by default.
This is a partial revert of 7358642e64ab6d13bc1dc1a44703ee66d715ff61
If we don't allocate it now, when the DRM version is too low there won't be any
memory allocated and DRI will fail. Instead, waste the memory in the i915tex
case for now, and leave fixing it right (check DRM version up front and decide
which memory manager to set up) to later.
| -rw-r--r-- | src/i830_driver.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index a27d8058..1aa06b99 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -1234,14 +1234,13 @@ I830PreInit(ScrnInfoPtr pScrn, int flags) pI830->mmModeFlags = 0; if (!pI830->directRenderingDisabled) { + pI830->mmModeFlags = I830_KERNEL_TEX; #ifdef XF86DRI_MM Bool tmp = FALSE; if (!IS_I965G(pI830)) pI830->mmModeFlags |= I830_KERNEL_MM; - else #endif - pI830->mmModeFlags |= I830_KERNEL_TEX; from = X_PROBED; |