Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30576a2c authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/debugfs: Drop i915_hws_info 

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 an rpm testcase, just
remove it.

Fixes: 3b3f1650 ("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: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161124093401.18852-1-chris@chris-wilson.co.uk


Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
parent ac240288

drivers/gpu/drm/i915/i915_debugfs.c

+0 −25
Original line number Diff line number Diff line
@@ -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
@@ -5408,10 +5387,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},