drm/i915: take a ref to the rpm in the uncore structure
Remove a bit of pointer dancing in the reg access path. Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Link: https://patchwork.freedesktop.org/patch/msgid/20190325214940.23632-5-daniele.ceraolospurio@intel.com
This commit is contained in:

committed by
Chris Wilson

parent
2cf7bf6f2f
commit
eb17af67eb
@@ -2269,18 +2269,24 @@ void icl_dbuf_slices_update(struct drm_i915_private *dev_priv,
|
||||
u8 req_slices);
|
||||
|
||||
static inline void
|
||||
assert_rpm_device_not_suspended(struct drm_i915_private *i915)
|
||||
assert_rpm_device_not_suspended(struct i915_runtime_pm *rpm)
|
||||
{
|
||||
WARN_ONCE(i915->runtime_pm.suspended,
|
||||
WARN_ONCE(rpm->suspended,
|
||||
"Device suspended during HW access\n");
|
||||
}
|
||||
|
||||
static inline void
|
||||
__assert_rpm_wakelock_held(struct i915_runtime_pm *rpm)
|
||||
{
|
||||
assert_rpm_device_not_suspended(rpm);
|
||||
WARN_ONCE(!atomic_read(&rpm->wakeref_count),
|
||||
"RPM wakelock ref not held during HW access");
|
||||
}
|
||||
|
||||
static inline void
|
||||
assert_rpm_wakelock_held(struct drm_i915_private *i915)
|
||||
{
|
||||
assert_rpm_device_not_suspended(i915);
|
||||
WARN_ONCE(!atomic_read(&i915->runtime_pm.wakeref_count),
|
||||
"RPM wakelock ref not held during HW access");
|
||||
__assert_rpm_wakelock_held(&i915->runtime_pm);
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user