xf86-video-intel: src/sna/blt.c src/sna/kgem.h src/sna/sna.h

[Chris Wilson]

 src/sna/blt.c  |    2 +-
 src/sna/kgem.h |    2 +-
 src/sna/sna.h  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e2165f0e6b0620e3d788546924a2174506fbbde5
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Nov 5 19:46:13 2011 +0000

    sna: For a 32k max window size, we need to handle up to 128k strides
    
    Reported-by: Clemens Eisserer <linuxhippy at gmail.com>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=42619
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/blt.c b/src/sna/blt.c
index 3b07d83..075ac8a 100644
--- a/src/sna/blt.c
+++ b/src/sna/blt.c
@@ -38,7 +38,7 @@
 
 void
 memcpy_blt(const void *src, void *dst, int bpp,
-	   uint16_t src_stride, uint16_t dst_stride,
+	   uint32_t src_stride, uint32_t dst_stride,
 	   int16_t src_x, int16_t src_y,
 	   int16_t dst_x, int16_t dst_y,
 	   uint16_t width, uint16_t height)
diff --git a/src/sna/kgem.h b/src/sna/kgem.h
index 70a5810..3c4ad00 100644
--- a/src/sna/kgem.h
+++ b/src/sna/kgem.h
@@ -64,7 +64,7 @@ struct kgem_bo {
 	uint32_t size;
 	uint32_t delta;
 
-	uint32_t pitch : 16;
+	uint32_t pitch : 20; /* max 128k */
 	uint32_t tiling : 2;
 	uint32_t reusable : 1;
 	uint32_t dirty : 1;
diff --git a/src/sna/sna.h b/src/sna/sna.h
index ce9992b..9d0b707 100644
--- a/src/sna/sna.h
+++ b/src/sna/sna.h
@@ -641,7 +641,7 @@ sna_compute_composite_region(RegionPtr region,
 
 void
 memcpy_blt(const void *src, void *dst, int bpp,
-	   uint16_t src_stride, uint16_t dst_stride,
+	   uint32_t src_stride, uint32_t dst_stride,
 	   int16_t src_x, int16_t src_y,
 	   int16_t dst_x, int16_t dst_y,
 	   uint16_t width, uint16_t height);