diff options
| author | Chris Wilson | 2017-03-02 08:41:57 +0100 |
|---|---|---|
| committer | Chris Wilson | 2017-03-02 13:45:23 +0100 |
| commit | 1f58c8e7eac0d4a7a59037dc18dbed2a9b5bd342 (patch) | |
| tree | 00eff971e37c8c9ed1cf1436698438907c315247 /drivers/gpu/drm/i915/intel_drv.h | |
| parent | drm/i915: Hold rpm during GEM suspend in driver unload/suspend (diff) | |
| download | kernel-qcow2-linux-1f58c8e7eac0d4a7a59037dc18dbed2a9b5bd342.tar.gz kernel-qcow2-linux-1f58c8e7eac0d4a7a59037dc18dbed2a9b5bd342.tar.xz kernel-qcow2-linux-1f58c8e7eac0d4a7a59037dc18dbed2a9b5bd342.zip | |
drm/i915: Restore the invalid access without RPM warning
A long time ago we turned off the warning as it was too painful, we had
too much broken code. Turn it back on now as we are mostly clean and
need to prevent returning to such orangeness.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Imre Deak <imre.deak@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170302074157.21631-2-chris@chris-wilson.co.uk
Reviewed-by: Imre Deak <imre.deak@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 741beba0c9c0..eadc72df5a17 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1739,10 +1739,8 @@ static inline void assert_rpm_wakelock_held(struct drm_i915_private *dev_priv) { assert_rpm_device_not_suspended(dev_priv); - /* FIXME: Needs to be converted back to WARN_ONCE, but currently causes - * too much noise. */ - if (!atomic_read(&dev_priv->pm.wakeref_count)) - DRM_DEBUG_DRIVER("RPM wakelock ref not held during HW access"); + WARN_ONCE(!atomic_read(&dev_priv->pm.wakeref_count), + "RPM wakelock ref not held during HW access"); } /** |