|
@@ -4646,7 +4646,9 @@ void intel_disable_gt_powersave(struct drm_device *dev)
|
|
ironlake_disable_drps(dev);
|
|
ironlake_disable_drps(dev);
|
|
ironlake_disable_rc6(dev);
|
|
ironlake_disable_rc6(dev);
|
|
} else if (IS_GEN6(dev) || IS_GEN7(dev) || IS_BROADWELL(dev)) {
|
|
} else if (IS_GEN6(dev) || IS_GEN7(dev) || IS_BROADWELL(dev)) {
|
|
- cancel_delayed_work_sync(&dev_priv->rps.delayed_resume_work);
|
|
|
|
|
|
+ if (cancel_delayed_work_sync(&dev_priv->rps.delayed_resume_work))
|
|
|
|
+ intel_runtime_pm_put(dev_priv);
|
|
|
|
+
|
|
cancel_work_sync(&dev_priv->rps.work);
|
|
cancel_work_sync(&dev_priv->rps.work);
|
|
mutex_lock(&dev_priv->rps.hw_lock);
|
|
mutex_lock(&dev_priv->rps.hw_lock);
|
|
if (IS_VALLEYVIEW(dev))
|
|
if (IS_VALLEYVIEW(dev))
|