]> git.karo-electronics.de Git - linux-beck.git/commitdiff
drm/i915: don't get/put PC8 reference on freeze/thaw
authorPaulo Zanoni <paulo.r.zanoni@intel.com>
Fri, 7 Mar 2014 23:08:11 +0000 (20:08 -0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 19 Mar 2014 15:39:17 +0000 (16:39 +0100)
We already get runtime PM references, and PC8 is now part of runtime
PM, so this is enough.

v2: - Rebase.

Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_drv.c

index 3526f8e579146ebd4acecfb6cc732d7690a1b015..9aa01bfcd0681b63d2c3b68ef8d8ffd4976e3ca9 100644 (file)
@@ -428,7 +428,6 @@ static int i915_drm_freeze(struct drm_device *dev)
 
        /* We do a lot of poking in a lot of registers, make sure they work
         * properly. */
-       hsw_disable_package_c8(dev_priv);
        intel_display_set_init_power(dev_priv, true);
 
        drm_kms_helper_poll_disable(dev);
@@ -604,10 +603,6 @@ static int __i915_drm_thaw(struct drm_device *dev, bool restore_gtt_mappings)
                schedule_work(&dev_priv->console_resume_work);
        }
 
-       /* Undo what we did at i915_drm_freeze so the refcount goes back to the
-        * expected level. */
-       hsw_enable_package_c8(dev_priv);
-
        mutex_lock(&dev_priv->modeset_restore_lock);
        dev_priv->modeset_restore = MODESET_DONE;
        mutex_unlock(&dev_priv->modeset_restore_lock);