xf86-video-intel: src/intel_uxa.c

[Dave Airlie]

 src/intel_uxa.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 7a4bfaf42412f373bbc8ebe1536018dcacde7436
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Jul 20 11:30:44 2010 +1000

    intel: respect tiling disable.
    
    For testing purposes its nice to know tiling isn't being used anywhere.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/src/intel_uxa.c b/src/intel_uxa.c
index b75fe55..3c03ca7 100644
--- a/src/intel_uxa.c
+++ b/src/intel_uxa.c
@@ -949,6 +949,10 @@ intel_uxa_create_pixmap(ScreenPtr screen, int w, int h, int depth,
 		if (usage == UXA_CREATE_PIXMAP_FOR_MAP || usage == INTEL_CREATE_PIXMAP_TILING_NONE)
 			tiling = I915_TILING_NONE;
 
+		/* if tiling is off force to none */
+		if (!intel->tiling)
+			tiling = I915_TILING_NONE;
+
 		if (tiling != I915_TILING_NONE) {
 		    if (h <= 4)
 			tiling = I915_TILING_NONE;