drm/i915: get a runtime PM ref for the deferred GT powersave enabling

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / i915 / i915_drv.c

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 5cbd79e369c4545c28569e400f3120ad417e6f21..b8c9896520af868c3d65183f397a96e5ad0801ab 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -782,7 +782,7 @@ int i915_reset(struct drm_device *dev)
                 * previous concerns that it doesn't respond well to some forms
                 * of re-init after reset. */
                if (INTEL_INFO(dev)->gen > 5)
-                       intel_enable_gt_powersave(dev);
+                       intel_reset_gt_powersave(dev);
 
                intel_hpd_init(dev);
        } else {
@@ -951,6 +951,9 @@ static int intel_runtime_suspend(struct device *device)
        struct drm_device *dev = pci_get_drvdata(pdev);
        struct drm_i915_private *dev_priv = dev->dev_private;
 
+       if (WARN_ON_ONCE(!dev_priv->rps.enabled))
+               return -ENODEV;
+
        WARN_ON(!HAS_RUNTIME_PM(dev));
        assert_force_wake_inactive(dev_priv);