| Message ID | 2ab5b752aaf954678a4171d61be7277cf6693e0c.1575302334.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: add display uncore helpers | expand |
Quoting Jani Nikula (2019-12-02 16:00:50) > Move away from I915_READ_FW() and I915_WRITE_FW() and switch to using > intel_uncore_read_fw() and intel_uncore_write_fw(), respectively. > > No functional changes. > > Cc: Chris Wilson <chris@chris-wilson.co.uk> > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/i915_debugfs.c | 14 +++++++++----- > 1 file changed, 9 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index cab632791f73..42709a57b475 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -1128,7 +1128,8 @@ static int gen6_drpc_info(struct seq_file *m) > u32 gt_core_status, rcctl1, rc6vids = 0; > u32 gen9_powergate_enable = 0, gen9_powergate_status = 0; > > - gt_core_status = I915_READ_FW(GEN6_GT_CORE_STATUS); > + gt_core_status = intel_uncore_read_fw(&dev_priv->uncore, > + GEN6_GT_CORE_STATUS); > trace_i915_reg_rw(false, GEN6_GT_CORE_STATUS, gt_core_status, 4, true); > > rcctl1 = I915_READ(GEN6_RC_CONTROL); > @@ -1674,10 +1675,13 @@ static int i915_rps_boost_info(struct seq_file *m, void *data) > u32 rpdown, rpdownei; > > intel_uncore_forcewake_get(&dev_priv->uncore, FORCEWAKE_ALL); > - rpup = I915_READ_FW(GEN6_RP_CUR_UP) & GEN6_RP_EI_MASK; > - rpupei = I915_READ_FW(GEN6_RP_CUR_UP_EI) & GEN6_RP_EI_MASK; > - rpdown = I915_READ_FW(GEN6_RP_CUR_DOWN) & GEN6_RP_EI_MASK; > - rpdownei = I915_READ_FW(GEN6_RP_CUR_DOWN_EI) & GEN6_RP_EI_MASK; > + rpup = intel_uncore_read_fw(&dev_priv->uncore, GEN6_RP_CUR_UP) & GEN6_RP_EI_MASK; > + rpupei = intel_uncore_read_fw(&dev_priv->uncore, > + GEN6_RP_CUR_UP_EI) & GEN6_RP_EI_MASK; > + rpdown = intel_uncore_read_fw(&dev_priv->uncore, > + GEN6_RP_CUR_DOWN) & GEN6_RP_EI_MASK; > + rpdownei = intel_uncore_read_fw(&dev_priv->uncore, > + GEN6_RP_CUR_DOWN_EI) & GEN6_RP_EI_MASK; > intel_uncore_forcewake_put(&dev_priv->uncore, FORCEWAKE_ALL); These should be moved over to a intel_rps_show() as they need gt->uncore. -Chris
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index cab632791f73..42709a57b475 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -1128,7 +1128,8 @@ static int gen6_drpc_info(struct seq_file *m) u32 gt_core_status, rcctl1, rc6vids = 0; u32 gen9_powergate_enable = 0, gen9_powergate_status = 0; - gt_core_status = I915_READ_FW(GEN6_GT_CORE_STATUS); + gt_core_status = intel_uncore_read_fw(&dev_priv->uncore, + GEN6_GT_CORE_STATUS); trace_i915_reg_rw(false, GEN6_GT_CORE_STATUS, gt_core_status, 4, true); rcctl1 = I915_READ(GEN6_RC_CONTROL); @@ -1674,10 +1675,13 @@ static int i915_rps_boost_info(struct seq_file *m, void *data) u32 rpdown, rpdownei; intel_uncore_forcewake_get(&dev_priv->uncore, FORCEWAKE_ALL); - rpup = I915_READ_FW(GEN6_RP_CUR_UP) & GEN6_RP_EI_MASK; - rpupei = I915_READ_FW(GEN6_RP_CUR_UP_EI) & GEN6_RP_EI_MASK; - rpdown = I915_READ_FW(GEN6_RP_CUR_DOWN) & GEN6_RP_EI_MASK; - rpdownei = I915_READ_FW(GEN6_RP_CUR_DOWN_EI) & GEN6_RP_EI_MASK; + rpup = intel_uncore_read_fw(&dev_priv->uncore, GEN6_RP_CUR_UP) & GEN6_RP_EI_MASK; + rpupei = intel_uncore_read_fw(&dev_priv->uncore, + GEN6_RP_CUR_UP_EI) & GEN6_RP_EI_MASK; + rpdown = intel_uncore_read_fw(&dev_priv->uncore, + GEN6_RP_CUR_DOWN) & GEN6_RP_EI_MASK; + rpdownei = intel_uncore_read_fw(&dev_priv->uncore, + GEN6_RP_CUR_DOWN_EI) & GEN6_RP_EI_MASK; intel_uncore_forcewake_put(&dev_priv->uncore, FORCEWAKE_ALL); seq_printf(m, "\nRPS Autotuning (current \"%s\" window):\n",
Move away from I915_READ_FW() and I915_WRITE_FW() and switch to using intel_uncore_read_fw() and intel_uncore_write_fw(), respectively. No functional changes. Cc: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/i915_debugfs.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)