Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d3088c7 authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

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: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170726160038.29487-3-chris@chris-wilson.co.uk


Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 6ea1d55d

drivers/gpu/drm/i915/intel_display.c

+8 −1
Original line number Diff line number Diff line
@@ -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;