xf86-video-intel: src/i830_memory.c

[Zhenyu Wang]

 src/i830_memory.c |   22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 deletions(-)

New commits:
diff-tree 138ac8f36cb4e4b3776f313955372522646acbb2 (from 0cd524e5411e35c8483c02ecc5062625809e6fc6)
Author: Wang Zhenyu <zhenyu.z.wang at intel.com>
Date:   Sun Apr 29 14:43:19 2007 +0800

    Alloc state mem buffer on 965G for xaa rotation
    
    965G needs state mem buffer to setup render pipeline.
    Thanks Barry Scrott for report this.

diff --git a/src/i830_memory.c b/src/i830_memory.c
index 15d241b..268d6c5 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -957,20 +957,18 @@ 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;
-	    }
+
+    /* even in XAA, 965G needs state mem buffer for rendering */
+    if (IS_I965G(pI830) && !pI830->noAccel && 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