summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_uncore.c
diff options
context:
space:
mode:
authorImre Deak <imre.deak@intel.com>2015-12-17 13:48:51 +0200
committerImre Deak <imre.deak@intel.com>2015-12-17 15:59:43 +0200
commit7f233235300ec49ccfe552983c5870c52d6a1c65 (patch)
tree06f8b5bd22cc81d7992e2d99e8c61681668a9731 /drivers/gpu/drm/i915/intel_uncore.c
parent25b181b46e4340f69793a886f2cd46608487783b (diff)
downloadtalos-op-linux-7f233235300ec49ccfe552983c5870c52d6a1c65.tar.gz
talos-op-linux-7f233235300ec49ccfe552983c5870c52d6a1c65.zip
drm/i915: remove HAS_RUNTIME_PM check from RPM get/put/assert helpers
We don't really need to check this flag in the get/put/assert helpers, as on platforms without RPM support we won't ever enable RPM. That means pm.suspend will be always false and the assert will be always true. Do this to simplify the code and to let us extend the RPM asserts to all platforms for a better coverage. Motivated by Ville. v2-v3: - unchanged v4: - remove the HAS_RUNTIME_PM check from intel_runtime_pm_enable() too made possible by the previous two patches v5: - rebased on the previous new patch in the series that keeps HAS_RUNTIME_PM() in intel_runtime_pm_enable() with a permanent reference taken there Signed-off-by: Imre Deak <imre.deak@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (v3) Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1450352931-16498-1-git-send-email-imre.deak@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_uncore.c')
-rw-r--r--drivers/gpu/drm/i915/intel_uncore.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index fcf04fe69296..022677685561 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -53,8 +53,7 @@ intel_uncore_forcewake_domain_to_str(const enum forcewake_domain_id id)
static void
assert_device_not_suspended(struct drm_i915_private *dev_priv)
{
- WARN_ONCE(HAS_RUNTIME_PM(dev_priv->dev) && dev_priv->pm.suspended,
- "Device suspended\n");
+ WARN_ONCE(dev_priv->pm.suspended, "Device suspended\n");
}
static inline void
OpenPOWER on IntegriCloud