projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'drm-intel-gt-next-2021-05-28' of git://anongit.freedesktop.org/drm/drm...
[platform/kernel/linux-rpi.git]
/
drivers
/
gpu
/
drm
/
i915
/
selftests
/
i915_gem_gtt.c
diff --git
a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
index
45c6c01
..
0a1472b
100644
(file)
--- a/
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
+++ b/
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
@@
-186,7
+186,7
@@
retry:
if (err)
goto err_ppgtt_cleanup;
if (err)
goto err_ppgtt_cleanup;
- err = i915_vm_
pin
_pt_stash(&ppgtt->vm, &stash);
+ err = i915_vm_
map
_pt_stash(&ppgtt->vm, &stash);
if (err) {
i915_vm_free_pt_stash(&ppgtt->vm, &stash);
goto err_ppgtt_cleanup;
if (err) {
i915_vm_free_pt_stash(&ppgtt->vm, &stash);
goto err_ppgtt_cleanup;
@@
-208,7
+208,7
@@
retry:
if (err)
goto err_ppgtt_cleanup;
if (err)
goto err_ppgtt_cleanup;
- err = i915_vm_
pin
_pt_stash(&ppgtt->vm, &stash);
+ err = i915_vm_
map
_pt_stash(&ppgtt->vm, &stash);
if (err) {
i915_vm_free_pt_stash(&ppgtt->vm, &stash);
goto err_ppgtt_cleanup;
if (err) {
i915_vm_free_pt_stash(&ppgtt->vm, &stash);
goto err_ppgtt_cleanup;
@@
-325,11
+325,10
@@
retry:
BIT_ULL(size)))
goto alloc_vm_end;
BIT_ULL(size)))
goto alloc_vm_end;
- err = i915_vm_
pin
_pt_stash(vm, &stash);
+ err = i915_vm_
map
_pt_stash(vm, &stash);
if (!err)
vm->allocate_va_range(vm, &stash,
addr, BIT_ULL(size));
if (!err)
vm->allocate_va_range(vm, &stash,
addr, BIT_ULL(size));
-
i915_vm_free_pt_stash(vm, &stash);
alloc_vm_end:
if (err == -EDEADLK) {
i915_vm_free_pt_stash(vm, &stash);
alloc_vm_end:
if (err == -EDEADLK) {
@@
-1968,10
+1967,9
@@
retry:
if (err)
goto end_ww;
if (err)
goto end_ww;
- err = i915_vm_
pin
_pt_stash(vm, &stash);
+ err = i915_vm_
map
_pt_stash(vm, &stash);
if (!err)
vm->allocate_va_range(vm, &stash, offset, chunk_size);
if (!err)
vm->allocate_va_range(vm, &stash, offset, chunk_size);
-
i915_vm_free_pt_stash(vm, &stash);
end_ww:
if (err == -EDEADLK) {
i915_vm_free_pt_stash(vm, &stash);
end_ww:
if (err == -EDEADLK) {