xf86-video-intel: 2 commits - src/i830_memory.c

[Zhenyu Wang]

 src/i830_memory.c |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

New commits:
diff-tree 55ee46aebbf1ec1a8ce914fbd0c8894fc857db8f (from parents)
Merge: 5c720147e2b86ca4046b7c3812c1ca6b0fb78c9d 50aa09425f54c4eeca7f8b0fae9579209b10b9c4
Author: Wang Zhenyu <zhenyu.z.wang at intel.com>
Date:   Tue Mar 6 12:45:08 2007 +0800

    Merge branch 'master' of git://proxy.ims.intel.com:9419/git/xorg/driver/xf86-video-intel

diff-tree 5c720147e2b86ca4046b7c3812c1ca6b0fb78c9d (from d717d9d566fe3c0866b06840114e1c1990bd7be0)
Author: Wang Zhenyu <zhenyu.z.wang at intel.com>
Date:   Tue Mar 6 12:44:04 2007 +0800

    EXA: try to always alloc exa i965 state buffer in stolen mem
    
    I think this is a safe way to work around any possible chip
    error.

diff --git a/src/i830_memory.c b/src/i830_memory.c
index 5cddf17..7bcf48e 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -936,6 +936,20 @@ i830_allocate_2d_memory(ScrnInfoPtr pScr
 		   "Failed to allocate logical context space.\n");
 	return FALSE;
     }
+#ifdef I830_USE_EXA
+    if (pI830->useEXA) {
+	if (IS_I965G(pI830) && pI830->exa_965_state == NULL) {
+	    pI830->exa_965_state =
+		i830_allocate_memory(pScrn, "exa G965 state buffer",
+				     EXA_LINEAR_EXTRA, GTT_PAGE_SIZE, 0);
+	    if (pI830->exa_965_state == NULL) {
+		xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+			   "Failed to allocate exa state buffer for 965.\n");
+		return FALSE;
+	    }
+	}
+    }
+#endif
 
 #ifdef I830_XV
     /* Allocate overlay register space and optional XAA linear allocator
@@ -982,17 +996,6 @@ i830_allocate_2d_memory(ScrnInfoPtr pScr
 		return FALSE;
 	    }
 	}
-
-	if (IS_I965G(pI830) && pI830->exa_965_state == NULL) {
-	    pI830->exa_965_state =
-		i830_allocate_memory(pScrn, "exa G965 state buffer",
-				     EXA_LINEAR_EXTRA, GTT_PAGE_SIZE, 0);
-	    if (pI830->exa_965_state == NULL) {
-		xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-			   "Failed to allocate exa state buffer for 965.\n");
-		return FALSE;
-	    }
-	}
     }
 #endif /* I830_USE_EXA */