From: Imre Deak <imre.deak@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Ben Widawsky <benjamin.widawsky@intel.com>
Subject: [PATCH v2 3/7] drm/i915: sseu: Simplify debugfs status/info printing
Date: Wed, 31 Aug 2016 19:13:03 +0300 [thread overview]
Message-ID: <1472659987-10417-4-git-send-email-imre.deak@intel.com> (raw)
In-Reply-To: <1472659987-10417-1-git-send-email-imre.deak@intel.com>
Reviewed-by: Robert Bragg <robert@sixbynine.org>
Reviewed-by: Ben Widawsky <benjamin.widawsky@intel.com>
Tested-by: Ben Widawsky <benjamin.widawsky@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
---
drivers/gpu/drm/i915/i915_debugfs.c | 64 ++++++++++++++++++++-----------------
1 file changed, 34 insertions(+), 30 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index dc3eb2f..b607755 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -5130,35 +5130,48 @@ static void broadwell_sseu_device_status(struct drm_i915_private *dev_priv,
}
}
-static int i915_sseu_status(struct seq_file *m, void *unused)
+static void i915_print_sseu_info(struct seq_file *m, bool is_available_info,
+ const struct sseu_dev_info *sseu)
{
struct drm_i915_private *dev_priv = node_to_i915(m->private);
- struct sseu_dev_info sseu;
+ const char *type = is_available_info ? "Available" : "Enabled";
- if (INTEL_GEN(dev_priv) < 8)
- return -ENODEV;
+ 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_puts(m, "SSEU Device Info\n");
- seq_printf(m, " Available Slice Total: %u\n",
- INTEL_INFO(dev_priv)->sseu.slice_total);
- seq_printf(m, " Available Subslice Total: %u\n",
- INTEL_INFO(dev_priv)->sseu.subslice_total);
- seq_printf(m, " Available Subslice Per Slice: %u\n",
- INTEL_INFO(dev_priv)->sseu.subslice_per_slice);
- seq_printf(m, " Available EU Total: %u\n",
- INTEL_INFO(dev_priv)->sseu.eu_total);
- seq_printf(m, " Available EU Per Subslice: %u\n",
- INTEL_INFO(dev_priv)->sseu.eu_per_subslice);
seq_printf(m, " Has Pooled EU: %s\n", yesno(HAS_POOLED_EU(dev_priv)));
if (HAS_POOLED_EU(dev_priv))
- seq_printf(m, " Min EU in pool: %u\n",
- INTEL_INFO(dev_priv)->sseu.min_eu_in_pool);
+ seq_printf(m, " Min EU in pool: %u\n", sseu->min_eu_in_pool);
+
seq_printf(m, " Has Slice Power Gating: %s\n",
- yesno(INTEL_INFO(dev_priv)->sseu.has_slice_pg));
+ yesno(sseu->has_slice_pg));
seq_printf(m, " Has Subslice Power Gating: %s\n",
- yesno(INTEL_INFO(dev_priv)->sseu.has_subslice_pg));
+ yesno(sseu->has_subslice_pg));
seq_printf(m, " Has EU Power Gating: %s\n",
- yesno(INTEL_INFO(dev_priv)->sseu.has_eu_pg));
+ yesno(sseu->has_eu_pg));
+}
+
+static int i915_sseu_status(struct seq_file *m, void *unused)
+{
+ struct drm_i915_private *dev_priv = node_to_i915(m->private);
+ struct sseu_dev_info sseu;
+
+ if (INTEL_GEN(dev_priv) < 8)
+ return -ENODEV;
+
+ seq_puts(m, "SSEU Device Info\n");
+ i915_print_sseu_info(m, true, &INTEL_INFO(dev_priv)->sseu);
seq_puts(m, "SSEU Device Status\n");
memset(&sseu, 0, sizeof(sseu));
@@ -5175,16 +5188,7 @@ static int i915_sseu_status(struct seq_file *m, void *unused)
intel_runtime_pm_put(dev_priv);
- seq_printf(m, " Enabled Slice Total: %u\n",
- sseu.slice_total);
- seq_printf(m, " Enabled Subslice Total: %u\n",
- sseu.subslice_total);
- seq_printf(m, " Enabled Subslice Per Slice: %u\n",
- sseu.subslice_per_slice);
- seq_printf(m, " Enabled EU Total: %u\n",
- sseu.eu_total);
- seq_printf(m, " Enabled EU Per Subslice: %u\n",
- sseu.eu_per_subslice);
+ i915_print_sseu_info(m, false, &sseu);
return 0;
}
--
2.5.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-08-31 16:13 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-31 16:13 [PATCH v2 0/7] drm/i915: Read out slice/subslice masks Imre Deak
2016-08-31 16:13 ` [PATCH v2 1/7] drm/i915: sseu: Move sseu_dev_status to i915_drv.h Imre Deak
2016-08-31 16:13 ` [PATCH v2 2/7] drm/i915: sseu: Use sseu_dev_info in device info Imre Deak
2016-08-31 16:13 ` Imre Deak [this message]
2016-08-31 16:13 ` [PATCH v2 4/7] drm/i915: sseu: Convert slice count field to mask Imre Deak
2016-08-31 16:13 ` [PATCH v2 5/7] drm/i915: sseu: Convert subslice count fields to subslice mask Imre Deak
2016-08-31 16:13 ` [PATCH v2 6/7] drm/i915: sseu: Add debug printf for slice/subslice masks Imre Deak
2016-08-31 16:13 ` [PATCH v2 7/7] drm/i915/bdw: sseu: Fix sseu status parsing Imre Deak
2016-09-01 9:50 ` ✗ Fi.CI.BAT: failure for drm/i915: read out slice/subslice masks (rev2) Patchwork
2016-09-02 15:52 ` Imre Deak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1472659987-10417-4-git-send-email-imre.deak@intel.com \
--to=imre.deak@intel.com \
--cc=benjamin.widawsky@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox