A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 03:01:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

drm/i915: Call intel_dp_mst_resume() before resuming displays

Browse source 
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 e7d6f7d708 ("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: [email protected]
Signed-off-by: Lyude <[email protected]>
[danvet: Resolve conflicts with locking changes.]
Signed-off-by: Daniel Vetter <[email protected]>
(cherry picked from commit a16b7658f4)
Signed-off-by: Jani Nikula <[email protected]>
This commit is contained in:
Lyude 2016-03-11 10:57:01 -05:00 • committed by Jani Nikula
commit 1e8817b7f6
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpu/drm/i915/i915_drv.c
View file

@ -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