summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-07-20 11:30:44 +1000
committerDave Airlie <airlied@redhat.com>2010-07-20 11:31:48 +1000
commit7a4bfaf42412f373bbc8ebe1536018dcacde7436 (patch)
tree4c9a21157cc3a7b735a6a20856a66c8034dd93b0
parentd48d584a822ae5adae64f6d5f09faa4ac9b8de73 (diff)
intel: respect tiling disable.
For testing purposes its nice to know tiling isn't being used anywhere. Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--src/intel_uxa.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/intel_uxa.c b/src/intel_uxa.c
index b75fe55a..3c03ca77 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;