diff options
author | Imre Deak <imre.deak@intel.com> | 2015-12-15 20:10:37 +0200 |
---|---|---|
committer | Imre Deak <imre.deak@intel.com> | 2015-12-17 16:37:43 +0200 |
commit | 2b19efebf175bb2120c5ae00b8e79febe73d225a (patch) | |
tree | a5bab2bec86f9d34521c9094027ee82141a11d43 /drivers/gpu/drm/i915/intel_drv.h | |
parent | 542db3cd345c38936bb9e4bb2c8d1971e6ac6619 (diff) | |
download | op-kernel-dev-2b19efebf175bb2120c5ae00b8e79febe73d225a.zip op-kernel-dev-2b19efebf175bb2120c5ae00b8e79febe73d225a.tar.gz |
drm/i915: add support for checking RPM atomic sections
In some cases we want to check whether we hold an RPM wakelock reference
for the whole duration of a sequence. To achieve this add a new RPM
atomic sequence counter that we increment any time the wakelock refcount
drops to zero. Check whether the sequence number stays the same during
the atomic section and that we hold the wakelock at the beginning of the
section.
Motivated by Chris.
v2-v3:
- unchanged
v4:
- swap the order of atomic_read() and assert_rpm_wakelock_held() in
assert_rpm_atomic_begin() to avoid race
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/1450203038-5150-10-git-send-email-imre.deak@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index eff7d2e..d523ebb 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1446,6 +1446,23 @@ assert_rpm_wakelock_held(struct drm_i915_private *dev_priv) "RPM wakelock ref not held during HW access"); } +static inline int +assert_rpm_atomic_begin(struct drm_i915_private *dev_priv) +{ + int seq = atomic_read(&dev_priv->pm.atomic_seq); + + assert_rpm_wakelock_held(dev_priv); + + return seq; +} + +static inline void +assert_rpm_atomic_end(struct drm_i915_private *dev_priv, int begin_seq) +{ + WARN_ONCE(atomic_read(&dev_priv->pm.atomic_seq) != begin_seq, + "HW access outside of RPM atomic section\n"); +} + /** * disable_rpm_wakeref_asserts - disable the RPM assert checks * @dev_priv: i915 device instance |