xf86-video-intel: src/i830_video.c

[Daniel Vetter]

 src/i830_video.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 3d7723526b181686d62f09f81fba3ccdbf7d2b1a
Author: Daniel Vetter <daniel.vetter at ffwll.ch>
Date:   Thu Apr 8 22:21:01 2010 +0200

    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 at ffwll.ch>
    Tested-by: Calvin Walton <calvin.walton at gmail.com>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=27453

diff --git a/src/i830_video.c b/src/i830_video.c
index 45213cb..c6fd78d 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