xf86-video-intel: src/sna/kgem.c
Chris Wilson
ickle at kemper.freedesktop.org
Wed Jan 29 05:43:33 PST 2014
src/sna/kgem.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 139fc76260ebeb4f4cc04c56b9ebf7f70bed660d
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Wed Jan 29 13:42:50 2014 +0000
sna: Always clear the domain even only a potential sync
It helps to keep the domain-tracking bookkeeping consistent.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index ac21d2a..b3d3c4b 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -562,10 +562,9 @@ retry:
}
DBG(("%s: flush=%d, domain=%d\n", __FUNCTION__, bo->flush, bo->domain));
- if (bo->exec == NULL) {
+ if (bo->exec == NULL)
kgem_bo_maybe_retire(kgem, bo);
- bo->domain = DOMAIN_NONE;
- }
+ bo->domain = DOMAIN_NONE;
bo->gtt_dirty = true;
return true;
}
@@ -5735,10 +5734,9 @@ void kgem_bo_sync__cpu_full(struct kgem *kgem, struct kgem_bo *bo, bool write)
kgem_bo_retire(kgem, bo);
bo->domain = DOMAIN_CPU;
} else {
- if (bo->exec == NULL) {
+ if (bo->exec == NULL)
kgem_bo_maybe_retire(kgem, bo);
- bo->domain = DOMAIN_NONE;
- }
+ bo->domain = DOMAIN_NONE;
}
}
}
More information about the xorg-commit
mailing list