drm/i915/selftests: Always lock the drm_mm around insert/remove

Be paranoid and make sure the drm_mm is locked whenever we insert/remove
our own nodes.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191129095659.665381-1-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
index f7aa0036d90034fae0fb29a93fd55aa0e3eb6547..80cde5bda922c5df0d506930a23cc2492c8102fe 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
@@ -1166,11 +1166,13 @@ static int igt_ggtt_page(void *arg)
                goto out_free;
 
        memset(&tmp, 0, sizeof(tmp));
+       mutex_lock(&ggtt->vm.mutex);
        err = drm_mm_insert_node_in_range(&ggtt->vm.mm, &tmp,
                                          count * PAGE_SIZE, 0,
                                          I915_COLOR_UNEVICTABLE,
                                          0, ggtt->mappable_end,
                                          DRM_MM_INSERT_LOW);
+       mutex_unlock(&ggtt->vm.mutex);
        if (err)
                goto out_unpin;
 
@@ -1222,7 +1224,9 @@ static int igt_ggtt_page(void *arg)
 out_remove:
        ggtt->vm.clear_range(&ggtt->vm, tmp.start, tmp.size);
        intel_runtime_pm_put(&i915->runtime_pm, wakeref);
+       mutex_lock(&ggtt->vm.mutex);
        drm_mm_remove_node(&tmp);
+       mutex_unlock(&ggtt->vm.mutex);
 out_unpin:
        i915_gem_object_unpin_pages(obj);
 out_free: