xf86-video-intel: src/sna/kgem.c
Chris Wilson
ickle at kemper.freedesktop.org
Tue Oct 29 19:28:24 CET 2013
src/sna/kgem.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 9352769eee0889dd1c1656829c140384a9e94bcf
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Tue Oct 29 18:27:41 2013 +0000
sna: Fix assertion checks for fake flushing requests
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 3b403ca..4606dc7 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -1801,7 +1801,7 @@ inline static void kgem_bo_remove_from_active(struct kgem *kgem,
list_del(&bo->list);
assert(bo->rq != NULL);
- if (bo->rq == (void *)kgem) {
+ if (RQ(bo->rq) == (void *)kgem) {
assert(bo->exec == NULL);
list_del(&bo->request);
}
@@ -2119,7 +2119,7 @@ static bool kgem_retire__flushing(struct kgem *kgem)
bool retired = false;
list_for_each_entry_safe(bo, next, &kgem->flushing, request) {
- assert(bo->rq == (void *)kgem);
+ assert(RQ(bo->rq) == (void *)kgem);
assert(bo->exec == NULL);
if (__kgem_busy(kgem, bo->handle))
@@ -3378,7 +3378,7 @@ retry_large:
goto discard;
list_del(&bo->list);
- if (bo->rq == (void *)kgem) {
+ if (RQ(bo->rq) == (void *)kgem) {
assert(bo->exec == NULL);
list_del(&bo->request);
}
More information about the xorg-commit
mailing list