diff mbox

drm/i915: Remove unused engine->cleanup

Message ID 20180712124415.19879-1-michal.winiarski@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Michał Winiarski July 12, 2018, 12:44 p.m. UTC
There's nothing there. Last vfunc got removed along with gen8 legacy
ringbuffer submission.

Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/intel_lrc.c        | 3 ---
 drivers/gpu/drm/i915/intel_ringbuffer.c | 3 ---
 drivers/gpu/drm/i915/intel_ringbuffer.h | 1 -
 3 files changed, 7 deletions(-)

Comments

Chris Wilson July 12, 2018, 12:55 p.m. UTC | #1
Quoting Michał Winiarski (2018-07-12 13:44:15)
> There's nothing there. Last vfunc got removed along with gen8 legacy
> ringbuffer submission.

Honestly it's gt.cleanup_engine that is the unwanted vfunc.
engine->cleanup is the right layer, esp as we do not plan to have a single
class of engine in the system.
-Chris
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 35d37af0cb9a..0a7fefd718c4 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -2341,9 +2341,6 @@  void intel_logical_ring_cleanup(struct intel_engine_cs *engine)
 		WARN_ON((I915_READ_MODE(engine) & MODE_IDLE) == 0);
 	}
 
-	if (engine->cleanup)
-		engine->cleanup(engine);
-
 	intel_engine_cleanup_common(engine);
 
 	lrc_destroy_wa_ctx(engine);
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index f4bd185c9369..8137eaa146b9 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -1446,9 +1446,6 @@  void intel_engine_cleanup(struct intel_engine_cs *engine)
 	intel_ring_unpin(engine->buffer);
 	intel_ring_free(engine->buffer);
 
-	if (engine->cleanup)
-		engine->cleanup(engine);
-
 	intel_engine_cleanup_common(engine);
 
 	dev_priv->engine[engine->id] = NULL;
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
index d1eee08e5f6b..c2a9ae1fd01e 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -503,7 +503,6 @@  struct intel_engine_cs {
 	 * monotonic, even if not coherent.
 	 */
 	void		(*irq_seqno_barrier)(struct intel_engine_cs *engine);
-	void		(*cleanup)(struct intel_engine_cs *engine);
 
 	/* GEN8 signal/wait table - never trust comments!
 	 *	  signal to	signal to    signal to   signal to      signal to