]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
drm/i915: drop the struct_mutex when wedged or trying to reset
authorMatthew Auld <matthew.auld@intel.com>
Mon, 28 Nov 2016 10:36:48 +0000 (10:36 +0000)
committerJani Nikula <jani.nikula@intel.com>
Tue, 20 Dec 2016 14:27:20 +0000 (16:27 +0200)
commit35f6c2336b1a5007ec837623f771d2d56dfba5c2
treed2d9e1a557d628aa1dbdb1ec504b3c1d860a36d5
parent7a9e10253e9e52451bbe80ddb2874368dbd240a3
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>
(cherry picked from commit e411072d5740a49cdc9d0713798c30440757e451)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_display.c