Merge tag 'topic/drm-misc-2016-04-01' of git://anongit.freedesktop.org/drm-intel...

[linux-2.6-block.git] / drivers / gpu / drm / i915 / i915_drv.c

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 8a62690e65135c3078cfcaa0c92c52b8bc141fa5..4c0dd35a7e3433888dea38b5ead5874d3c4fd9c2 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -603,13 +603,7 @@ static int i915_drm_suspend(struct drm_device *dev)
 
        intel_suspend_gt_powersave(dev);
 
-       /*
-        * Disable CRTCs directly since we want to preserve sw state
-        * for _thaw. Also, power gate the CRTC power wells.
-        */
-       drm_modeset_lock_all(dev);
        intel_display_suspend(dev);
-       drm_modeset_unlock_all(dev);
 
        intel_dp_mst_suspend(dev);
 
@@ -764,9 +758,7 @@ static int i915_drm_resume(struct drm_device *dev)
                dev_priv->display.hpd_irq_setup(dev);
        spin_unlock_irq(&dev_priv->irq_lock);
 
-       drm_modeset_lock_all(dev);
        intel_display_resume(dev);
-       drm_modeset_unlock_all(dev);
 
        intel_dp_mst_resume(dev);