xf86-video-intel: 2 commits - src/sna/blt.c src/sna/sna_accel.c
Chris Wilson
ickle at kemper.freedesktop.org
Wed Nov 6 10:43:18 CET 2013
src/sna/blt.c | 2 +-
src/sna/sna_accel.c | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit c3d5b1d8fcb1b65c35827d38bf5b309e433d0907
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Wed Nov 6 09:40:56 2013 +0000
sna: Move initialisation of loop counter to common code
It was only being defined in x86-64 and left unitialized for x86-32.
Fixes regression from
commit 587c4866652e40e1e228b333028114766a6d3b08
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Nov 4 15:10:40 2013 +0000
sna: Promote uint16_t to a full int to avoid overflow in computing w*h in memcpy_xor
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71286
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/blt.c b/src/sna/blt.c
index 4843a41..f861f65 100644
--- a/src/sna/blt.c
+++ b/src/sna/blt.c
@@ -1000,13 +1000,13 @@ memcpy_xor(const void *src, void *dst, int bpp,
or |= or << 16;
}
case 4:
-#if USE_SSE2
w = width;
if (w * 4 == dst_stride && dst_stride == src_stride) {
w *= height;
height = 1;
}
+#if USE_SSE2
if (have_sse2()) {
do {
uint32_t *d = (uint32_t *)dst_bytes;
commit 1a31335954b4d244d10e2594ae00e60762536a77
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Wed Nov 6 09:05:05 2013 +0000
sna: Clear the execlist if we completely unwind a batch after using 8x8 tiling
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 3176a77..1ac926f 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -15151,6 +15151,8 @@ skip:
if (sna->kgem.nbatch == unwind_batch + 8) {
sna->kgem.nbatch = unwind_batch;
sna->kgem.nreloc = unwind_reloc;
+ if (sna->kgem.nbatch == 0)
+ kgem_bo_undo(&sna->kgem, bo);
}
assert_pixmap_damage(pixmap);
More information about the xorg-commit
mailing list