xf86-video-intel: src/sna/kgem.c src/sna/kgem.h

[Chris Wilson]

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

New commits:
commit 6ba3bd9dfd6f3249cbcc2de8df607fec21af9a98
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Feb 4 12:12:13 2015 +0000

    sna: Use local defines for compilation on older distributions
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index f787a38..c7f6ec4 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -2844,7 +2844,7 @@ bool __kgem_ring_is_idle(struct kgem *kgem, int ring)
 void __kgem_retire_requests_upto(struct kgem *kgem, struct kgem_bo *bo)
 {
 	struct kgem_request *rq = bo->rq, *tmp;
-	struct list *requests = &kgem->requests[RQ_RING(rq) == I915_EXEC_BLT];
+	struct list *requests = &kgem->requests[RQ_RING(rq) == KGEM_BLT];
 
 	DBG(("%s(handle=%d)\n", __FUNCTION__, bo->handle));
 	assert(!__kgem_busy(kgem, bo->handle));
diff --git a/src/sna/kgem.h b/src/sna/kgem.h
index 873852d..576aaa3 100644
--- a/src/sna/kgem.h
+++ b/src/sna/kgem.h
@@ -652,7 +652,7 @@ static inline bool kgem_bo_is_render(struct kgem_bo *bo)
 	DBG(("%s: handle=%d, rq? %d [%d]\n", __FUNCTION__,
 	     bo->handle, bo->rq != NULL, (int)RQ_RING(bo->rq)));
 	assert(bo->refcnt);
-	return bo->rq && RQ_RING(bo->rq) != I915_EXEC_BLT;
+	return bo->rq && RQ_RING(bo->rq) != KGEM_BLT;
 }
 
 static inline bool kgem_bo_is_blt(struct kgem_bo *bo)
@@ -660,7 +660,7 @@ static inline bool kgem_bo_is_blt(struct kgem_bo *bo)
 	DBG(("%s: handle=%d, rq? %d\n", __FUNCTION__,
 	     bo->handle, bo->rq != NULL, (int)RQ_RING(bo->rq)));
 	assert(bo->refcnt);
-	return RQ_RING(bo->rq) == I915_EXEC_BLT;
+	return RQ_RING(bo->rq) == KGEM_BLT;
 }
 
 static inline void kgem_bo_mark_unreusable(struct kgem_bo *bo)