Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

drm/i915: drop the struct_mutex when wedged or trying to reset

We grab the struct_mutex in intel_crtc_page_flip, but if we are wedged
or a reset is in progress we bail early but never seem to actually
release the lock.

Fixes: 7f1847ebf48b ("drm/i915: Simplify checking of GPU reset_counter in display pageflips")
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161128103648.9235-1-matthew.auld@intel.com
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: <stable@vger.kernel.org> # v4.7+
(cherry picked from commit ddbb271aea87fc6004d3c8bcdb0710e980c7ec85)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

authored by

Matthew Auld and committed by
Jani Nikula
e411072d 2420489b

+2 -1
+2 -1
drivers/gpu/drm/i915/intel_display.c
··· 12260 12260 intel_crtc->reset_count = i915_reset_count(&dev_priv->gpu_error); 12261 12261 if (i915_reset_in_progress_or_wedged(&dev_priv->gpu_error)) { 12262 12262 ret = -EIO; 12263 - goto cleanup; 12263 + goto unlock; 12264 12264 } 12265 12265 12266 12266 atomic_inc(&intel_crtc->unpin_work_count); ··· 12352 12352 intel_unpin_fb_obj(fb, crtc->primary->state->rotation); 12353 12353 cleanup_pending: 12354 12354 atomic_dec(&intel_crtc->unpin_work_count); 12355 + unlock: 12355 12356 mutex_unlock(&dev->struct_mutex); 12356 12357 cleanup: 12357 12358 crtc->primary->fb = old_fb;