diff options
| author |   Chris Wilson <chris@chris-wilson.co.uk> | 2017-07-26 17:00:38 +0100 |
|---|---|---|
| committer |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-07-27 09:56:11 +0200 |
| commit | 4d3088c7bd4f137eb51bdff6a27d861d3a6361b8 (patch) | |
| tree | ad2f75abebb7438b10dc879cdb17928ac7736a1b | |
| parent | drm/i915: Make i915_gem_object_phys_attach() use obj->mm.lock more appropriately (diff) | |
| download | wireguard-linux-4d3088c7bd4f137eb51bdff6a27d861d3a6361b8.tar.xz wireguard-linux-4d3088c7bd4f137eb51bdff6a27d861d3a6361b8.zip | |
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>
| -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; |