summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-08-12 13:01:24 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2012-08-12 13:02:27 +0100
commit2f4de90709264ad19a3e3f5f0f79f4bba78a760a (patch)
tree28a0e19187d73a5797a3b197b737220169dc71b3
parent4d3cafc99ab49da6744046bc2004981144cb064d (diff)
downloadxorg-driver-xf86-video-intel-2f4de90709264ad19a3e3f5f0f79f4bba78a760a.tar.gz
uxa: Only emit a warning if we fail to tile the frontbuffer and the hw allows
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/intel_memory.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/intel_memory.c b/src/intel_memory.c
index bb7710f9..f08ebdd0 100644
--- a/src/intel_memory.c
+++ b/src/intel_memory.c
@@ -264,10 +264,12 @@ retry:
return NULL;
}
- if ((intel->tiling & INTEL_TILING_FB) && tiling_mode != I915_TILING_X) {
+ /* If we could have used tiling but failed, warn */
+ if (intel->tiling & INTEL_TILING_FB &&
+ tiling_mode != I915_TILING_X &&
+ intel_check_display_stride(scrn, pitch, I915_TILING_X))
xf86DrvMsg(scrn->scrnIndex, X_WARNING,
"Failed to set tiling on frontbuffer.\n");
- }
xf86DrvMsg(scrn->scrnIndex, X_INFO,
"Allocated new frame buffer %dx%d stride %ld, %s\n",