Signed-off-by: Imre Deak <imre.deak@xxxxxxxxx> --- drivers/gpu/drm/i915/i915_debugfs.c | 55 +++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index de188d0..183c1f2 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -5071,6 +5071,33 @@ static void broadwell_sseu_device_status(struct drm_device *dev, } } +static void i915_print_sseu_info(struct seq_file *m, bool is_available_info, + const struct sseu_dev_info *sseu) +{ + const char *type = is_available_info ? "Available" : "Enabled"; + + seq_printf(m, " %s Slice Total: %u\n", type, + sseu->slice_total); + seq_printf(m, " %s Subslice Total: %u\n", type, + sseu->subslice_total); + seq_printf(m, " %s Subslice Per Slice: %u\n", type, + sseu->subslice_per_slice); + seq_printf(m, " %s EU Total: %u\n", type, + sseu->eu_total); + seq_printf(m, " %s EU Per Subslice: %u\n", type, + sseu->eu_per_subslice); + + if (!is_available_info) + return; + + seq_printf(m, " Has Slice Power Gating: %s\n", + yesno(sseu->has_slice_pg)); + seq_printf(m, " Has Subslice Power Gating: %s\n", + yesno(sseu->has_subslice_pg)); + seq_printf(m, " Has EU Power Gating: %s\n", + yesno(sseu->has_eu_pg)); +} + static int i915_sseu_status(struct seq_file *m, void *unused) { struct drm_info_node *node = (struct drm_info_node *) m->private; @@ -5081,22 +5108,7 @@ static int i915_sseu_status(struct seq_file *m, void *unused) return -ENODEV; seq_puts(m, "SSEU Device Info\n"); - seq_printf(m, " Available Slice Total: %u\n", - INTEL_INFO(dev)->sseu.slice_total); - seq_printf(m, " Available Subslice Total: %u\n", - INTEL_INFO(dev)->sseu.subslice_total); - seq_printf(m, " Available Subslice Per Slice: %u\n", - INTEL_INFO(dev)->sseu.subslice_per_slice); - seq_printf(m, " Available EU Total: %u\n", - INTEL_INFO(dev)->sseu.eu_total); - seq_printf(m, " Available EU Per Subslice: %u\n", - INTEL_INFO(dev)->sseu.eu_per_subslice); - seq_printf(m, " Has Slice Power Gating: %s\n", - yesno(INTEL_INFO(dev)->sseu.has_slice_pg)); - seq_printf(m, " Has Subslice Power Gating: %s\n", - yesno(INTEL_INFO(dev)->sseu.has_subslice_pg)); - seq_printf(m, " Has EU Power Gating: %s\n", - yesno(INTEL_INFO(dev)->sseu.has_eu_pg)); + i915_print_sseu_info(m, true, &INTEL_INFO(dev)->sseu); seq_puts(m, "SSEU Device Status\n"); memset(&stat, 0, sizeof(stat)); @@ -5107,16 +5119,7 @@ static int i915_sseu_status(struct seq_file *m, void *unused) } else if (INTEL_INFO(dev)->gen >= 9) { gen9_sseu_device_status(dev, &stat); } - seq_printf(m, " Enabled Slice Total: %u\n", - stat.slice_total); - seq_printf(m, " Enabled Subslice Total: %u\n", - stat.subslice_total); - seq_printf(m, " Enabled Subslice Per Slice: %u\n", - stat.subslice_per_slice); - seq_printf(m, " Enabled EU Total: %u\n", - stat.eu_total); - seq_printf(m, " Enabled EU Per Subslice: %u\n", - stat.eu_per_subslice); + i915_print_sseu_info(m, false, &stat); return 0; } -- 2.1.4 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx