From: Daniel Vetter <daniel@ffwll.ch> To: Jason Ekstrand <jason@jlekstrand.net> Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: Re: [Intel-gfx] [PATCH 17/27] drm/i915/gem: Rework error handling in default_engines Date: Tue, 4 May 2021 18:17:14 +0200 [thread overview] Message-ID: <YJFzilYYEb+SMz1i@phenom.ffwll.local> (raw) In-Reply-To: <20210503155748.1961781-18-jason@jlekstrand.net> On Mon, May 03, 2021 at 10:57:38AM -0500, Jason Ekstrand wrote: > Since free_engines works for partially constructed engine sets, we can > use the usual goto pattern. > > Signed-off-by: Jason Ekstrand <jason@jlekstrand.net> I guess subsequent patches apply the same for the set_engines command and __free_engines disappears? Otherwise feels a bit silly. Anyway looks correct. Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/i915/gem/i915_gem_context.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c > index 10bd1b6dd1774..ce729e640bbf7 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c > @@ -420,7 +420,7 @@ static struct i915_gem_engines *default_engines(struct i915_gem_context *ctx) > { > const struct intel_gt *gt = &ctx->i915->gt; > struct intel_engine_cs *engine; > - struct i915_gem_engines *e; > + struct i915_gem_engines *e, *err; > enum intel_engine_id id; > > e = alloc_engines(I915_NUM_ENGINES); > @@ -438,18 +438,21 @@ static struct i915_gem_engines *default_engines(struct i915_gem_context *ctx) > > ce = intel_context_create(engine); > if (IS_ERR(ce)) { > - __free_engines(e, e->num_engines + 1); > - return ERR_CAST(ce); > + err = ERR_CAST(ce); > + goto free_engines; > } > > intel_context_set_gem(ce, ctx); > > e->engines[engine->legacy_idx] = ce; > - e->num_engines = max(e->num_engines, engine->legacy_idx); > + e->num_engines = max(e->num_engines, engine->legacy_idx + 1); > } > - e->num_engines++; > > return e; > + > +free_engines: > + free_engines(e); > + return err; > } > > void i915_gem_context_release(struct kref *ref) > -- > 2.31.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel@ffwll.ch> To: Jason Ekstrand <jason@jlekstrand.net> Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: Re: [Intel-gfx] [PATCH 17/27] drm/i915/gem: Rework error handling in default_engines Date: Tue, 4 May 2021 18:17:14 +0200 [thread overview] Message-ID: <YJFzilYYEb+SMz1i@phenom.ffwll.local> (raw) In-Reply-To: <20210503155748.1961781-18-jason@jlekstrand.net> On Mon, May 03, 2021 at 10:57:38AM -0500, Jason Ekstrand wrote: > Since free_engines works for partially constructed engine sets, we can > use the usual goto pattern. > > Signed-off-by: Jason Ekstrand <jason@jlekstrand.net> I guess subsequent patches apply the same for the set_engines command and __free_engines disappears? Otherwise feels a bit silly. Anyway looks correct. Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/i915/gem/i915_gem_context.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c > index 10bd1b6dd1774..ce729e640bbf7 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c > @@ -420,7 +420,7 @@ static struct i915_gem_engines *default_engines(struct i915_gem_context *ctx) > { > const struct intel_gt *gt = &ctx->i915->gt; > struct intel_engine_cs *engine; > - struct i915_gem_engines *e; > + struct i915_gem_engines *e, *err; > enum intel_engine_id id; > > e = alloc_engines(I915_NUM_ENGINES); > @@ -438,18 +438,21 @@ static struct i915_gem_engines *default_engines(struct i915_gem_context *ctx) > > ce = intel_context_create(engine); > if (IS_ERR(ce)) { > - __free_engines(e, e->num_engines + 1); > - return ERR_CAST(ce); > + err = ERR_CAST(ce); > + goto free_engines; > } > > intel_context_set_gem(ce, ctx); > > e->engines[engine->legacy_idx] = ce; > - e->num_engines = max(e->num_engines, engine->legacy_idx); > + e->num_engines = max(e->num_engines, engine->legacy_idx + 1); > } > - e->num_engines++; > > return e; > + > +free_engines: > + free_engines(e); > + return err; > } > > void i915_gem_context_release(struct kref *ref) > -- > 2.31.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-05-04 16:17 UTC|newest] Thread overview: 135+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-03 15:57 [PATCH 00/27] drm/i915/gem: ioctl clean-ups (v5) Jason Ekstrand 2021-05-03 15:57 ` [Intel-gfx] " Jason Ekstrand 2021-05-03 15:57 ` [PATCH 01/27] drm/i915: Drop I915_CONTEXT_PARAM_RINGSIZE Jason Ekstrand 2021-05-03 15:57 ` [Intel-gfx] " Jason Ekstrand 2021-05-03 15:57 ` [PATCH 02/27] drm/i915: Stop storing the ring size in the ring pointer Jason Ekstrand 2021-05-03 15:57 ` [Intel-gfx] " Jason Ekstrand 2021-05-04 8:47 ` Daniel Vetter 2021-05-04 8:47 ` [Intel-gfx] " Daniel Vetter 2021-05-14 18:06 ` Jason Ekstrand 2021-05-14 18:06 ` [Intel-gfx] " Jason Ekstrand 2021-05-03 15:57 ` [PATCH 03/27] drm/i915: Drop I915_CONTEXT_PARAM_NO_ZEROMAP Jason Ekstrand 2021-05-03 15:57 ` [Intel-gfx] " Jason Ekstrand 2021-05-04 8:48 ` Daniel Vetter 2021-05-04 8:48 ` Daniel Vetter 2021-05-03 15:57 ` [PATCH 04/27] drm/i915/gem: Set the watchdog timeout directly in intel_context_set_gem (v2) Jason Ekstrand 2021-05-03 15:57 ` [Intel-gfx] " Jason Ekstrand 2021-05-03 15:57 ` [PATCH 05/27] drm/i915/gem: Return void from context_apply_all Jason Ekstrand 2021-05-03 15:57 ` [Intel-gfx] " Jason Ekstrand 2021-05-03 15:57 ` [PATCH 06/27] drm/i915: Drop the CONTEXT_CLONE API Jason Ekstrand 2021-05-03 15:57 ` [Intel-gfx] " Jason Ekstrand 2021-05-04 8:50 ` Daniel Vetter 2021-05-04 8:50 ` Daniel Vetter 2021-05-14 18:07 ` Jason Ekstrand 2021-05-14 18:07 ` Jason Ekstrand 2021-05-03 15:57 ` [PATCH 07/27] drm/i915: Implement SINGLE_TIMELINE with a syncobj (v4) Jason Ekstrand 2021-05-03 15:57 ` [Intel-gfx] " Jason Ekstrand 2021-05-03 15:57 ` [PATCH 08/27] drm/i915: Drop getparam support for I915_CONTEXT_PARAM_ENGINES Jason Ekstrand 2021-05-03 15:57 ` [Intel-gfx] " Jason Ekstrand 2021-05-03 15:57 ` [PATCH 09/27] drm/i915/gem: Disallow bonding of virtual engines (v3) Jason Ekstrand 2021-05-03 15:57 ` [Intel-gfx] " Jason Ekstrand 2021-05-03 15:57 ` [PATCH 10/27] drm/i915/gem: Remove engine auto-magic with FENCE_SUBMIT Jason Ekstrand 2021-05-03 15:57 ` [Intel-gfx] " Jason Ekstrand 2021-05-04 8:56 ` Daniel Vetter 2021-05-04 8:56 ` [Intel-gfx] " Daniel Vetter 2021-05-14 18:19 ` Jason Ekstrand 2021-05-14 18:19 ` [Intel-gfx] " Jason Ekstrand 2021-05-03 15:57 ` [PATCH 11/27] drm/i915/request: Remove the hook from await_execution Jason Ekstrand 2021-05-03 15:57 ` [Intel-gfx] " Jason Ekstrand 2021-05-04 8:55 ` Daniel Vetter 2021-05-04 8:55 ` [Intel-gfx] " Daniel Vetter 2021-05-03 15:57 ` [PATCH 12/27] drm/i915/gem: Disallow creating contexts with too many engines Jason Ekstrand 2021-05-03 15:57 ` [Intel-gfx] " Jason Ekstrand 2021-05-05 9:56 ` Tvrtko Ursulin 2021-05-05 9:56 ` Tvrtko Ursulin 2021-05-03 15:57 ` [PATCH 13/27] drm/i915: Stop manually RCU banging in reset_stats_ioctl (v2) Jason Ekstrand 2021-05-03 15:57 ` [Intel-gfx] " Jason Ekstrand 2021-05-03 15:57 ` [PATCH 14/27] drm/i915/gem: Add a separate validate_priority helper Jason Ekstrand 2021-05-03 15:57 ` [Intel-gfx] " Jason Ekstrand 2021-05-03 15:57 ` [PATCH 15/27] drm/i915: Add gem/i915_gem_context.h to the docs Jason Ekstrand 2021-05-03 15:57 ` [Intel-gfx] " Jason Ekstrand 2021-05-04 9:11 ` Daniel Vetter 2021-05-04 9:11 ` [Intel-gfx] " Daniel Vetter 2021-05-03 15:57 ` [PATCH 16/27] drm/i915/gem: Add an intermediate proto_context struct Jason Ekstrand 2021-05-03 15:57 ` [Intel-gfx] " Jason Ekstrand 2021-05-04 16:13 ` Daniel Vetter 2021-05-04 16:13 ` [Intel-gfx] " Daniel Vetter 2021-06-02 21:53 ` Jason Ekstrand 2021-06-02 21:53 ` [Intel-gfx] " Jason Ekstrand 2021-06-03 7:07 ` Daniel Vetter 2021-06-03 7:07 ` [Intel-gfx] " Daniel Vetter 2021-05-05 10:09 ` Tvrtko Ursulin 2021-05-05 10:09 ` Tvrtko Ursulin 2021-05-03 15:57 ` [PATCH 17/27] drm/i915/gem: Rework error handling in default_engines Jason Ekstrand 2021-05-03 15:57 ` [Intel-gfx] " Jason Ekstrand 2021-05-04 16:17 ` Daniel Vetter [this message] 2021-05-04 16:17 ` Daniel Vetter 2021-05-14 18:21 ` Jason Ekstrand 2021-05-14 18:21 ` Jason Ekstrand 2021-05-03 15:57 ` [PATCH 18/27] drm/i915/gem: Optionally set SSEU in intel_context_set_gem Jason Ekstrand 2021-05-03 15:57 ` [Intel-gfx] " Jason Ekstrand 2021-05-04 19:00 ` Daniel Vetter 2021-05-04 19:00 ` Daniel Vetter 2021-05-05 9:28 ` Tvrtko Ursulin 2021-05-05 9:28 ` Tvrtko Ursulin 2021-05-05 9:47 ` Daniel Vetter 2021-05-05 9:47 ` Daniel Vetter 2021-05-05 9:52 ` Tvrtko Ursulin 2021-05-05 9:52 ` Tvrtko Ursulin 2021-05-03 15:57 ` [PATCH 19/27] drm/i915/gem: Use the proto-context to handle create parameters Jason Ekstrand 2021-05-03 15:57 ` [Intel-gfx] " Jason Ekstrand 2021-05-04 20:33 ` Daniel Vetter 2021-05-04 20:33 ` [Intel-gfx] " Daniel Vetter 2021-05-14 19:13 ` Jason Ekstrand 2021-05-14 19:13 ` [Intel-gfx] " Jason Ekstrand 2021-05-17 13:40 ` Daniel Vetter 2021-05-17 13:40 ` [Intel-gfx] " Daniel Vetter 2021-05-17 17:04 ` Jason Ekstrand 2021-05-17 17:04 ` [Intel-gfx] " Jason Ekstrand 2021-05-17 18:44 ` Daniel Vetter 2021-05-17 18:44 ` [Intel-gfx] " Daniel Vetter 2021-05-18 10:51 ` Jani Nikula 2021-05-18 10:51 ` [Intel-gfx] " Jani Nikula 2021-05-03 15:57 ` [PATCH 20/27] drm/i915/gem: Return an error ptr from context_lookup Jason Ekstrand 2021-05-03 15:57 ` [Intel-gfx] " Jason Ekstrand 2021-05-03 15:57 ` [PATCH 21/27] drm/i915/gt: Drop i915_address_space::file (v2) Jason Ekstrand 2021-05-03 15:57 ` [Intel-gfx] " Jason Ekstrand 2021-05-03 15:57 ` [PATCH 22/27] drm/i915/gem: Delay context creation Jason Ekstrand 2021-05-03 15:57 ` [Intel-gfx] " Jason Ekstrand 2021-05-03 19:38 ` kernel test robot 2021-05-03 19:38 ` kernel test robot 2021-05-03 19:38 ` kernel test robot 2021-05-04 20:53 ` Daniel Vetter 2021-05-04 20:53 ` Daniel Vetter 2021-05-04 20:53 ` Daniel Vetter 2021-05-04 20:53 ` Daniel Vetter 2021-05-04 20:53 ` Daniel Vetter 2021-05-03 15:57 ` [PATCH 23/27] drm/i915/gem: Don't allow changing the VM on running contexts Jason Ekstrand 2021-05-03 15:57 ` [Intel-gfx] " Jason Ekstrand 2021-05-03 18:52 ` kernel test robot 2021-05-03 18:52 ` kernel test robot 2021-05-03 18:52 ` kernel test robot 2021-05-04 21:00 ` Daniel Vetter 2021-05-04 21:00 ` Daniel Vetter 2021-05-04 21:00 ` Daniel Vetter 2021-05-04 21:17 ` Daniel Vetter 2021-05-04 21:17 ` Daniel Vetter 2021-05-03 15:57 ` [PATCH 24/27] drm/i915/gem: Don't allow changing the engine set " Jason Ekstrand 2021-05-03 15:57 ` [Intel-gfx] " Jason Ekstrand 2021-05-05 9:49 ` Daniel Vetter 2021-05-05 9:49 ` Daniel Vetter 2021-05-03 15:57 ` [PATCH 25/27] drm/i915/selftests: Take a VM in kernel_context() Jason Ekstrand 2021-05-03 15:57 ` [Intel-gfx] " Jason Ekstrand 2021-05-05 9:50 ` Daniel Vetter 2021-05-05 9:50 ` [Intel-gfx] " Daniel Vetter 2021-05-03 15:57 ` [PATCH 26/27] i915/gem/selftests: Assign the VM at context creation in igt_shared_ctx_exec Jason Ekstrand 2021-05-03 15:57 ` [Intel-gfx] " Jason Ekstrand 2021-05-05 9:53 ` Daniel Vetter 2021-05-05 9:53 ` Daniel Vetter 2021-05-03 15:57 ` [PATCH 27/27] drm/i915/gem: Roll all of context creation together Jason Ekstrand 2021-05-03 15:57 ` [Intel-gfx] " Jason Ekstrand 2021-05-05 10:05 ` Daniel Vetter 2021-05-05 10:05 ` Daniel Vetter 2021-05-03 20:33 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/gem: ioctl clean-ups (rev4) Patchwork 2021-05-03 20:35 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2021-05-03 20:38 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=YJFzilYYEb+SMz1i@phenom.ffwll.local \ --to=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=jason@jlekstrand.net \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.