summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2010-04-08 22:21:01 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2010-04-08 22:21:01 +0200
commit3d7723526b181686d62f09f81fba3ccdbf7d2b1a (patch)
tree53da9b9026d39e103fd68e841a625c13b605b2f6
parentbdf0ee509c26ab35e60f3ed02549efa435be032f (diff)
Xv: fixup overlay stride confusion
For some reason I've made a mess out of the overlay stride constrains. Fix it up. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Tested-by: Calvin Walton <calvin.walton@gmail.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=27453
-rw-r--r--src/i830_video.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/i830_video.c b/src/i830_video.c
index 45213cb1..c6fd78d3 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -1348,9 +1348,12 @@ i830_setup_dst_params(ScrnInfoPtr scrn, intel_adaptor_private *adaptor_priv, sho
pitchAlignMask = 3;
} else {
if (IS_I965G(intel))
- pitchAlignMask = 255;
+ /* Actually the alignment is 64 bytes, too. But the
+ * stride must be at least 512 bytes. Take the easy fix
+ * and align on 512 bytes unconditionally. */
+ pitchAlignMask = 511;
else
- pitchAlignMask = 255;
+ pitchAlignMask = 63;
}
#if INTEL_XVMC