[Intel-gfx] [PATCH] drm/i915/debugfs: Drop i915_hws_info

[Tvrtko Ursulin]

On 24/11/2016 09:34, Chris Wilson wrote:
> i915_hws_info() has not been kept upto date (missing new engines) and so
> I consider it to be unused. HWS is included in the error state, which
> would be an avenue to retrieving it if required in future (possibly via
> i915_engine_info). As it is currently oopsing with rpm, just remove it.
>
> Fixes: 3b3f1650b1ca ("drm/i915: Allocate intel_engine_cs structure only for the enabled engines")
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98838
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_debugfs.c | 25 -------------------------
>  1 file changed, 25 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index eb5a13adb120..4cad5bf116b5 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -935,27 +935,6 @@ static int i915_gem_fence_regs_info(struct seq_file *m, void *data)
>  	return 0;
>  }
>
> -static int i915_hws_info(struct seq_file *m, void *data)
> -{
> -	struct drm_info_node *node = m->private;
> -	struct drm_i915_private *dev_priv = node_to_i915(node);
> -	struct intel_engine_cs *engine;
> -	const u32 *hws;
> -	int i;
> -
> -	engine = dev_priv->engine[(uintptr_t)node->info_ent->data];
> -	hws = engine->status_page.page_addr;
> -	if (hws == NULL)
> -		return 0;
> -
> -	for (i = 0; i < 4096 / sizeof(u32) / 4; i += 4) {
> -		seq_printf(m, "0x%08x: 0x%08x 0x%08x 0x%08x 0x%08x\n",
> -			   i * 4,
> -			   hws[i], hws[i + 1], hws[i + 2], hws[i + 3]);
> -	}
> -	return 0;
> -}
> -
>  #if IS_ENABLED(CONFIG_DRM_I915_CAPTURE_ERROR)
>
>  static ssize_t
> @@ -5399,10 +5378,6 @@ static const struct drm_info_list i915_debugfs_list[] = {
>  	{"i915_gem_seqno", i915_gem_seqno_info, 0},
>  	{"i915_gem_fence_regs", i915_gem_fence_regs_info, 0},
>  	{"i915_gem_interrupt", i915_interrupt_info, 0},
> -	{"i915_gem_hws", i915_hws_info, 0, (void *)RCS},
> -	{"i915_gem_hws_blt", i915_hws_info, 0, (void *)BCS},
> -	{"i915_gem_hws_bsd", i915_hws_info, 0, (void *)VCS},
> -	{"i915_gem_hws_vebox", i915_hws_info, 0, (void *)VECS},
>  	{"i915_gem_batch_pool", i915_gem_batch_pool_info, 0},
>  	{"i915_guc_info", i915_guc_info, 0},
>  	{"i915_guc_load_status", i915_guc_load_status_info, 0},
>

Per-engine files is ugly anyway, so:

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

If someone really needs this a much nicer solution would be a single 
file and then dump all initialized engines with banners.

Regards,

Tvrtko