Skip to content

Commit

Permalink
drm/i915/selftests: Lock the drm_mm while modifying
Browse files Browse the repository at this point in the history
Remember to lock the drm_mm as we modify it, lest it be modified in the
background by retire/free workers!

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/20190703091726.11690-2-chris@chris-wilson.co.uk
  • Loading branch information
Chris Wilson committed Jul 3, 2019
1 parent 6325168 commit 8221d21
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,9 @@ static int igt_mmap_offset_exhaustion(void *arg)
drm_mm_for_each_hole(hole, mm, hole_start, hole_end) {
resv.start = hole_start;
resv.size = hole_end - hole_start - 1; /* PAGE_SIZE units */
mutex_lock(&i915->drm.struct_mutex);
err = drm_mm_reserve_node(mm, &resv);
mutex_unlock(&i915->drm.struct_mutex);
if (err) {
pr_err("Failed to trim VMA manager, err=%d\n", err);
goto out_park;
Expand Down Expand Up @@ -478,7 +480,9 @@ static int igt_mmap_offset_exhaustion(void *arg)
}

out:
mutex_lock(&i915->drm.struct_mutex);
drm_mm_remove_node(&resv);
mutex_unlock(&i915->drm.struct_mutex);
out_park:
restore_retire_worker(i915);
return err;
Expand Down

0 comments on commit 8221d21

Please sign in to comment.