Commit db557993 authored by Michał Winiarski's avatar Michał Winiarski Committed by Chris Wilson

drm/i915/guc: Always print log stats in i915_guc_info when using GuC

While some of the content in this file is related to GuC submission
only, that's not the case with log related statistics.
Signed-off-by: default avatarMichał Winiarski <michal.winiarski@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: default avatarSagar Arun Kamble <sagar.a.kamble@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180319095348.9716-8-michal.winiarski@intel.com
parent 6a96be24
...@@ -2330,7 +2330,7 @@ static void i915_guc_log_info(struct seq_file *m, ...@@ -2330,7 +2330,7 @@ static void i915_guc_log_info(struct seq_file *m,
{ {
struct intel_guc *guc = &dev_priv->guc; struct intel_guc *guc = &dev_priv->guc;
seq_puts(m, "\nGuC logging stats:\n"); seq_puts(m, "GuC logging stats:\n");
seq_printf(m, "\tISR: flush count %10u, overflow count %10u\n", seq_printf(m, "\tISR: flush count %10u, overflow count %10u\n",
guc->log.flush_count[GUC_ISR_LOG_BUFFER], guc->log.flush_count[GUC_ISR_LOG_BUFFER],
...@@ -2378,14 +2378,19 @@ static int i915_guc_info(struct seq_file *m, void *data) ...@@ -2378,14 +2378,19 @@ static int i915_guc_info(struct seq_file *m, void *data)
struct drm_i915_private *dev_priv = node_to_i915(m->private); struct drm_i915_private *dev_priv = node_to_i915(m->private);
const struct intel_guc *guc = &dev_priv->guc; const struct intel_guc *guc = &dev_priv->guc;
if (!USES_GUC_SUBMISSION(dev_priv)) if (!USES_GUC(dev_priv))
return -ENODEV; return -ENODEV;
i915_guc_log_info(m, dev_priv);
if (!USES_GUC_SUBMISSION(dev_priv))
return 0;
GEM_BUG_ON(!guc->execbuf_client); GEM_BUG_ON(!guc->execbuf_client);
seq_printf(m, "Doorbell map:\n"); seq_printf(m, "\nDoorbell map:\n");
seq_printf(m, "\t%*pb\n", GUC_NUM_DOORBELLS, guc->doorbell_bitmap); seq_printf(m, "\t%*pb\n", GUC_NUM_DOORBELLS, guc->doorbell_bitmap);
seq_printf(m, "Doorbell next cacheline: 0x%x\n\n", guc->db_cacheline); seq_printf(m, "Doorbell next cacheline: 0x%x\n", guc->db_cacheline);
seq_printf(m, "\nGuC execbuf client @ %p:\n", guc->execbuf_client); seq_printf(m, "\nGuC execbuf client @ %p:\n", guc->execbuf_client);
i915_guc_client_info(m, dev_priv, guc->execbuf_client); i915_guc_client_info(m, dev_priv, guc->execbuf_client);
...@@ -2395,8 +2400,6 @@ static int i915_guc_info(struct seq_file *m, void *data) ...@@ -2395,8 +2400,6 @@ static int i915_guc_info(struct seq_file *m, void *data)
i915_guc_client_info(m, dev_priv, guc->preempt_client); i915_guc_client_info(m, dev_priv, guc->preempt_client);
} }
i915_guc_log_info(m, dev_priv);
/* Add more as required ... */ /* Add more as required ... */
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment