xf86-video-intel: src/i830_driver.c src/i965_render.c

Chris Wilson ickle at kemper.freedesktop.org
Mon Jun 21 14:30:05 PDT 2010


 src/i830_driver.c |    2 +-
 src/i965_render.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5bf470bd38b1f6a7a540585186a54c9dbbca98f9
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Jun 21 22:28:58 2010 +0100

    i965: Compile fix.
    
    Oops, I spent more time discussing these flushing bugs than I spent
    paying attention to what I was actually doing.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 91e5ac9..b8e0c0b 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -870,7 +870,7 @@ I830BlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
 		 */
 		intel_batch_submit(scrn,
 				   intel->need_mi_flush ||
-				   !list_is_empty(intel->flush_pixmaps));
+				   !list_is_empty(&intel->flush_pixmaps));
 		drmCommandNone(intel->drmSubFD, DRM_I915_GEM_THROTTLE);
 	}
 
diff --git a/src/i965_render.c b/src/i965_render.c
index e5b0916..9ba6105 100644
--- a/src/i965_render.c
+++ b/src/i965_render.c
@@ -1162,7 +1162,7 @@ static void i965_emit_composite_state(ScrnInfoPtr scrn)
 
 	/* Mark the destination dirty within this batch */
 	intel_batch_mark_pixmap_domains(intel,
-					i830_uxa_get_pixmap_intel(dest_picture),
+					i830_get_pixmap_intel(dest),
 					I915_GEM_DOMAIN_RENDER,
 					I915_GEM_DOMAIN_RENDER);
 


More information about the xorg-commit mailing list