OSDN Git Service

drm/i915: Call intel_dp_mst_resume() before resuming displays
authorLyude <cpaul@redhat.com>
Fri, 11 Mar 2016 15:57:01 +0000 (10:57 -0500)
committerJani Nikula <jani.nikula@intel.com>
Tue, 5 Apr 2016 08:33:16 +0000 (11:33 +0300)
commit1e8817b7f603464369b3f70895946254bf62ba8e
tree8847ff4abcaf658596c7bbe3ee79e33ea5591ef6
parent9e60290dbafdf577766e5fc5f2fdb3be450cf9a6
drm/i915: Call intel_dp_mst_resume() before resuming displays

Since we need MST devices ready before we try to resume displays,
calling this after intel_display_resume() can result in some issues with
various laptop docks where the monitor won't turn back on after
suspending the system.

This order was originally changed in

commit e7d6f7d70829 ("drm/i915: resume MST after reading back hw state")

In order to fix some unclaimed register errors, however the actual cause
of those has since been fixed.

CC: stable@vger.kernel.org
Signed-off-by: Lyude <cpaul@redhat.com>
[danvet: Resolve conflicts with locking changes.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
(cherry picked from commit a16b7658f4e0d4aec9bc3e75a5f0cc3f7a3a0422)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/i915_drv.c