summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-01-05 00:01:27 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2012-01-05 00:02:10 +0000
commit4530b87e445aea30ccbe751699963118ad5672d4 (patch)
tree2424df154cf6f44827cde9de14abcb57ab076ba2 /src
parent4119e68fb157fc612bce5e9c5669112ce35b4ca1 (diff)
sna: Fix assertion as we may want to create active bo with cpu mappings
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src')
-rw-r--r--src/sna/kgem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 51b56eb8..d08faa47 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -1552,7 +1552,7 @@ search_linear_cache(struct kgem *kgem, unsigned int size, unsigned flags)
if (flags & (CREATE_CPU_MAP | CREATE_GTT_MAP)) {
int for_cpu = !!(flags & CREATE_CPU_MAP);
- assert(use_active == false);
+ assert(for_cpu || use_active == false);
list_for_each_entry(bo, &kgem->vma_inactive, vma) {
if (IS_CPU_MAP(bo->map) != for_cpu)
continue;