Commit df8cf31e authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/gt: Hook up intel_context_fini() 



Prior to freeing the struct, call the fini function to cleanup the
common members. Currently this only calls the debug functions to mark
the structs as destroyed, but may be extended to real work in future.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190718070024.21781-2-chris@chris-wilson.co.uk
parent f3bcb0cc

drivers/gpu/drm/i915/gt/intel_context.c

+6 −0
Original line number Diff line number Diff line
@@ -204,6 +204,12 @@ intel_context_init(struct intel_context *ce, 
			 __intel_context_active, __intel_context_retire);

}



void intel_context_fini(struct intel_context *ce)

{

	mutex_destroy(&ce->pin_mutex);

	i915_active_fini(&ce->active);

}



static void i915_global_context_shrink(void)

{

	kmem_cache_shrink(global.slab_ce);

drivers/gpu/drm/i915/gt/intel_context.h

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
void intel_context_init(struct intel_context *ce,

			struct i915_gem_context *ctx,

			struct intel_engine_cs *engine);

void intel_context_fini(struct intel_context *ce);



struct intel_context *

intel_context_create(struct i915_gem_context *ctx,

drivers/gpu/drm/i915/gt/intel_lrc.c

+2 −0
Original line number Diff line number Diff line
@@ -1566,6 +1566,7 @@ static void execlists_context_destroy(struct kref *kref) 
	if (ce->state)

		__execlists_context_fini(ce);



	intel_context_fini(ce);

	intel_context_free(ce);

}
@@ -3199,6 +3200,7 @@ static void virtual_context_destroy(struct kref *kref) 


	if (ve->context.state)

		__execlists_context_fini(&ve->context);

	intel_context_fini(&ve->context);



	kfree(ve->bonds);

	kfree(ve);

drivers/gpu/drm/i915/gt/intel_ringbuffer.c

+1 −0
Original line number Diff line number Diff line
@@ -1388,6 +1388,7 @@ static void ring_context_destroy(struct kref *ref) 
	if (ce->state)

		__ring_context_fini(ce);



	intel_context_fini(ce);

	intel_context_free(ce);

}

drivers/gpu/drm/i915/gt/mock_engine.c

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ static void mock_context_destroy(struct kref *ref) 
	if (ce->ring)

		mock_ring_free(ce->ring);



	intel_context_fini(ce);

	intel_context_free(ce);

}