Re: [Intel-gfx] [PATCH] drm/i915/guc: Dump the GuC stage descriptor pool in debugfs

2017-05-08 Thread Joonas Lahtinen
On pe, 2017-05-05 at 14:34 +, Oscar Mateo wrote:
> We are missing pieces of information that could be useful for GuC
> debugging.
> 
> Cc: Daniele Ceraolo Spurio 
> Cc: Joonas Lahtinen 
> Signed-off-by: Oscar Mateo 
> ---
>  drivers/gpu/drm/i915/i915_debugfs.c | 61 
> +
>  1 file changed, 61 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c 
> b/drivers/gpu/drm/i915/i915_debugfs.c
> index 870c470..a05a67d 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -2540,6 +2540,66 @@ static int i915_guc_info(struct seq_file *m, void 
> *data)
> >     return 0;
>  }
>  
> +static int i915_guc_stage_pool(struct seq_file *m, void *data)
> +{
> + struct drm_i915_private *dev_priv = node_to_i915(m->private);
> + const struct intel_guc *guc = _priv->guc;
> + struct guc_stage_desc *desc = guc->stage_desc_pool_vaddr;
> + struct i915_guc_client *client = guc->execbuf_client;
> + unsigned int tmp;
> + int index;
> +
> + if (!client) {
> + seq_printf(m, "GuC submission %s\n",
> +    HAS_GUC(dev_priv) ?
> +    "disabled" :
> +    "not supported");
> + return 0;
> + }

De-dupe above fragment into a separate static function;

if (!check_guc(dev_priv))
return 0;

It could be applied to the other GuC functions, too.

Then this is;

Reviewed-by: Joonas Lahtinen 

Regards, Joonas
-- 
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx


[Intel-gfx] [PATCH] drm/i915/guc: Dump the GuC stage descriptor pool in debugfs

2017-05-05 Thread Oscar Mateo
We are missing pieces of information that could be useful for GuC
debugging.

Cc: Daniele Ceraolo Spurio 
Cc: Joonas Lahtinen 
Signed-off-by: Oscar Mateo 
---
 drivers/gpu/drm/i915/i915_debugfs.c | 61 +
 1 file changed, 61 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c 
b/drivers/gpu/drm/i915/i915_debugfs.c
index 870c470..a05a67d 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2540,6 +2540,66 @@ static int i915_guc_info(struct seq_file *m, void *data)
return 0;
 }
 
+static int i915_guc_stage_pool(struct seq_file *m, void *data)
+{
+   struct drm_i915_private *dev_priv = node_to_i915(m->private);
+   const struct intel_guc *guc = _priv->guc;
+   struct guc_stage_desc *desc = guc->stage_desc_pool_vaddr;
+   struct i915_guc_client *client = guc->execbuf_client;
+   unsigned int tmp;
+   int index;
+
+   if (!client) {
+   seq_printf(m, "GuC submission %s\n",
+  HAS_GUC(dev_priv) ?
+  "disabled" :
+  "not supported");
+   return 0;
+   }
+
+   for (index = 0; index < GUC_MAX_STAGE_DESCRIPTORS; index++, desc++) {
+   struct intel_engine_cs *engine;
+
+   if (!(desc->attribute & GUC_STAGE_DESC_ATTR_ACTIVE))
+   continue;
+
+   seq_printf(m, "GuC stage descriptor %u:\n", index);
+   seq_printf(m, "\tIndex: %u\n", desc->stage_id);
+   seq_printf(m, "\tAttribute: 0x%x\n", desc->attribute);
+   seq_printf(m, "\tPriority: %d\n", desc->priority);
+   seq_printf(m, "\tDoorbell id: %d\n", desc->db_id);
+   seq_printf(m, "\tEngines used: 0x%x\n",
+  desc->engines_used);
+   seq_printf(m, "\tDoorbell trigger phy: 0x%llx, cpu: 0x%llx, uK: 
0x%x\n",
+  desc->db_trigger_phy,
+  desc->db_trigger_cpu,
+  desc->db_trigger_uk);
+   seq_printf(m, "\tProcess descriptor: 0x%x\n",
+  desc->process_desc);
+   seq_printf(m, "\tWorkqueue adddress: 0x%x, size: 0x%x\n",
+  desc->wq_addr, desc->wq_size);
+   seq_putc(m, '\n');
+
+   for_each_engine_masked(engine, dev_priv, client->engines, tmp) {
+   uint32_t guc_engine_id = engine->guc_id;
+   struct guc_execlist_context *lrc =
+   >lrc[guc_engine_id];
+
+   seq_printf(m, "\t%s LRC:\n", engine->name);
+   seq_printf(m, "\t\tContext desc: 0x%x\n",
+  lrc->context_desc);
+   seq_printf(m, "\t\tContext id: 0x%x\n", 
lrc->context_id);
+   seq_printf(m, "\t\tLRCA: 0x%x\n", lrc->ring_lrca);
+   seq_printf(m, "\t\tRing begin: 0x%x\n", 
lrc->ring_begin);
+   seq_printf(m, "\t\tRing end: 0x%x\n", lrc->ring_end);
+   seq_putc(m, '\n');
+
+   }
+   }
+
+   return 0;
+}
+
 static int i915_guc_log_dump(struct seq_file *m, void *data)
 {
struct drm_i915_private *dev_priv = node_to_i915(m->private);
@@ -4774,6 +4834,7 @@ static int i915_hpd_storm_ctl_open(struct inode *inode, 
struct file *file)
{"i915_guc_info", i915_guc_info, 0},
{"i915_guc_load_status", i915_guc_load_status_info, 0},
{"i915_guc_log_dump", i915_guc_log_dump, 0},
+   {"i915_guc_stage_pool", i915_guc_stage_pool, 0},
{"i915_huc_load_status", i915_huc_load_status_info, 0},
{"i915_frequency_info", i915_frequency_info, 0},
{"i915_hangcheck_info", i915_hangcheck_info, 0},
-- 
1.9.1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx