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

Chris Wilson ickle at kemper.freedesktop.org
Sun Jul 21 12:43:29 PDT 2013


 src/sna/sna_accel.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2737aaab77cc6233826077b90d001fe45efc376c
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Jul 21 20:42:37 2013 +0100

    sna: Missing git add to fix typo in assert() from last commit
    
    I915_TILING != I915_TILING_Y
    
    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 367a56b..70d51c2 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -3980,7 +3980,7 @@ create_upload_tiled_x(struct kgem *kgem,
 		return false;
 
 	tiling = sna_pixmap_choose_tiling(pixmap, I915_TILING_X);
-	assert(tiling != I915_TILING && tiling != -I915_TILING_Y);
+	assert(tiling != I915_TILING_Y && tiling != -I915_TILING_Y);
 
 	assert(priv->gpu_bo == NULL);
 	assert(priv->gpu_damage == NULL);


More information about the xorg-commit mailing list