diff options
| author | Lyude <cpaul@redhat.com> | 2016-03-11 10:57:01 -0500 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2016-04-05 11:33:16 +0300 |
| commit | 1e8817b7f603464369b3f70895946254bf62ba8e (patch) | |
| tree | 8847ff4abcaf658596c7bbe3ee79e33ea5591ef6 /drivers/gpu | |
| parent | 9e60290dbafdf577766e5fc5f2fdb3be450cf9a6 (diff) | |
| download | linux-stable-1e8817b7f603464369b3f70895946254bf62ba8e.tar.gz linux-stable-1e8817b7f603464369b3f70895946254bf62ba8e.tar.bz2 linux-stable-1e8817b7f603464369b3f70895946254bf62ba8e.zip | |
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 20e82008b8b6..30798cbc6fc0 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -758,10 +758,10 @@ static int i915_drm_resume(struct drm_device *dev) dev_priv->display.hpd_irq_setup(dev); spin_unlock_irq(&dev_priv->irq_lock); - intel_display_resume(dev); - intel_dp_mst_resume(dev); + intel_display_resume(dev); + /* * ... but also need to make sure that hotplug processing * doesn't cause havoc. Like in the driver load code we don't |