diff options
| author | Lyude | 2016-03-11 16:57:01 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2016-03-30 08:23:41 +0200 |
| commit | a16b7658f4e0d4aec9bc3e75a5f0cc3f7a3a0422 (patch) | |
| tree | 0a9f827ee533a35c90904718b414a5ac8bebae56 /drivers/gpu/drm/i915/i915_drv.c | |
| parent | drm/i915: Fix races on fbdev (diff) | |
| download | kernel-qcow2-linux-a16b7658f4e0d4aec9bc3e75a5f0cc3f7a3a0422.tar.gz kernel-qcow2-linux-a16b7658f4e0d4aec9bc3e75a5f0cc3f7a3a0422.tar.xz kernel-qcow2-linux-a16b7658f4e0d4aec9bc3e75a5f0cc3f7a3a0422.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>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
| -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 20f8dbe7b21c..f73b4f7b2d39 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -770,10 +770,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 |