All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915/debugfs: Drop i915_hws_info
@ 2016-11-24  9:34 Chris Wilson
  2016-11-24 10:15 ` ✓ Fi.CI.BAT: success for " Patchwork
  2016-11-24 10:54 ` [PATCH] " Tvrtko Ursulin
  0 siblings, 2 replies; 4+ messages in thread
From: Chris Wilson @ 2016-11-24  9:34 UTC (permalink / raw)
  To: intel-gfx

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@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@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},
-- 
2.10.2

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

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915/debugfs: Drop i915_hws_info
  2016-11-24  9:34 [PATCH] drm/i915/debugfs: Drop i915_hws_info Chris Wilson
@ 2016-11-24 10:15 ` Patchwork
  2016-11-24 10:54 ` [PATCH] " Tvrtko Ursulin
  1 sibling, 0 replies; 4+ messages in thread
From: Patchwork @ 2016-11-24 10:15 UTC (permalink / raw)
  To: Chris Wilson; +Cc: intel-gfx

== Series Details ==

Series: drm/i915/debugfs: Drop i915_hws_info
URL   : https://patchwork.freedesktop.org/series/15885/
State : success

== Summary ==

Series 15885v1 drm/i915/debugfs: Drop i915_hws_info
https://patchwork.freedesktop.org/api/1.0/series/15885/revisions/1/mbox/


fi-bdw-5557u     total:244  pass:229  dwarn:0   dfail:0   fail:0   skip:15 
fi-bsw-n3050     total:244  pass:204  dwarn:0   dfail:0   fail:0   skip:40 
fi-bxt-t5700     total:244  pass:216  dwarn:0   dfail:0   fail:0   skip:28 
fi-byt-j1900     total:244  pass:216  dwarn:0   dfail:0   fail:0   skip:28 
fi-byt-n2820     total:244  pass:212  dwarn:0   dfail:0   fail:0   skip:32 
fi-hsw-4770      total:244  pass:224  dwarn:0   dfail:0   fail:0   skip:20 
fi-hsw-4770r     total:244  pass:224  dwarn:0   dfail:0   fail:0   skip:20 
fi-ilk-650       total:244  pass:191  dwarn:0   dfail:0   fail:0   skip:53 
fi-ivb-3520m     total:244  pass:222  dwarn:0   dfail:0   fail:0   skip:22 
fi-ivb-3770      total:244  pass:222  dwarn:0   dfail:0   fail:0   skip:22 
fi-kbl-7200u     total:244  pass:222  dwarn:0   dfail:0   fail:0   skip:22 
fi-skl-6260u     total:244  pass:230  dwarn:0   dfail:0   fail:0   skip:14 
fi-skl-6700hq    total:244  pass:223  dwarn:0   dfail:0   fail:0   skip:21 
fi-skl-6700k     total:244  pass:222  dwarn:1   dfail:0   fail:0   skip:21 
fi-skl-6770hq    total:244  pass:230  dwarn:0   dfail:0   fail:0   skip:14 
fi-snb-2520m     total:244  pass:212  dwarn:0   dfail:0   fail:0   skip:32 
fi-snb-2600      total:244  pass:211  dwarn:0   dfail:0   fail:0   skip:33 

2154a854b8c9f732ef446a5c99cb24b8d97347f7 drm-intel-nightly: 2016y-11m-24d-07h-21m-33s UTC integration manifest
b32c1fa drm/i915/debugfs: Drop i915_hws_info

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3103/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915/debugfs: Drop i915_hws_info
  2016-11-24  9:34 [PATCH] drm/i915/debugfs: Drop i915_hws_info Chris Wilson
  2016-11-24 10:15 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2016-11-24 10:54 ` Tvrtko Ursulin
  2016-11-24 11:05   ` Chris Wilson
  1 sibling, 1 reply; 4+ messages in thread
From: Tvrtko Ursulin @ 2016-11-24 10:54 UTC (permalink / raw)
  To: Chris Wilson, intel-gfx


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@chris-wilson.co.uk>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@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@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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915/debugfs: Drop i915_hws_info
  2016-11-24 10:54 ` [PATCH] " Tvrtko Ursulin
@ 2016-11-24 11:05   ` Chris Wilson
  0 siblings, 0 replies; 4+ messages in thread
From: Chris Wilson @ 2016-11-24 11:05 UTC (permalink / raw)
  To: Tvrtko Ursulin; +Cc: intel-gfx

On Thu, Nov 24, 2016 at 10:54:48AM +0000, Tvrtko Ursulin wrote:
> Per-engine files is ugly anyway, so:

Yup. Pushed to drm-tip.
-Chris # playing with a new toy

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-11-24 11:05 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-24  9:34 [PATCH] drm/i915/debugfs: Drop i915_hws_info Chris Wilson
2016-11-24 10:15 ` ✓ Fi.CI.BAT: success for " Patchwork
2016-11-24 10:54 ` [PATCH] " Tvrtko Ursulin
2016-11-24 11:05   ` Chris Wilson

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.