From: Chris Wilson <chris.p.wil...@intel.com> If we abort driver initialisation in the middle of gt/engine discovery, some engines will be fully setup and some not. Those incompletely setup engines only have 'engine->release == NULL' and so will leak any of the common objects allocated.
Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> Cc: Janusz Krzysztofik <janusz.krzyszto...@linux.intel.com> Signed-off-by: Matt Roper <matthew.d.ro...@intel.com> --- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c index 1f7188129cd1..bff12b4ec314 100644 --- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c +++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c @@ -1196,6 +1196,12 @@ void intel_engine_destroy_pinned_context(struct intel_context *ce) intel_context_put(ce); } +static void destroy_pinned_context(struct intel_context *ce) +{ + if (ce) + intel_engine_destroy_pinned_context(ce); +} + static struct intel_context * create_kernel_context(struct intel_engine_cs *engine) { @@ -1274,8 +1280,13 @@ int intel_engines_init(struct intel_gt *gt) return err; err = setup(engine); - if (err) + if (err) { + intel_engine_cleanup_common(engine); return err; + } + + /* The backend should now be responsible for cleanup */ + GEM_BUG_ON(engine->release == NULL); err = engine_init_common(engine); if (err) @@ -1307,8 +1318,7 @@ void intel_engine_cleanup_common(struct intel_engine_cs *engine) if (engine->default_state) fput(engine->default_state); - if (engine->kernel_context) - intel_engine_destroy_pinned_context(engine->kernel_context); + destroy_pinned_context(engine->kernel_context); GEM_BUG_ON(!llist_empty(&engine->barrier_tasks)); cleanup_status_page(engine); -- 2.37.3