]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
drm/i915/skl: Don't disable misc IO power well during display uninit
authorImre Deak <imre.deak@intel.com>
Thu, 29 Jun 2017 15:36:59 +0000 (18:36 +0300)
committerImre Deak <imre.deak@intel.com>
Thu, 6 Jul 2017 13:29:13 +0000 (16:29 +0300)
Bspec requires leaving the misc IO power well enabled during display
uninit, so align the code accordingly.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1498750622-14023-3-git-send-email-imre.deak@intel.com
drivers/gpu/drm/i915/intel_runtime_pm.c

index fd59016191ff2f96f52cfd892b69ac7260f6b816..8418879c287ac2e4644f0bcac99f14860baae86e 100644 (file)
@@ -2694,9 +2694,10 @@ static void skl_display_core_uninit(struct drm_i915_private *dev_priv)
 
        mutex_lock(&power_domains->lock);
 
-       well = lookup_power_well(dev_priv, SKL_DISP_PW_MISC_IO);
-       intel_power_well_disable(dev_priv, well);
-
+       /*
+        * BSpec says to keep the MISC IO power well enabled here, only
+        * remove our request for power well 1.
+        */
        well = lookup_power_well(dev_priv, SKL_DISP_PW_1);
        intel_power_well_disable(dev_priv, well);