xf86-video-intel: Branch 'modesetting' - 2 commits - src/i830_xaa.c src/i965_render.c

[Eric Anholt]

 src/i830_xaa.c    |   24 ++++++++++++------------
 src/i965_render.c |    6 +++---
 2 files changed, 15 insertions(+), 15 deletions(-)

New commits:
diff-tree 351866b0328b1d7afdc6b414c77d9ab4da4bd085 (from 96783a458957ca280ebb6275fa692dd415df6931)
Author: Eric Anholt <eric at anholt.net>
Date:   Wed Jan 31 15:48:52 2007 -0800

    Sync before overwriting Render acceleration state on the 965.

diff --git a/src/i965_render.c b/src/i965_render.c
index 5ff174d..266b461 100644
--- a/src/i965_render.c
+++ b/src/i965_render.c
@@ -552,10 +552,10 @@ i965_prepare_composite(int op, PicturePt
     urb_cs_start = urb_sf_start + urb_sf_size;
     urb_cs_size = URB_CS_ENTRIES * URB_CS_ENTRY_SIZE;
 
-    /* We'll be poking the state buffers that could be in use by the 3d
-     * hardware here, but we should have synced the 3D engine already in
-     * I830PutImage. XXX
+    /* Because we only have a single static buffer for our state currently,
+     * we have to sync before updating it every time.
      */
+    i830WaitSync(pScrn);
 
     memset (cc_viewport, 0, sizeof (*cc_viewport));
     cc_viewport->min_depth = -1.e35;
diff-tree 96783a458957ca280ebb6275fa692dd415df6931 (from 5238ff9c80718f9f8baa06123aa1bb6e3193fce6)
Author: Eric Anholt <eric at anholt.net>
Date:   Wed Jan 31 15:48:02 2007 -0800

    Fix copy-and-paste-o in the render code cleanup that broke XAA.

diff --git a/src/i830_xaa.c b/src/i830_xaa.c
index dbe1521..5ef5d3c 100644
--- a/src/i830_xaa.c
+++ b/src/i830_xaa.c
@@ -243,22 +243,22 @@ I830XAAInit(ScreenPtr pScreen)
 	if (IS_I865G(pI830) || IS_I855(pI830) ||
 	    IS_845G(pI830) || IS_I830(pI830))
 	{
-	    pI830->EXADriverPtr->CheckComposite = i830_check_composite;
-	    pI830->EXADriverPtr->PrepareComposite = i830_prepare_composite;
-	    pI830->EXADriverPtr->Composite = i830_composite;
-	    pI830->EXADriverPtr->DoneComposite = i830_done_composite;
+	    pI830->xaa_check_composite = i830_check_composite;
+	    pI830->xaa_prepare_composite = i830_prepare_composite;
+	    pI830->xaa_composite = i830_composite;
+	    pI830->xaa_done_composite = i830_done_composite;
 	} else if (IS_I915G(pI830) || IS_I915GM(pI830) ||
 		   IS_I945G(pI830) || IS_I945GM(pI830))
 	{
-	    pI830->EXADriverPtr->CheckComposite = i915_check_composite;
-	    pI830->EXADriverPtr->PrepareComposite = i915_prepare_composite;
-	    pI830->EXADriverPtr->Composite = i830_composite;
-	    pI830->EXADriverPtr->DoneComposite = i830_done_composite;
+	    pI830->xaa_check_composite = i915_check_composite;
+	    pI830->xaa_prepare_composite = i915_prepare_composite;
+	    pI830->xaa_composite = i830_composite;
+	    pI830->xaa_done_composite = i830_done_composite;
 	} else {
-	    pI830->EXADriverPtr->CheckComposite = i965_check_composite;
-	    pI830->EXADriverPtr->PrepareComposite = i965_prepare_composite;
-	    pI830->EXADriverPtr->Composite = i965_composite;
-	    pI830->EXADriverPtr->DoneComposite = i830_done_composite;
+	    pI830->xaa_check_composite = i965_check_composite;
+	    pI830->xaa_prepare_composite = i965_prepare_composite;
+	    pI830->xaa_composite = i965_composite;
+	    pI830->xaa_done_composite = i830_done_composite;
 	}
 
 	pI830->saved_composite = ps->Composite;