]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
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)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 30 Mar 2016 06:23:41 +0000 (08:23 +0200)
commita16b7658f4e0d4aec9bc3e75a5f0cc3f7a3a0422
tree0a9f827ee533a35c90904718b414a5ac8bebae56
parenta7442b93cf32c1e1ddb721a26cd1f92302e2a222
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>
drivers/gpu/drm/i915/i915_drv.c