| Message ID | 20220915232654.3283095-2-matthew.d.roper@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Further multi-gt handling | expand |
On Friday, 16 September 2022 01:26:51 CEST Matt Roper wrote: > From: Chris Wilson <chris.p.wilson@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. > > v2: > - Drop the destroy_pinned_context() helper for now. It's not really > worth it with just a single callsite at the moment. (Janusz) > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com> > Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com> > --- > drivers/gpu/drm/i915/gt/intel_engine_cs.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c > index 1f7188129cd1..2ddcad497fa3 100644 > --- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c > +++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c > @@ -1274,8 +1274,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) >
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c index 1f7188129cd1..2ddcad497fa3 100644 --- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c +++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c @@ -1274,8 +1274,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)