UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: Ensure i915_vma tests do not get -ENOSPC with the locking changes. 

Now that we require locking to evict, multiple vmas from the same object
might not be evicted. This is expected and required, because execbuf will
move to short-term pinning by using the lock only. This will cause these
tests to fail, because they create a ton of vma's for the same object.

Unbind manually to prevent spurious -ENOSPC in those mock tests.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211216142749.1966107-8-maarten.lankhorst@linux.intel.com
This commit is contained in:
Maarten Lankhorst 2021-12-16 15:27:39 +01:00
parent fd06ccf159
commit 9606ca2ea1
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/gpu/drm/i915/selftests/i915_vma.c
View File

@ -691,7 +691,11 @@ static int igt_vma_rotate_remap(void *arg)
} }
i915_vma_unpin(vma); i915_vma_unpin(vma);
err = i915_vma_unbind(vma);
if (err) {
pr_err("Unbinding returned %i\n", err);
goto out_object;
}
cond_resched(); cond_resched();
} }
} }
@ -848,6 +852,11 @@ static int igt_vma_partial(void *arg)
i915_vma_unpin(vma); i915_vma_unpin(vma);
nvma++; nvma++;
err = i915_vma_unbind(vma);
if (err) {
pr_err("Unbinding returned %i\n", err);
goto out_object;
}
cond_resched(); cond_resched();
} }
@ -882,6 +891,12 @@ static int igt_vma_partial(void *arg)
i915_vma_unpin(vma); i915_vma_unpin(vma);
err = i915_vma_unbind(vma);
if (err) {
pr_err("Unbinding returned %i\n", err);
goto out_object;
}
count = 0; count = 0;
list_for_each_entry(vma, &obj->vma.list, obj_link) list_for_each_entry(vma, &obj->vma.list, obj_link)
count++; count++;