xf86-video-intel: src/i830_memory.c

[Zhenyu Wang]

 src/i830_memory.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree b67adb6de34cede0e31f02f26cd5ec7b1adfa586 (from b5b243e4120d6a048fb6bbe8814fe3184271e9d9)
Author: Wang Zhenyu <zhenyu.z.wang at intel.com>
Date:   Fri Apr 13 22:34:52 2007 +0800

    Fix crash on G965 XAA with LinearAlloc option
    
    We should alloc xaa_linear mem in LinearAlloc case, otherwise
    we get crash when initializing xf86 fb manager.

diff --git a/src/i830_memory.c b/src/i830_memory.c
index b26dd00..315f4ba 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -651,7 +651,7 @@ i830_allocate_overlay(ScrnInfoPtr pScrn)
     I830Ptr pI830 = I830PTR(pScrn);
 
     /* Only allocate if overlay is going to be enabled. */
-    if (!pI830->XvEnabled || IS_I965G(pI830))
+    if (!pI830->XvEnabled)
 	return TRUE;
 
     if (!IS_I965G(pI830)) {