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

[Chris Wilson]

 src/sna/kgem.c |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 723f17ca4f9c120be5fe667bf2c3e35c7ee687be
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Nov 5 18:36:45 2013 +0000

    sna: Submit execution on the bo before changing its caching status
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index cd2c9ac..fda92c1 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -6551,6 +6551,8 @@ bool kgem_bo_convert_to_gpu(struct kgem *kgem, struct kgem_bo *bo)
 
 	assert(bo->snoop);
 
+	kgem_bo_submit(kgem, bo);
+
 	if (!gem_set_caching(kgem->fd, bo->handle, UNCACHED))
 		return false;
 
commit 10b573c5084cabcc1bae70c8d35311fa5ec0a245
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Nov 5 18:29:46 2013 +0000

    sna: Clear snoop flag after converting from a CPU bo
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 3a74616..cd2c9ac 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -6549,5 +6549,11 @@ bool kgem_bo_convert_to_gpu(struct kgem *kgem, struct kgem_bo *bo)
 	if (kgem->has_llc)
 		return true;
 
-	return gem_set_caching(kgem->fd, bo->handle, UNCACHED);
+	assert(bo->snoop);
+
+	if (!gem_set_caching(kgem->fd, bo->handle, UNCACHED))
+		return false;
+
+	bo->snoop = false;
+	return true;
 }