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

[Chris Wilson]

 src/sna/gen8_render.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit c6407f7380829f822a462100d26bc531aed0fd6f
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Jul 4 10:14:54 2014 +0100

    sna/gen8: Disable the unaligned check
    
    Note sure if this is strictly required -- but at the moment it fails for
    1x1R solids, causing us to skip glyphs. The simulator doesn't complain,
    so just skip the check for now.
    
    Reported-by: Ben Widawsky <ben at bwidawsk.net>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/gen8_render.c b/src/sna/gen8_render.c
index 3cdbfd5..2eb44a9 100644
--- a/src/sna/gen8_render.c
+++ b/src/sna/gen8_render.c
@@ -214,8 +214,10 @@ static inline bool too_large(int width, int height)
 	return width > GEN8_MAX_SIZE || height > GEN8_MAX_SIZE;
 }
 
-static bool unaligned(struct kgem_bo *bo, int bpp)
+static inline bool unaligned(struct kgem_bo *bo, int bpp)
 {
+	/* XXX What exactly do we need to meet H_ALIGN and V_ALIGN? */
+#if 0
 	int x, y;
 
 	if (bo->proxy == NULL)
@@ -241,6 +243,9 @@ static bool unaligned(struct kgem_bo *bo, int bpp)
 	    return true;
 
 	return false;
+#else
+	return false;
+#endif
 }
 
 static uint32_t gen8_get_blend(int op,