diff options
| author | Imre Deak | 2015-12-15 19:10:34 +0100 |
|---|---|---|
| committer | Imre Deak | 2015-12-17 14:59:44 +0100 |
| commit | c9b8846a29c82c080b80119b7f85c37a9eb3457f (patch) | |
| tree | 3be96020369424d64d39122cf8ad6fd12385abf7 /drivers/gpu/drm/i915/intel_uncore.c | |
| parent | drm/i915: add assert_rpm_wakelock_held helper (diff) | |
| download | kernel-qcow2-linux-c9b8846a29c82c080b80119b7f85c37a9eb3457f.tar.gz kernel-qcow2-linux-c9b8846a29c82c080b80119b7f85c37a9eb3457f.tar.xz kernel-qcow2-linux-c9b8846a29c82c080b80119b7f85c37a9eb3457f.zip | |
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
Diffstat (limited to 'drivers/gpu/drm/i915/intel_uncore.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_uncore.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index 3c63d94e9dbf..277e60ae0e47 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_rpm_wakelock_held(dev_priv); spin_lock_irqsave(&dev_priv->uncore.lock, irqflags); __intel_uncore_forcewake_get(dev_priv, fw_domains); |