Skip to content

Commit 9fa1f47

Browse files
mlankhorstdanvet
authored andcommitted
drm/i915: Add object locking to vm_fault_cpu
Take a simple lock so we hold ww around (un)pin_pages as needed. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: https://patchwork.freedesktop.org/patch/msgid/20210323155059.628690-24-maarten.lankhorst@linux.intel.com
1 parent 1b32102 commit 9fa1f47

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

drivers/gpu/drm/i915/gem/i915_gem_mman.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,9 @@ static vm_fault_t vm_fault_cpu(struct vm_fault *vmf)
246246
area->vm_flags & VM_WRITE))
247247
return VM_FAULT_SIGBUS;
248248

249+
if (i915_gem_object_lock_interruptible(obj, NULL))
250+
return VM_FAULT_NOPAGE;
251+
249252
err = i915_gem_object_pin_pages(obj);
250253
if (err)
251254
goto out;
@@ -269,6 +272,7 @@ static vm_fault_t vm_fault_cpu(struct vm_fault *vmf)
269272
i915_gem_object_unpin_pages(obj);
270273

271274
out:
275+
i915_gem_object_unlock(obj);
272276
return i915_error_to_vmf_fault(err);
273277
}
274278

0 commit comments

Comments
 (0)