[Intel-gfx] [PATCH v2] drm/i915/guc: Remove action status and statistics from debugfs

[Tvrtko Ursulin]

On 15/05/2017 18:06, Michal Wajdeczko wrote:
> Usefulness of these stats was over-advertised.
>
> v2: remove duplicated engine stats (Chris)
>
> Suggested-by: Chris Wilson <chris at chris-wilson.co.uk>
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_debugfs.c        | 19 -------------------
>  drivers/gpu/drm/i915/i915_guc_submission.c |  3 ---
>  drivers/gpu/drm/i915/intel_uc.c            |  7 -------
>  drivers/gpu/drm/i915/intel_uc.h            | 10 ----------
>  4 files changed, 39 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index bd9abef..fdb2fd0 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -2514,9 +2514,6 @@ static int i915_guc_info(struct seq_file *m, void *data)
>  {
>  	struct drm_i915_private *dev_priv = node_to_i915(m->private);
>  	const struct intel_guc *guc = &dev_priv->guc;
> -	struct intel_engine_cs *engine;
> -	enum intel_engine_id id;
> -	u64 total;
>
>  	if (!check_guc_submission(m))
>  		return 0;
> @@ -2525,22 +2522,6 @@ static int i915_guc_info(struct seq_file *m, void *data)
>  	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, "GuC total action count: %llu\n", guc->action_count);
> -	seq_printf(m, "GuC action failure count: %u\n", guc->action_fail);
> -	seq_printf(m, "GuC last action command: 0x%x\n", guc->action_cmd);
> -	seq_printf(m, "GuC last action status: 0x%x\n", guc->action_status);
> -	seq_printf(m, "GuC last action error code: %d\n", guc->action_err);
> -
> -	total = 0;
> -	seq_printf(m, "\nGuC submissions:\n");
> -	for_each_engine(engine, dev_priv, id) {
> -		u64 submissions = guc->submissions[id];
> -		total += submissions;
> -		seq_printf(m, "\t%-24s: %10llu, last seqno 0x%08x\n",
> -			engine->name, submissions, guc->last_seqno[id]);
> -	}
> -	seq_printf(m, "\t%s: %llu\n", "Total", total);
> -
>  	seq_printf(m, "\nGuC execbuf client @ %p:\n", guc->execbuf_client);
>  	i915_guc_client_info(m, dev_priv, guc->execbuf_client);
>
> diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c
> index 7e85b5a..edda4da 100644
> --- a/drivers/gpu/drm/i915/i915_guc_submission.c
> +++ b/drivers/gpu/drm/i915/i915_guc_submission.c
> @@ -618,9 +618,6 @@ static void __i915_guc_submit(struct drm_i915_gem_request *rq)
>  	if (b_ret)
>  		client->b_fail += 1;
>
> -	guc->submissions[engine_id] += 1;
> -	guc->last_seqno[engine_id] = rq->global_seqno;
> -
>  	spin_unlock_irqrestore(&client->wq_lock, flags);
>  }
>
> diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
> index 07c5658..d27b527 100644
> --- a/drivers/gpu/drm/i915/intel_uc.c
> +++ b/drivers/gpu/drm/i915/intel_uc.c
> @@ -440,9 +440,6 @@ int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len)
>  	mutex_lock(&guc->send_mutex);
>  	intel_uncore_forcewake_get(dev_priv, guc->send_regs.fw_domains);
>
> -	dev_priv->guc.action_count += 1;
> -	dev_priv->guc.action_cmd = action[0];
> -
>  	for (i = 0; i < len; i++)
>  		I915_WRITE(guc_send_reg(guc, i), action[i]);
>
> @@ -471,11 +468,7 @@ int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len)
>  		DRM_WARN("INTEL_GUC_SEND: Action 0x%X failed;"
>  			 " ret=%d status=0x%08X response=0x%08X\n",
>  			 action[0], ret, status, I915_READ(SOFT_SCRATCH(15)));
> -
> -		dev_priv->guc.action_fail += 1;
> -		dev_priv->guc.action_err = ret;
>  	}
> -	dev_priv->guc.action_status = status;
>
>  	intel_uncore_forcewake_put(dev_priv, guc->send_regs.fw_domains);
>  	mutex_unlock(&guc->send_mutex);
> diff --git a/drivers/gpu/drm/i915/intel_uc.h b/drivers/gpu/drm/i915/intel_uc.h
> index 7618b71..b432747 100644
> --- a/drivers/gpu/drm/i915/intel_uc.h
> +++ b/drivers/gpu/drm/i915/intel_uc.h
> @@ -195,16 +195,6 @@ struct intel_guc {
>  	DECLARE_BITMAP(doorbell_bitmap, GUC_NUM_DOORBELLS);
>  	uint32_t db_cacheline;		/* Cyclic counter mod pagesize	*/
>
> -	/* Action status & statistics */
> -	uint64_t action_count;		/* Total commands issued	*/
> -	uint32_t action_cmd;		/* Last command word		*/
> -	uint32_t action_status;		/* Last return status		*/
> -	uint32_t action_fail;		/* Total number of failures	*/
> -	int32_t action_err;		/* Last error code		*/
> -
> -	uint64_t submissions[I915_NUM_ENGINES];
> -	uint32_t last_seqno[I915_NUM_ENGINES];
> -
>  	/* GuC's FW specific registers used in MMIO send */
>  	struct {
>  		u32 base;
>

Can't see that we need these.

Acked-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Regards,

Tvrtko