[Intel-gfx] [PATCH 2/4] drm/i915: use assert_device_not_suspended instead of opencoding it

[Imre Deak]

Signed-off-by: Imre Deak <imre.d...@intel.com>
---
 drivers/gpu/drm/i915/intel_runtime_pm.c | 10 ++++------
 drivers/gpu/drm/i915/intel_uncore.c     |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c 
b/drivers/gpu/drm/i915/intel_runtime_pm.c
index 0d4a03b..4d39b3c 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -464,8 +464,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_device_not_suspended(dev_priv);
 
        assert_csr_loaded(dev_priv);
 }
@@ -479,8 +478,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_device_not_suspended(dev_priv);
 }
 
 static void gen9_enable_dc5(struct drm_i915_private *dev_priv)
@@ -2158,7 +2156,7 @@ void intel_runtime_pm_get(struct drm_i915_private 
*dev_priv)
                return;
 
        pm_runtime_get_sync(device);
-       WARN(dev_priv->pm.suspended, "Device still suspended.\n");
+       assert_device_not_suspended(dev_priv);
 }
 
 /**
@@ -2186,7 +2184,7 @@ void intel_runtime_pm_get_noresume(struct 
drm_i915_private *dev_priv)
        if (!HAS_RUNTIME_PM(dev))
                return;
 
-       WARN(dev_priv->pm.suspended, "Getting nosync-ref while suspended.\n");
+       assert_device_not_suspended(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 2b93a68..b4aea91 100644
--- 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_device_not_suspended(dev_priv);
 
        spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
        __intel_uncore_forcewake_get(dev_priv, fw_domains);
-- 
2.5.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx