| Message ID | 20190802205134.303-2-stuart.summers@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Refactor to expand subslice mask (rev 2) | expand |
Quoting Stuart Summers (2019-08-02 21:51:25) > Use a local variable to find SSEU runtime information > in various debugfs functions. > > Signed-off-by: Stuart Summers <stuart.summers@intel.com> > --- > @@ -3969,10 +3969,10 @@ static void broadwell_sseu_device_status(struct drm_i915_private *dev_priv, > > if (sseu->slice_mask) { > sseu->eu_per_subslice = > - RUNTIME_INFO(dev_priv)->sseu.eu_per_subslice; > + info->sseu.eu_per_subslice; > for (s = 0; s < fls(sseu->slice_mask); s++) { > sseu->subslice_mask[s] = > - RUNTIME_INFO(dev_priv)->sseu.subslice_mask[s]; > + info->sseu.subslice_mask[s]; > } > sseu->eu_total = sseu->eu_per_subslice * > intel_sseu_subslice_total(sseu); > @@ -3980,7 +3980,7 @@ static void broadwell_sseu_device_status(struct drm_i915_private *dev_priv, > /* subtract fused off EU(s) from enabled slice(s) */ > for (s = 0; s < fls(sseu->slice_mask); s++) { > u8 subslice_7eu = > - RUNTIME_INFO(dev_priv)->sseu.subslice_7eu[s]; > + info->sseu.subslice_7eu[s]; These 3 condense back to single lines. Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> -Chris
On Fri, 2019-08-02 at 22:24 +0100, Chris Wilson wrote: > Quoting Stuart Summers (2019-08-02 21:51:25) > > Use a local variable to find SSEU runtime information > > in various debugfs functions. > > > > Signed-off-by: Stuart Summers <stuart.summers@intel.com> > > --- > > @@ -3969,10 +3969,10 @@ static void > > broadwell_sseu_device_status(struct drm_i915_private *dev_priv, > > > > if (sseu->slice_mask) { > > sseu->eu_per_subslice = > > - RUNTIME_INFO(dev_priv)- > > >sseu.eu_per_subslice; > > + info->sseu.eu_per_subslice; > > for (s = 0; s < fls(sseu->slice_mask); s++) { > > sseu->subslice_mask[s] = > > - RUNTIME_INFO(dev_priv)- > > >sseu.subslice_mask[s]; > > + info->sseu.subslice_mask[s]; > > } > > sseu->eu_total = sseu->eu_per_subslice * > > intel_sseu_subslice_total(sseu); > > @@ -3980,7 +3980,7 @@ static void > > broadwell_sseu_device_status(struct drm_i915_private *dev_priv, > > /* subtract fused off EU(s) from enabled slice(s) > > */ > > for (s = 0; s < fls(sseu->slice_mask); s++) { > > u8 subslice_7eu = > > - RUNTIME_INFO(dev_priv)- > > >sseu.subslice_7eu[s]; > > + info->sseu.subslice_7eu[s]; > > These 3 condense back to single lines. Thanks for the review! I'll reduce these to single lines in the next revision. Thanks, Stuart > > Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> > -Chris
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 6dbd85b38759..729348558b0e 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -3934,8 +3934,7 @@ static void gen9_sseu_device_status(struct drm_i915_private *dev_priv, sseu->slice_mask |= BIT(s); if (IS_GEN9_BC(dev_priv)) - sseu->subslice_mask[s] = - RUNTIME_INFO(dev_priv)->sseu.subslice_mask[s]; + sseu->subslice_mask[s] = info->sseu.subslice_mask[s]; for (ss = 0; ss < info->sseu.max_subslices; ss++) { unsigned int eu_cnt; @@ -3962,6 +3961,7 @@ static void gen9_sseu_device_status(struct drm_i915_private *dev_priv, static void broadwell_sseu_device_status(struct drm_i915_private *dev_priv, struct sseu_dev_info *sseu) { + const struct intel_runtime_info *info = RUNTIME_INFO(dev_priv); u32 slice_info = I915_READ(GEN8_GT_SLICE_INFO); int s; @@ -3969,10 +3969,10 @@ static void broadwell_sseu_device_status(struct drm_i915_private *dev_priv, if (sseu->slice_mask) { sseu->eu_per_subslice = - RUNTIME_INFO(dev_priv)->sseu.eu_per_subslice; + info->sseu.eu_per_subslice; for (s = 0; s < fls(sseu->slice_mask); s++) { sseu->subslice_mask[s] = - RUNTIME_INFO(dev_priv)->sseu.subslice_mask[s]; + info->sseu.subslice_mask[s]; } sseu->eu_total = sseu->eu_per_subslice * intel_sseu_subslice_total(sseu); @@ -3980,7 +3980,7 @@ static void broadwell_sseu_device_status(struct drm_i915_private *dev_priv, /* subtract fused off EU(s) from enabled slice(s) */ for (s = 0; s < fls(sseu->slice_mask); s++) { u8 subslice_7eu = - RUNTIME_INFO(dev_priv)->sseu.subslice_7eu[s]; + info->sseu.subslice_7eu[s]; sseu->eu_total -= hweight8(subslice_7eu); } @@ -4027,6 +4027,7 @@ static void i915_print_sseu_info(struct seq_file *m, bool is_available_info, static int i915_sseu_status(struct seq_file *m, void *unused) { struct drm_i915_private *dev_priv = node_to_i915(m->private); + const struct intel_runtime_info *info = RUNTIME_INFO(dev_priv); struct sseu_dev_info sseu; intel_wakeref_t wakeref; @@ -4034,14 +4035,13 @@ static int i915_sseu_status(struct seq_file *m, void *unused) return -ENODEV; seq_puts(m, "SSEU Device Info\n"); - i915_print_sseu_info(m, true, &RUNTIME_INFO(dev_priv)->sseu); + i915_print_sseu_info(m, true, &info->sseu); seq_puts(m, "SSEU Device Status\n"); memset(&sseu, 0, sizeof(sseu)); - sseu.max_slices = RUNTIME_INFO(dev_priv)->sseu.max_slices; - sseu.max_subslices = RUNTIME_INFO(dev_priv)->sseu.max_subslices; - sseu.max_eus_per_subslice = - RUNTIME_INFO(dev_priv)->sseu.max_eus_per_subslice; + sseu.max_slices = info->sseu.max_slices; + sseu.max_subslices = info->sseu.max_subslices; + sseu.max_eus_per_subslice = info->sseu.max_eus_per_subslice; with_intel_runtime_pm(&dev_priv->runtime_pm, wakeref) { if (IS_CHERRYVIEW(dev_priv))
Use a local variable to find SSEU runtime information in various debugfs functions. Signed-off-by: Stuart Summers <stuart.summers@intel.com> --- drivers/gpu/drm/i915/i915_debugfs.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)