]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
drm/i915: Plumb the correct acquire ctx into intel_crtc_disable_noatomic()
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Thu, 1 Jun 2017 14:36:14 +0000 (17:36 +0300)
committerJani Nikula <jani.nikula@intel.com>
Mon, 19 Jun 2017 08:20:16 +0000 (11:20 +0300)
commitb7f5dd36e0c5cb9ca1070a5e0f22f666bcff07ef
tree3a20819cc21103607e71decf35b714f802c711f2
parent17b206c27366f3cee816eaf86fafc6a11f628ecf
drm/i915: Plumb the correct acquire ctx into intel_crtc_disable_noatomic()

If intel_crtc_disable_noatomic() were to ever get called during resume
we'd end up deadlocking since resume has its own acqcuire_ctx but
intel_crtc_disable_noatomic() still tries to use the
mode_config.acquire_ctx. Pass down the correct acquire ctx from the top.

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-3-ville.syrjala@linux.intel.com
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
(cherry picked from commit da1d0e265535634bba80d44510b864c620549bee)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_display.c