xf86-video-intel: src/sna/sna_accel.c

Chris Wilson ickle at kemper.freedesktop.org
Fri Oct 18 09:28:24 PDT 2013


 src/sna/sna_accel.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit eedcac9a2d1e3ab7c6e35135995d960e55dcad54
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Oct 18 17:27:27 2013 +0100

    sna: Drop now obsolete assertion
    
    We no longer unconditionally clear the CPU hint when moving to the GPU
    for readonly updates, so we can no longer assert that the priv->cpu ==
    false afterwards.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index e909502..aadccb1 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -15613,10 +15613,8 @@ static void sna_accel_flush(struct sna *sna)
 
 	if (priv &&
 	    sna_pixmap_force_to_gpu(priv->pixmap,
-				    MOVE_READ | MOVE_ASYNC_HINT)) {
+				    MOVE_READ | MOVE_ASYNC_HINT))
 		kgem_scanout_flush(&sna->kgem, priv->gpu_bo);
-		assert(!priv->cpu);
-	}
 
 	sna_mode_redisplay(sna);
 	sna_accel_post_damage(sna);


More information about the xorg-commit mailing list