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

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 6102d21a8ba812a4748675d9b4fa8f9b2b56c4a9..ab30067fe872ac15374137bf8c7999883b68346a 100644 (file)
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -2269,20 +2269,26 @@ 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 drm_i915_private *i915)
+__assert_rpm_wakelock_held(struct i915_runtime_pm *rpm)
 {
-       assert_rpm_device_not_suspended(i915);
-       WARN_ONCE(!atomic_read(&i915->runtime_pm.wakeref_count),
+       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_wakelock_held(&i915->runtime_pm);
+}
+
 /**
  * disable_rpm_wakeref_asserts - disable the RPM assert checks
  * @i915: i915 device instance

diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index d7ce80cb55d8b6467488602e072be9863781b62a..78e4d5f2320e081744db442d07ec324344706f99 100644 (file)
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -342,7 +342,7 @@ intel_uncore_fw_release_timer(struct hrtimer *timer)
        struct intel_uncore *uncore = forcewake_domain_to_uncore(domain);
        unsigned long irqflags;
 
-       assert_rpm_device_not_suspended(uncore_to_i915(uncore));
+       assert_rpm_device_not_suspended(uncore->rpm);
 
        if (xchg(&domain->active, false))
                return HRTIMER_RESTART;
@@ -623,7 +623,7 @@ void intel_uncore_forcewake_get(struct intel_uncore *uncore,
        if (!uncore->funcs.force_wake_get)
                return;
 
-       assert_rpm_wakelock_held(uncore_to_i915(uncore));
+       __assert_rpm_wakelock_held(uncore->rpm);
 
        spin_lock_irqsave(&uncore->lock, irqflags);
        __intel_uncore_forcewake_get(uncore, fw_domains);
@@ -777,7 +777,7 @@ void assert_forcewakes_active(struct intel_uncore *uncore,
        if (!uncore->funcs.force_wake_get)
                return;
 
-       assert_rpm_wakelock_held(uncore_to_i915(uncore));
+       __assert_rpm_wakelock_held(uncore->rpm);
 
        fw_domains &= uncore->fw_domains;
        WARN(fw_domains & ~uncore->fw_domains_active,
@@ -1095,7 +1095,7 @@ unclaimed_reg_debug(struct intel_uncore *uncore,
 #define GEN2_READ_HEADER(x) \
        struct intel_uncore *uncore = &dev_priv->uncore; \
        u##x val = 0; \
-       assert_rpm_wakelock_held(dev_priv);
+       __assert_rpm_wakelock_held(uncore->rpm);
 
 #define GEN2_READ_FOOTER \
        trace_i915_reg_rw(false, reg, val, sizeof(val), trace); \
@@ -1138,7 +1138,7 @@ __gen2_read(64)
        u32 offset = i915_mmio_reg_offset(reg); \
        unsigned long irqflags; \
        u##x val = 0; \
-       assert_rpm_wakelock_held(dev_priv); \
+       __assert_rpm_wakelock_held(uncore->rpm); \
        spin_lock_irqsave(&uncore->lock, irqflags); \
        unclaimed_reg_debug(uncore, reg, true, true)
 
@@ -1213,7 +1213,7 @@ __gen6_read(64)
 #define GEN2_WRITE_HEADER \
        struct intel_uncore *uncore = &dev_priv->uncore; \
        trace_i915_reg_rw(true, reg, val, sizeof(val), trace); \
-       assert_rpm_wakelock_held(dev_priv); \
+       __assert_rpm_wakelock_held(uncore->rpm); \
 
 #define GEN2_WRITE_FOOTER
 
@@ -1252,7 +1252,7 @@ __gen2_write(32)
        u32 offset = i915_mmio_reg_offset(reg); \
        unsigned long irqflags; \
        trace_i915_reg_rw(true, reg, val, sizeof(val), trace); \
-       assert_rpm_wakelock_held(dev_priv); \
+       __assert_rpm_wakelock_held(uncore->rpm); \
        spin_lock_irqsave(&uncore->lock, irqflags); \
        unclaimed_reg_debug(uncore, reg, false, true)
 
@@ -1596,6 +1596,8 @@ int intel_uncore_init(struct intel_uncore *uncore)
        uncore->pmic_bus_access_nb.notifier_call =
                i915_pmic_bus_access_notifier;
 
+       uncore->rpm = &i915->runtime_pm;
+
        if (!intel_uncore_has_forcewake(uncore)) {
                if (IS_GEN(i915, 5)) {
                        ASSIGN_WRITE_MMIO_VFUNCS(uncore, gen5);

diff --git a/drivers/gpu/drm/i915/intel_uncore.h b/drivers/gpu/drm/i915/intel_uncore.h
index b940d48d15fa0991d532c2e3d0f342bf4da79123..112571c3f41138fd500551b86f4595dd95bfb610 100644 (file)
--- a/drivers/gpu/drm/i915/intel_uncore.h
+++ b/drivers/gpu/drm/i915/intel_uncore.h
@@ -32,6 +32,7 @@
 #include "i915_reg.h"
 
 struct drm_i915_private;
+struct i915_runtime_pm;
 struct intel_uncore;
 
 enum forcewake_domain_id {
@@ -95,6 +96,8 @@ struct intel_forcewake_range {
 struct intel_uncore {
        void __iomem *regs;
 
+       struct i915_runtime_pm *rpm;
+
        spinlock_t lock; /** lock is also taken in irq contexts. */
 
        unsigned int flags;