xf86-video-intel: 2 commits - src/sna/kgem.c src/xvmc/Makefile.am

[Chris Wilson]

 src/sna/kgem.c       |    3 +++
 src/xvmc/Makefile.am |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 8d3b5ea135fd8f16da2cbfb98041e32c7001a38f
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Nov 9 15:31:03 2012 +0000

    xvmc: Use DRMINTEL_LIBS instead of hardcoding -ldrm_intel
    
    Reported-by: Maarten Lankhorst <maarten.lankhorst at canonical.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/xvmc/Makefile.am b/src/xvmc/Makefile.am
index d3ed449..36a939b 100644
--- a/src/xvmc/Makefile.am
+++ b/src/xvmc/Makefile.am
@@ -20,4 +20,4 @@ AM_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
 	@XVMCLIB_CFLAGS@ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
 
 libIntelXvMC_la_LDFLAGS = -version-number 1:0:0
-libIntelXvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ -lpthread -ldrm_intel
+libIntelXvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ @DRMINTEL_LIBS@ -lpthread
commit f040b97b01495aa43f7771ebb8ca5c0d44038bc1
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Nov 8 23:42:10 2012 +0000

    sna: Mark no-reloc write buffers
    
    If we bypass the relocation processing, we also then bypass the
    pending-write analysis, so we need to supply those to the kernel
    ourselves (to maintain gpu-cpu coherency).
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index e2c5da8..f22febd 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -114,6 +114,8 @@ search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags);
 #define LOCAL_I915_EXEC_NO_RELOC		(1<<10)
 #define LOCAL_I915_EXEC_HANDLE_LUT		(1<<11)
 
+#define LOCAL_EXEC_OBJECT_WRITE			(1<<1)
+
 #define LOCAL_I915_GEM_USERPTR       0x32
 #define LOCAL_IOCTL_I915_GEM_USERPTR DRM_IOWR (DRM_COMMAND_BASE + LOCAL_I915_GEM_USERPTR, struct local_i915_gem_userptr)
 struct local_i915_gem_userptr {
@@ -3926,6 +3928,7 @@ uint32_t kgem_add_reloc(struct kgem *kgem,
 
 		if (read_write_domain & 0x7ff) {
 			assert(!bo->snoop || kgem->can_blt_cpu);
+			bo->exec->flags |= LOCAL_EXEC_OBJECT_WRITE;
 			kgem_bo_mark_dirty(bo);
 		}