drm/i915: use assert_rpm_wakelock_held instead of opencoding it

Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1450203038-5150-7-git-send-email-imre.deak@intel.com

diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index cc0492e02d9714893fe142f2d7d2dad3a93f1697..270513385ae930b0323e9a0ba260e66cdbd8e5dc 100644 (file)
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -538,8 +538,7 @@ static void assert_can_enable_dc5(struct drm_i915_private *dev_priv)
 
        WARN_ONCE((I915_READ(DC_STATE_EN) & DC_STATE_EN_UPTO_DC5),
                  "DC5 already programmed to be enabled.\n");
-       WARN_ONCE(dev_priv->pm.suspended,
-                 "DC5 cannot be enabled, if platform is runtime-suspended.\n");
+       assert_rpm_wakelock_held(dev_priv);
 
        assert_csr_loaded(dev_priv);
 }
@@ -553,8 +552,7 @@ static void assert_can_disable_dc5(struct drm_i915_private *dev_priv)
        if (dev_priv->power_domains.initializing)
                return;
 
-       WARN_ONCE(dev_priv->pm.suspended,
-               "Disabling of DC5 while platform is runtime-suspended should never happen.\n");
+       assert_rpm_wakelock_held(dev_priv);
 }
 
 static void gen9_enable_dc5(struct drm_i915_private *dev_priv)
@@ -2242,7 +2240,7 @@ void intel_runtime_pm_get(struct drm_i915_private *dev_priv)
        struct device *device = &dev->pdev->dev;
 
        pm_runtime_get_sync(device);
-       WARN(dev_priv->pm.suspended, "Device still suspended.\n");
+       assert_rpm_wakelock_held(dev_priv);
 }
 
 /**
@@ -2267,7 +2265,7 @@ void intel_runtime_pm_get_noresume(struct drm_i915_private *dev_priv)
        struct drm_device *dev = dev_priv->dev;
        struct device *device = &dev->pdev->dev;
 
-       WARN(dev_priv->pm.suspended, "Getting nosync-ref while suspended.\n");
+       assert_rpm_wakelock_held(dev_priv);
        pm_runtime_get_noresume(device);
 }
 

diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index 3c63d94e9dbf94f5d61a3cf1d4ca355e919cc724..277e60ae0e474a2f665f59b9c4aabb35a74b1d96 100644 (file)
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -404,7 +404,7 @@ void intel_uncore_forcewake_get(struct drm_i915_private *dev_priv,
        if (!dev_priv->uncore.funcs.force_wake_get)
                return;
 
-       WARN_ON(dev_priv->pm.suspended);
+       assert_rpm_wakelock_held(dev_priv);
 
        spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
        __intel_uncore_forcewake_get(dev_priv, fw_domains);