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

Commit 96a945aa authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Move the common engine cleanup to intel_engine_cs.c 



Now that we initialize the state to both legacy and execlists inside
intel_engine_cs, we should also clean up that state from the common
functions.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1470226756-24401-1-git-send-email-chris@chris-wilson.co.uk


Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
parent ad7bdb2b

drivers/gpu/drm/i915/intel_engine_cs.c

+14 −0
Original line number Diff line number Diff line
@@ -210,3 +210,17 @@ int intel_engine_init_common(struct intel_engine_cs *engine) 


	return intel_engine_init_cmd_parser(engine);

}



/**

 * intel_engines_cleanup_common - cleans up the engine state created by

 *                                the common initiailizers.

 * @engine: Engine to cleanup.

 *

 * This cleans up everything created by the common helpers.

 */

void intel_engine_cleanup_common(struct intel_engine_cs *engine)

{

	intel_engine_cleanup_cmd_parser(engine);

	intel_engine_fini_breadcrumbs(engine);

	i915_gem_batch_pool_fini(&engine->batch_pool);

}

drivers/gpu/drm/i915/intel_lrc.c

+1 −4
Original line number Diff line number Diff line
@@ -1720,10 +1720,7 @@ void intel_logical_ring_cleanup(struct intel_engine_cs *engine) 
	if (engine->cleanup)

		engine->cleanup(engine);



	intel_engine_cleanup_cmd_parser(engine);

	i915_gem_batch_pool_fini(&engine->batch_pool);



	intel_engine_fini_breadcrumbs(engine);

	intel_engine_cleanup_common(engine);



	if (engine->status_page.obj) {

		i915_gem_object_unpin_map(engine->status_page.obj);

drivers/gpu/drm/i915/intel_ringbuffer.c

+1 −3
Original line number Diff line number Diff line
@@ -2218,9 +2218,7 @@ void intel_engine_cleanup(struct intel_engine_cs *engine) 
		cleanup_phys_status_page(engine);

	}



	intel_engine_cleanup_cmd_parser(engine);

	i915_gem_batch_pool_fini(&engine->batch_pool);

	intel_engine_fini_breadcrumbs(engine);

	intel_engine_cleanup_common(engine);



	intel_ring_context_unpin(dev_priv->kernel_context, engine);

drivers/gpu/drm/i915/intel_ringbuffer.h

+1 −0
Original line number Diff line number Diff line
@@ -483,6 +483,7 @@ void intel_fini_pipe_control(struct intel_engine_cs *engine); 


void intel_engine_setup_common(struct intel_engine_cs *engine);

int intel_engine_init_common(struct intel_engine_cs *engine);

void intel_engine_cleanup_common(struct intel_engine_cs *engine);



int intel_init_render_ring_buffer(struct intel_engine_cs *engine);

int intel_init_bsd_ring_buffer(struct intel_engine_cs *engine);