xf86-video-intel: 2 commits - src/sna/kgem.c src/sna/sna_dri2.c
Chris Wilson
ickle at kemper.freedesktop.org
Fri Jun 5 07:34:47 PDT 2015
src/sna/kgem.c | 3 +--
src/sna/sna_dri2.c | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 4a67c534ab756f0eab3b6125f603369804d32b82
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Jun 5 12:44:50 2015 +0100
sna: Fix definition for testing BLT with y-tiling
commit d1bf75f155f87d3a14d647316a0ba1f40d3957a6
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Jun 1 08:56:43 2015 +0000
sna: Compilation fixes for stable distros
caused an apparent regression by using the wrong ring for detecting
whether we could program the BCS tiling registers.
Reported-by: Sedat Dilek <sedat.dilek at gmail.com>
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index de604b0..2058364 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -140,7 +140,6 @@ search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags);
#define LOCAL_I915_PARAM_HAS_WT 27
#define LOCAL_I915_PARAM_MMAP_VERSION 30
-#define LOCAL_I915_EXEC_BLT (2<<0)
#define LOCAL_I915_EXEC_IS_PINNED (1<<10)
#define LOCAL_I915_EXEC_NO_RELOC (1<<11)
#define LOCAL_I915_EXEC_HANDLE_LUT (1<<12)
@@ -1400,7 +1399,7 @@ static bool test_can_blt_y(struct kgem *kgem)
memset(&execbuf, 0, sizeof(execbuf));
execbuf.buffers_ptr = (uintptr_t)&object;
execbuf.buffer_count = 1;
- execbuf.flags = LOCAL_I915_EXEC_BLT;
+ execbuf.flags = KGEM_BLT;
ret = do_ioctl(kgem->fd,
DRM_IOCTL_I915_GEM_EXECBUFFER2,
commit 7398cc4801d4afbb6231b2172c10cafde885a614
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Jun 5 12:44:50 2015 +0100
sna/dri2: Flag APPLY_DAMAGE for stable distros
commit d1bf75f155f87d3a14d647316a0ba1f40d3957a6
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Jun 1 08:56:43 2015 +0000
sna: Compilation fixes for stable distros
set the flag incorrectly - only future Xorg will do the damage
application itself.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c
index 1675c98..3f63273 100644
--- a/src/sna/sna_dri2.c
+++ b/src/sna/sna_dri2.c
@@ -328,7 +328,7 @@ inline static DRI2BufferPtr dri2_window_get_front(WindowPtr win)
}
#else
inline static void *dri2_window_get_front(WindowPtr win) { return NULL; }
-#define APPLY_DAMAGE 0
+#define APPLY_DAMAGE 1
#endif
#if DRI2INFOREC_VERSION < 6
More information about the xorg-commit
mailing list