summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2014-01-29 13:39:20 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2014-01-29 13:40:08 +0000
commitd70620d9789da1cf983dac318d9ca9149f11ff20 (patch)
tree7ef5ac88af18bbbb799af08ae1cd33993395d5aa
parent971a5e64f574f09ef43bcca9e0bd02cb0e42aa03 (diff)
sna: We can only retire a bo if is not referenced by the current batch
Fixes regression from commit 8b0ebebcab21647348f769c25ca0c1d81d169e75 Author: Chris Wilson <chris@chris-wilson.co.uk> Date: Tue Jan 28 16:30:47 2014 +0000 sna: Be a little more assertive in retiring after set-domain Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74176 Reported-by: Jan Alexander Steffens <jan.steffens@gmail.com> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/kgem.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 14a3f952..ac21d2ad 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -5735,8 +5735,10 @@ 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 {
- kgem_bo_maybe_retire(kgem, bo);
- bo->domain = DOMAIN_NONE;
+ if (bo->exec == NULL) {
+ kgem_bo_maybe_retire(kgem, bo);
+ bo->domain = DOMAIN_NONE;
+ }
}
}
}