From 4443ae4da7e8077bcefacd79592258c2c05e3f8d Mon Sep 17 00:00:00 2001 From: Imre Deak Date: Fri, 13 Nov 2015 14:03:04 +0200 Subject: [PATCH 3/3] drm/i915/skl: don't enable DC6 across system suspend/resume Toggling DC6 shouldn't be done in the suspend/resume handlers, rather it should be done in the power well code. Until we come up with the final fix remove the toggling from these handlers. Signed-off-by: Imre Deak --- drivers/gpu/drm/i915/i915_drv.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 858d58c..ae90f76 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1072,9 +1072,6 @@ static int skl_suspend_complete(struct drm_i915_private *dev_priv) { skl_uninit_cdclk(dev_priv); - if (dev_priv->csr.dmc_payload) - skl_enable_dc6(dev_priv); - return 0; } @@ -1119,9 +1116,6 @@ static int bxt_resume_prepare(struct drm_i915_private *dev_priv) static int skl_resume_prepare(struct drm_i915_private *dev_priv) { - if (dev_priv->csr.dmc_payload) - skl_disable_dc6(dev_priv); - skl_init_cdclk(dev_priv); intel_csr_load_program(dev_priv); -- 2.5.0