Message ID | 20200325144227.15769-1-chris@chris-wilson.co.uk (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm/i915: Differentiate between aliasing-ppgtt and ggtt pinning | expand |
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c index 191577a98390..e5d604cbcfc2 100644 --- a/drivers/gpu/drm/i915/i915_vma.c +++ b/drivers/gpu/drm/i915/i915_vma.c @@ -914,7 +914,8 @@ int i915_vma_pin(struct i915_vma *vma, u64 size, u64 alignment, u64 flags) wakeref = intel_runtime_pm_get(&vma->vm->i915->runtime_pm); /* No more allocations allowed once we hold vm->mutex */ - err = mutex_lock_interruptible(&vma->vm->mutex); + err = mutex_lock_interruptible_nested(&vma->vm->mutex, + !!(flags & PIN_USER)); if (err) goto err_fence;