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 2e4f06e..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;
 
-               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;
@@ -208,7 +208,7 @@ retry:
                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;
@@ -325,11 +325,10 @@ retry:
                                                           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));
-
                                i915_vm_free_pt_stash(vm, &stash);
 alloc_vm_end:
                                if (err == -EDEADLK) {
@@ -1106,7 +1105,8 @@ static int igt_ppgtt_shrink_boom(void *arg)
        return exercise_ppgtt(arg, shrink_boom);
 }
 
-static int sort_holes(void *priv, struct list_head *A, struct list_head *B)
+static int sort_holes(void *priv, const struct list_head *A,
+                     const struct list_head *B)
 {
        struct drm_mm_node *a = list_entry(A, typeof(*a), hole_stack);
        struct drm_mm_node *b = list_entry(B, typeof(*b), hole_stack);
@@ -1967,10 +1967,9 @@ retry:
                        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);
-
                        i915_vm_free_pt_stash(vm, &stash);
 end_ww:
                        if (err == -EDEADLK) {