xf86-video-intel: 2 commits - src/i830_batchbuffer.c src/i965_render.c

[Chris Wilson]

 src/i830_batchbuffer.c |    9 ++++++++-
 src/i965_render.c      |    2 --
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit a6fb6aa5f9c1c81b8b81b9d1138a526ffbbd5ad3
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed May 26 20:31:45 2010 +0100

    Add vertex bo to the list of buffers to be torn down.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/i830_batchbuffer.c b/src/i830_batchbuffer.c
index 69961c6..54a85d6 100644
--- a/src/i830_batchbuffer.c
+++ b/src/i830_batchbuffer.c
@@ -93,14 +93,21 @@ void intel_batch_teardown(ScrnInfoPtr scrn)
 {
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-	if (intel->batch_ptr != NULL) {
+	if (intel->batch_bo != NULL) {
 		dri_bo_unreference(intel->batch_bo);
 		intel->batch_bo = NULL;
+	}
 
+	if (intel->last_batch_bo != NULL) {
 		dri_bo_unreference(intel->last_batch_bo);
 		intel->last_batch_bo = NULL;
 	}
 
+	if (intel->vertex_bo) {
+		dri_bo_unreference(intel->vertex_bo);
+		intel->vertex_bo = NULL;
+	}
+
 	while (!list_is_empty(&intel->batch_pixmaps)) {
 		struct intel_pixmap *entry;
 
commit 5dce69002dd48dd6dce4f0e7ad9ecf2c4c17cfe4
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed May 26 20:26:42 2010 +0100

    i965: Remove ATOMIC_BATCH.
    
    This paranoid check is deceased; pining for the fjords.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/i965_render.c b/src/i965_render.c
index 843776d..4f68b04 100644
--- a/src/i965_render.c
+++ b/src/i965_render.c
@@ -1234,9 +1234,7 @@ static void i965_emit_composite_state(ScrnInfoPtr scrn)
 		/* Ironlake errata workaround: Before disabling the clipper,
 		 * you have to MI_FLUSH to get the pipeline idle.
 		 */
-		ATOMIC_BATCH(1);
 		OUT_BATCH(MI_FLUSH);
-		ADVANCE_BATCH();
 	}
 
 	{