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

[Chris Wilson]

 src/sna/kgem.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b4ae6dbaedd774f250b610b1e7323897c4abe23a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jan 10 21:25:28 2012 +0000

    sna: Align the small upload buffers to 2 texels, and the pitch to dwords
    
    References: https://bugs.freedesktop.org/show_bug.cgi?id=44150
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 1700bdb..27d271d 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -3036,7 +3036,7 @@ struct kgem_bo *kgem_create_buffer_2d(struct kgem *kgem,
 	struct kgem_bo *bo;
 	int stride;
 
-	stride = width * bpp >> 3;
+	stride = ALIGN(width, 2) * bpp >> 3;
 	stride = ALIGN(stride, 4);
 
 	bo = kgem_create_buffer(kgem, stride * ALIGN(height, 2), flags, ret);
commit 46f6c6917effbc43305367581cc1bbaa962c0251
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jan 10 20:34:09 2012 +0000

    sna: A partial read buffer is allowed to be in the GPU domain
    
    As we can create the read buffer from an active cached bo, it may
    already be in the GPU domain by the time we first finish it, so fix the
    broken assertion.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index c30c79b..1700bdb 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -1139,12 +1139,12 @@ static void kgem_finish_partials(struct kgem *kgem)
 	struct kgem_partial_bo *bo, *next;
 
 	list_for_each_entry_safe(bo, next, &kgem->partial, base.list) {
-		assert(bo->base.domain != DOMAIN_GPU);
 		if (!bo->write) {
 			assert(bo->base.exec);
 			goto decouple;
 		}
 
+		assert(bo->base.domain != DOMAIN_GPU);
 		if (!bo->base.exec)
 			continue;