]> git.karo-electronics.de Git - karo-tx-linux.git/commit
drm/i915: Fix deadlock witha the pipe A quirk during resume
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Thu, 1 Jun 2017 14:36:13 +0000 (17:36 +0300)
committerJani Nikula <jani.nikula@intel.com>
Mon, 19 Jun 2017 08:20:10 +0000 (11:20 +0300)
commit17b206c27366f3cee816eaf86fafc6a11f628ecf
treed040744897d4125f28cba5bd18feeefb6da8d3ac
parentce2c58724f7d07e76dadfeba53d6877a9e67341d
drm/i915: Fix deadlock witha the pipe A quirk during resume

Pass down the correct acquire context to the pipe A quirk load detect
hack during display resume. Avoids deadlocking the entire thing.

Cc: stable@vger.kernel.org
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Fixes: e2c8b8701e2d ("drm/i915: Use atomic helpers for suspend, v2.")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170601143619.27840-2-ville.syrjala@linux.intel.com
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
(cherry picked from commit aecd36b8a16b2302b33f49ba3fa24c955f1e32f7)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_display.c