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

[Chris Wilson]

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

New commits:
commit 5913c90967091124e7c7b262782f0e99cf400eab
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Sep 22 17:13:20 2011 +0100

    sna/accel: fix assert to include the offset of copy
    
    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 4463038..1f06f03 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1273,8 +1273,8 @@ sna_copy_boxes(DrawablePtr src, DrawablePtr dst, GCPtr gc,
 				stride = src_pixmap->devKind;
 				bits = src_pixmap->devPrivate.ptr;
 				bits += (src_dy + box->y1) * stride + (src_dx + box->x1) * bpp / 8;
-				assert(src_dy + dst_pixmap->drawable.height <= src_pixmap->drawable.height);
-				assert(src_dx + dst_pixmap->drawable.width <= src_pixmap->drawable.width);
+				assert(src_dy + box->y1 + dst_pixmap->drawable.height <= src_pixmap->drawable.height);
+				assert(src_dx + box->x1 + dst_pixmap->drawable.width <= src_pixmap->drawable.width);
 
 				dst_priv->gpu_bo =
 					sna_replace(sna,
commit 31857068026138fe5edd8656381fc1ae59d3058b
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Sep 22 17:12:53 2011 +0100

    sna: move an assert
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 4a73971..b5c342d 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -562,7 +562,6 @@ static void __kgem_bo_destroy(struct kgem *kgem, struct kgem_bo *bo)
 		list_add(&bo->request, &kgem->flushing);
 		list_move(&bo->list, active(kgem, bo->size));
 	} else {
-		assert(!kgem_busy(kgem, bo->handle));
 		list_move(&bo->list, inactive(kgem, bo->size));
 	}