summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2011-11-05 19:46:13 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2011-11-05 19:43:34 +0000
commite2165f0e6b0620e3d788546924a2174506fbbde5 (patch)
treec02d60a375c7327fdec0b73951688536107aaf78
parentc5d94b21d5c65dcae3e294412a8f20bad347a6d8 (diff)
sna: For a 32k max window size, we need to handle up to 128k strides
Reported-by: Clemens Eisserer <linuxhippy@gmail.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=42619 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/blt.c2
-rw-r--r--src/sna/kgem.h2
-rw-r--r--src/sna/sna.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/sna/blt.c b/src/sna/blt.c
index 3b07d834..075ac8a1 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 70a58106..3c4ad002 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 ce9992b5..9d0b7070 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);