drm/i915: Pin the pages before acquiring struct_mutex for display

Since we don't need the struct_mutex to acquire the object's pages, call
i915_gem_object_pin_pages() before we bind the object into the GGTT.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170726160038.29487-3-chris@chris-wilson.co.uk
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 87ae355dc75c821f9b066213fc9271f73c370351..5a89db14320fa596f69aea46fac35832f99e5b6b 100644 (file)
--- 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;