Commit b006869c authored by Chris Wilson's avatar Chris Wilson

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: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191129095659.665381-1-chris@chris-wilson.co.uk
parent 69305732
...@@ -1166,11 +1166,13 @@ static int igt_ggtt_page(void *arg) ...@@ -1166,11 +1166,13 @@ static int igt_ggtt_page(void *arg)
goto out_free; goto out_free;
memset(&tmp, 0, sizeof(tmp)); memset(&tmp, 0, sizeof(tmp));
mutex_lock(&ggtt->vm.mutex);
err = drm_mm_insert_node_in_range(&ggtt->vm.mm, &tmp, err = drm_mm_insert_node_in_range(&ggtt->vm.mm, &tmp,
count * PAGE_SIZE, 0, count * PAGE_SIZE, 0,
I915_COLOR_UNEVICTABLE, I915_COLOR_UNEVICTABLE,
0, ggtt->mappable_end, 0, ggtt->mappable_end,
DRM_MM_INSERT_LOW); DRM_MM_INSERT_LOW);
mutex_unlock(&ggtt->vm.mutex);
if (err) if (err)
goto out_unpin; goto out_unpin;
...@@ -1222,7 +1224,9 @@ static int igt_ggtt_page(void *arg) ...@@ -1222,7 +1224,9 @@ static int igt_ggtt_page(void *arg)
out_remove: out_remove:
ggtt->vm.clear_range(&ggtt->vm, tmp.start, tmp.size); ggtt->vm.clear_range(&ggtt->vm, tmp.start, tmp.size);
intel_runtime_pm_put(&i915->runtime_pm, wakeref); intel_runtime_pm_put(&i915->runtime_pm, wakeref);
mutex_lock(&ggtt->vm.mutex);
drm_mm_remove_node(&tmp); drm_mm_remove_node(&tmp);
mutex_unlock(&ggtt->vm.mutex);
out_unpin: out_unpin:
i915_gem_object_unpin_pages(obj); i915_gem_object_unpin_pages(obj);
out_free: out_free:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment