OSDN Git Service

drm/i915/vlv: drop power well enable in uncore_sanitize
authorJesse Barnes <jbarnes@virtuousgeek.org>
Fri, 23 May 2014 20:16:41 +0000 (13:16 -0700)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 5 Jun 2014 06:52:35 +0000 (08:52 +0200)
We do this at runtime and later on now.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_uncore.c

index 1dbabb0..a19bcec 100644 (file)
@@ -391,26 +391,8 @@ void intel_uncore_early_sanitize(struct drm_device *dev)
 
 void intel_uncore_sanitize(struct drm_device *dev)
 {
-       struct drm_i915_private *dev_priv = dev->dev_private;
-       u32 reg_val;
-
        /* BIOS often leaves RC6 enabled, but disable it for hw init */
        intel_disable_gt_powersave(dev);
-
-       /* Turn off power gate, require especially for the BIOS less system */
-       if (IS_VALLEYVIEW(dev)) {
-
-               mutex_lock(&dev_priv->rps.hw_lock);
-               reg_val = vlv_punit_read(dev_priv, PUNIT_REG_PWRGT_STATUS);
-
-               if (reg_val & (PUNIT_PWRGT_PWR_GATE(PUNIT_POWER_WELL_RENDER) |
-                              PUNIT_PWRGT_PWR_GATE(PUNIT_POWER_WELL_MEDIA) |
-                              PUNIT_PWRGT_PWR_GATE(PUNIT_POWER_WELL_DISP2D)))
-                       vlv_punit_write(dev_priv, PUNIT_REG_PWRGT_CTRL, 0x0);
-
-               mutex_unlock(&dev_priv->rps.hw_lock);
-
-       }
 }
 
 /*