diff options
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 87ae355dc75c..5a89db14320f 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -12432,10 +12432,16 @@ intel_prepare_plane_fb(struct drm_plane *plane, if (!obj) return 0; - ret = mutex_lock_interruptible(&dev_priv->drm.struct_mutex); + ret = i915_gem_object_pin_pages(obj); if (ret) return ret; + ret = mutex_lock_interruptible(&dev_priv->drm.struct_mutex); + if (ret) { + i915_gem_object_unpin_pages(obj); + return ret; + } + if (plane->type == DRM_PLANE_TYPE_CURSOR && INTEL_INFO(dev_priv)->cursor_needs_physical) { const int align = intel_cursor_alignment(dev_priv); @@ -12454,6 +12460,7 @@ intel_prepare_plane_fb(struct drm_plane *plane, i915_gem_object_wait_priority(obj, 0, I915_PRIORITY_DISPLAY); mutex_unlock(&dev_priv->drm.struct_mutex); + i915_gem_object_unpin_pages(obj); if (ret) return ret; |