| Message ID | 20170515155207.75720-1-michal.wajdeczko@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, May 15, 2017 at 03:52:07PM +0000, Michal Wajdeczko wrote: > Usefulness of these stats were over-advertised. > > Suggested-by: Chris Wilson <chris@chris-wilson.co.uk> > Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> > Cc: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> > --- > drivers/gpu/drm/i915/i915_debugfs.c | 6 ------ > drivers/gpu/drm/i915/intel_uc.c | 7 ------- > drivers/gpu/drm/i915/intel_uc.h | 7 ------- > 3 files changed, 20 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index bd9abef..7d8f9cf 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -2525,12 +2525,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) { > 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..b3fdfec 100644 > --- a/drivers/gpu/drm/i915/intel_uc.h > +++ b/drivers/gpu/drm/i915/intel_uc.h > @@ -195,13 +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]; Don't stop now, these two are duplicate statistics and not backend specific. -Chris
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index bd9abef..7d8f9cf 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -2525,12 +2525,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) { 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..b3fdfec 100644 --- a/drivers/gpu/drm/i915/intel_uc.h +++ b/drivers/gpu/drm/i915/intel_uc.h @@ -195,13 +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];
Usefulness of these stats were over-advertised. Suggested-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> --- drivers/gpu/drm/i915/i915_debugfs.c | 6 ------ drivers/gpu/drm/i915/intel_uc.c | 7 ------- drivers/gpu/drm/i915/intel_uc.h | 7 ------- 3 files changed, 20 deletions(-)