drm/i915: don't enable autosuspend on platforms without RPM support

[deliverable/linux.git] / drivers / gpu / drm / i915 / intel_runtime_pm.c

diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index a0b9eaf77fe904b26431eac66137eec6bbc7af40..ddbdbffe829a684eff8c2ef42a3cf29ccbf112d8 100644 (file)
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -2309,18 +2309,21 @@ void intel_runtime_pm_enable(struct drm_i915_private *dev_priv)
        struct drm_device *dev = dev_priv->dev;
        struct device *device = &dev->pdev->dev;
 
+       pm_runtime_set_autosuspend_delay(device, 10000); /* 10s */
+       pm_runtime_mark_last_busy(device);
+
        /*
         * Take a permanent reference to disable the RPM functionality and drop
         * it only when unloading the driver. Use the low level get/put helpers,
         * so the driver's own RPM reference tracking asserts also work on
         * platforms without RPM support.
         */
-       if (!HAS_RUNTIME_PM(dev))
+       if (!HAS_RUNTIME_PM(dev)) {
+               pm_runtime_dont_use_autosuspend(device);
                pm_runtime_get_sync(device);
-
-       pm_runtime_set_autosuspend_delay(device, 10000); /* 10s */
-       pm_runtime_mark_last_busy(device);
-       pm_runtime_use_autosuspend(device);
+       } else {
+               pm_runtime_use_autosuspend(device);
+       }
 
        /*
         * The core calls the driver load handler with an RPM reference held.