All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jason Ekstrand <jason@jlekstrand.net>
To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
	Jason Ekstrand <jason@jlekstrand.net>
Subject: [PATCH 17/31] drm/i915/gem: Rework error handling in default_engines
Date: Tue,  8 Jun 2021 23:35:59 -0500	[thread overview]
Message-ID: <20210609043613.102962-18-jason@jlekstrand.net> (raw)
In-Reply-To: <20210609043613.102962-1-jason@jlekstrand.net>

Since free_engines works for partially constructed engine sets, we can
use the usual goto pattern.

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
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 b5d8c1ff5d7b3..4b1a874225c0c 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
@@ -406,7 +406,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);
@@ -424,18 +424,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


WARNING: multiple messages have this Message-ID (diff)
From: Jason Ekstrand <jason@jlekstrand.net>
To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: [Intel-gfx] [PATCH 17/31] drm/i915/gem: Rework error handling in default_engines
Date: Tue,  8 Jun 2021 23:35:59 -0500	[thread overview]
Message-ID: <20210609043613.102962-18-jason@jlekstrand.net> (raw)
In-Reply-To: <20210609043613.102962-1-jason@jlekstrand.net>

Since free_engines works for partially constructed engine sets, we can
use the usual goto pattern.

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
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 b5d8c1ff5d7b3..4b1a874225c0c 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
@@ -406,7 +406,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);
@@ -424,18 +424,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

  parent reply	other threads:[~2021-06-09  4:37 UTC|newest]

Thread overview: 105+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-09  4:35 [PATCH 00/31] drm/i915/gem: ioctl clean-ups (v6) Jason Ekstrand
2021-06-09  4:35 ` [Intel-gfx] " Jason Ekstrand
2021-06-09  4:35 ` [PATCH 01/31] drm/i915: Drop I915_CONTEXT_PARAM_RINGSIZE Jason Ekstrand
2021-06-09  4:35   ` [Intel-gfx] " Jason Ekstrand
2021-06-09  4:35 ` [PATCH 02/31] drm/i915: Stop storing the ring size in the ring pointer (v2) Jason Ekstrand
2021-06-09  4:35   ` [Intel-gfx] " Jason Ekstrand
2021-06-09  4:35 ` [PATCH 03/31] drm/i915: Drop I915_CONTEXT_PARAM_NO_ZEROMAP Jason Ekstrand
2021-06-09  4:35   ` [Intel-gfx] " Jason Ekstrand
2021-06-09  4:35 ` [PATCH 04/31] drm/i915/gem: Set the watchdog timeout directly in intel_context_set_gem (v2) Jason Ekstrand
2021-06-09  4:35   ` [Intel-gfx] " Jason Ekstrand
2021-06-09  4:35 ` [PATCH 05/31] drm/i915/gem: Return void from context_apply_all Jason Ekstrand
2021-06-09  4:35   ` [Intel-gfx] " Jason Ekstrand
2021-06-09  4:35 ` [PATCH 06/31] drm/i915: Drop the CONTEXT_CLONE API (v2) Jason Ekstrand
2021-06-09  4:35   ` [Intel-gfx] " Jason Ekstrand
2021-06-09  4:35 ` [PATCH 07/31] drm/i915: Implement SINGLE_TIMELINE with a syncobj (v4) Jason Ekstrand
2021-06-09  4:35   ` [Intel-gfx] " Jason Ekstrand
2021-06-09  4:35 ` [PATCH 08/31] drm/i915: Drop getparam support for I915_CONTEXT_PARAM_ENGINES Jason Ekstrand
2021-06-09  4:35   ` [Intel-gfx] " Jason Ekstrand
2021-06-09  4:35 ` [PATCH 09/31] drm/i915/gem: Disallow bonding of virtual engines (v3) Jason Ekstrand
2021-06-09  4:35   ` [Intel-gfx] " Jason Ekstrand
2021-06-09  4:35 ` [PATCH 10/31] drm/i915/gem: Remove engine auto-magic with FENCE_SUBMIT (v2) Jason Ekstrand
2021-06-09  4:35   ` [Intel-gfx] " Jason Ekstrand
2021-06-09  4:35 ` [PATCH 11/31] drm/i915/request: Remove the hook from await_execution Jason Ekstrand
2021-06-09  4:35   ` [Intel-gfx] " Jason Ekstrand
2021-06-09  4:35 ` [PATCH 12/31] drm/i915/gem: Disallow creating contexts with too many engines Jason Ekstrand
2021-06-09  4:35   ` [Intel-gfx] " Jason Ekstrand
2021-06-09  4:35 ` [PATCH 13/31] drm/i915: Stop manually RCU banging in reset_stats_ioctl (v2) Jason Ekstrand
2021-06-09  4:35   ` [Intel-gfx] " Jason Ekstrand
2021-06-09  4:35 ` [PATCH 14/31] drm/i915/gem: Add a separate validate_priority helper Jason Ekstrand
2021-06-09  4:35   ` [Intel-gfx] " Jason Ekstrand
2021-06-09  4:35 ` [PATCH 15/31] drm/i915: Add gem/i915_gem_context.h to the docs Jason Ekstrand
2021-06-09  4:35   ` [Intel-gfx] " Jason Ekstrand
2021-06-09  4:35 ` [PATCH 16/31] drm/i915/gem: Add an intermediate proto_context struct (v4) Jason Ekstrand
2021-06-09  4:35   ` [Intel-gfx] " Jason Ekstrand
2021-06-09 11:28   ` Daniel Vetter
2021-06-09 11:28     ` Daniel Vetter
2021-06-09 16:00     ` Jason Ekstrand
2021-06-09 16:00       ` Jason Ekstrand
2021-06-10 16:44       ` Daniel Vetter
2021-06-10 16:44         ` Daniel Vetter
2021-06-10 16:53         ` Jason Ekstrand
2021-06-10 16:53           ` Jason Ekstrand
2021-06-09  4:35 ` Jason Ekstrand [this message]
2021-06-09  4:35   ` [Intel-gfx] [PATCH 17/31] drm/i915/gem: Rework error handling in default_engines Jason Ekstrand
2021-06-09  4:36 ` [PATCH 18/31] drm/i915/gem: Optionally set SSEU in intel_context_set_gem Jason Ekstrand
2021-06-09  4:36   ` [Intel-gfx] " Jason Ekstrand
2021-06-09  4:36 ` [PATCH 19/31] drm/i915: Add an i915_gem_vm_lookup helper Jason Ekstrand
2021-06-09  4:36   ` [Intel-gfx] " Jason Ekstrand
2021-06-09  4:36 ` [PATCH 20/31] drm/i915/gem: Make an alignment check more sensible Jason Ekstrand
2021-06-09  4:36   ` [Intel-gfx] " Jason Ekstrand
2021-06-09  4:36 ` [PATCH 21/31] drm/i915/gem: Use the proto-context to handle create parameters (v3) Jason Ekstrand
2021-06-09  4:36   ` [Intel-gfx] " Jason Ekstrand
2021-06-09  4:36 ` [PATCH 22/31] drm/i915/gem: Return an error ptr from context_lookup Jason Ekstrand
2021-06-09  4:36   ` [Intel-gfx] " Jason Ekstrand
2021-06-09  4:36 ` [PATCH 23/31] drm/i915/gt: Drop i915_address_space::file (v2) Jason Ekstrand
2021-06-09  4:36   ` [Intel-gfx] " Jason Ekstrand
2021-06-09  4:36 ` [PATCH 24/31] drm/i915/gem: Delay context creation (v2) Jason Ekstrand
2021-06-09  4:36   ` [Intel-gfx] " Jason Ekstrand
2021-06-09  8:25   ` kernel test robot
2021-06-09  8:25     ` kernel test robot
2021-06-09  8:25     ` kernel test robot
2021-06-09 11:38   ` kernel test robot
2021-06-09 11:38     ` kernel test robot
2021-06-09 11:38     ` kernel test robot
2021-06-09 11:44   ` kernel test robot
2021-06-09 11:44     ` kernel test robot
2021-06-09 11:44     ` kernel test robot
2021-06-09  4:36 ` [PATCH 25/31] drm/i915/gem: Don't allow changing the VM on running contexts (v2) Jason Ekstrand
2021-06-09  4:36   ` [Intel-gfx] " Jason Ekstrand
2021-06-09  7:39   ` kernel test robot
2021-06-09  7:39     ` kernel test robot
2021-06-09  7:39     ` kernel test robot
2021-06-09 11:34   ` Daniel Vetter
2021-06-09 11:34     ` Daniel Vetter
2021-06-09 11:34     ` Daniel Vetter
2021-06-09 11:34       ` Daniel Vetter
2021-06-09 16:06     ` Jason Ekstrand
2021-06-09 16:06       ` Jason Ekstrand
2021-06-09  4:36 ` [PATCH 26/31] drm/i915/gem: Don't allow changing the engine set " Jason Ekstrand
2021-06-09  4:36   ` [Intel-gfx] " Jason Ekstrand
2021-06-09  4:36 ` [PATCH 27/31] drm/i915/selftests: Take a VM in kernel_context() Jason Ekstrand
2021-06-09  4:36   ` [Intel-gfx] " Jason Ekstrand
2021-06-09  4:36 ` [PATCH 28/31] i915/gem/selftests: Assign the VM at context creation in igt_shared_ctx_exec Jason Ekstrand
2021-06-09  4:36   ` [Intel-gfx] " Jason Ekstrand
2021-06-09  4:36 ` [PATCH 29/31] drm/i915/gem: Roll all of context creation together Jason Ekstrand
2021-06-09  4:36   ` [Intel-gfx] " Jason Ekstrand
2021-06-09  4:36 ` [PATCH 30/31] drm/i915: Finalize contexts in GEM_CONTEXT_CREATE on version 13+ Jason Ekstrand
2021-06-09  4:36   ` [Intel-gfx] " Jason Ekstrand
2021-06-09 10:13   ` kernel test robot
2021-06-09 10:13     ` kernel test robot
2021-06-09 10:13     ` kernel test robot
2021-06-09 11:38   ` Daniel Vetter
2021-06-09 11:38     ` Daniel Vetter
2021-06-09  4:36 ` [PATCH 31/31] drm/i915: Drop some RCU usage around context VMs Jason Ekstrand
2021-06-09  4:36   ` [Intel-gfx] " Jason Ekstrand
2021-06-09 11:41   ` Daniel Vetter
2021-06-09 11:41     ` Daniel Vetter
2021-06-09 16:07     ` Jason Ekstrand
2021-06-09 16:07       ` Jason Ekstrand
2021-06-09  5:44 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/gem: ioctl clean-ups (rev6) Patchwork
2021-06-09  5:46 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-06-09  6:15 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-06-09  6:15 ` [Intel-gfx] ✗ Fi.CI.BUILD: warning " Patchwork
2021-06-09  7:47 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2021-06-09 17:43 [PATCH 00/31] drm/i915/gem: ioctl clean-ups (v6) Jason Ekstrand
2021-06-09 17:44 ` [PATCH 17/31] drm/i915/gem: Rework error handling in default_engines Jason Ekstrand

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=20210609043613.102962-18-jason@jlekstrand.net \
    --to=jason@jlekstrand.net \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    /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: link
Be 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.