From 30bb719ca0abc2599ffb89e59f297fa9a0a00c3c Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 6 Mar 2007 12:23:43 -0800 Subject: 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. --- src/i830_driver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src') 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; -- cgit v1.2.3