diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-11-24 04:34:01 -0500 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2016-12-05 04:00:31 -0500 |
commit | 6cef2f8477206fc0a6961358e8ef9d01a3201a5c (patch) | |
tree | 962c3af3206be89347ddbb3cd28ebd9180ed946f | |
parent | 1f3dc3e334c1192ebe2939ea17ba12f4776f90c3 (diff) |
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: 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>
Link: http://patchwork.freedesktop.org/patch/msgid/20161124093401.18852-1-chris@chris-wilson.co.uk
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
(cherry picked from commit 30576a2c462d9658508c3de67601aa565f973064)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
-rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 96407f684f7f..673fcba26fe2 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) | |||
935 | return 0; | 935 | return 0; |
936 | } | 936 | } |
937 | 937 | ||
938 | static int i915_hws_info(struct seq_file *m, void *data) | ||
939 | { | ||
940 | struct drm_info_node *node = m->private; | ||
941 | struct drm_i915_private *dev_priv = node_to_i915(node); | ||
942 | struct intel_engine_cs *engine; | ||
943 | const u32 *hws; | ||
944 | int i; | ||
945 | |||
946 | engine = dev_priv->engine[(uintptr_t)node->info_ent->data]; | ||
947 | hws = engine->status_page.page_addr; | ||
948 | if (hws == NULL) | ||
949 | return 0; | ||
950 | |||
951 | for (i = 0; i < 4096 / sizeof(u32) / 4; i += 4) { | ||
952 | seq_printf(m, "0x%08x: 0x%08x 0x%08x 0x%08x 0x%08x\n", | ||
953 | i * 4, | ||
954 | hws[i], hws[i + 1], hws[i + 2], hws[i + 3]); | ||
955 | } | ||
956 | return 0; | ||
957 | } | ||
958 | |||
959 | #if IS_ENABLED(CONFIG_DRM_I915_CAPTURE_ERROR) | 938 | #if IS_ENABLED(CONFIG_DRM_I915_CAPTURE_ERROR) |
960 | 939 | ||
961 | static ssize_t | 940 | static ssize_t |
@@ -5403,10 +5382,6 @@ static const struct drm_info_list i915_debugfs_list[] = { | |||
5403 | {"i915_gem_seqno", i915_gem_seqno_info, 0}, | 5382 | {"i915_gem_seqno", i915_gem_seqno_info, 0}, |
5404 | {"i915_gem_fence_regs", i915_gem_fence_regs_info, 0}, | 5383 | {"i915_gem_fence_regs", i915_gem_fence_regs_info, 0}, |
5405 | {"i915_gem_interrupt", i915_interrupt_info, 0}, | 5384 | {"i915_gem_interrupt", i915_interrupt_info, 0}, |
5406 | {"i915_gem_hws", i915_hws_info, 0, (void *)RCS}, | ||
5407 | {"i915_gem_hws_blt", i915_hws_info, 0, (void *)BCS}, | ||
5408 | {"i915_gem_hws_bsd", i915_hws_info, 0, (void *)VCS}, | ||
5409 | {"i915_gem_hws_vebox", i915_hws_info, 0, (void *)VECS}, | ||
5410 | {"i915_gem_batch_pool", i915_gem_batch_pool_info, 0}, | 5385 | {"i915_gem_batch_pool", i915_gem_batch_pool_info, 0}, |
5411 | {"i915_guc_info", i915_guc_info, 0}, | 5386 | {"i915_guc_info", i915_guc_info, 0}, |
5412 | {"i915_guc_load_status", i915_guc_load_status_info, 0}, | 5387 | {"i915_guc_load_status", i915_guc_load_status_info, 0}, |