From: Jason Ekstrand <jason@jlekstrand.net> To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: Jason Ekstrand <jason@jlekstrand.net> Subject: [PATCH 04/21] drm/i915/gem: Return void from context_apply_all Date: Fri, 23 Apr 2021 17:31:14 -0500 [thread overview] Message-ID: <20210423223131.879208-5-jason@jlekstrand.net> (raw) In-Reply-To: <20210423223131.879208-1-jason@jlekstrand.net> None of the callbacks we use with it return an error code anymore; they all return 0 unconditionally. Signed-off-by: Jason Ekstrand <jason@jlekstrand.net> --- drivers/gpu/drm/i915/gem/i915_gem_context.c | 26 +++++++-------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c index 1091cc04a242a..8a77855123cec 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c @@ -718,32 +718,25 @@ __context_engines_await(const struct i915_gem_context *ctx, return engines; } -static int +static void context_apply_all(struct i915_gem_context *ctx, - int (*fn)(struct intel_context *ce, void *data), + void (*fn)(struct intel_context *ce, void *data), void *data) { struct i915_gem_engines_iter it; struct i915_gem_engines *e; struct intel_context *ce; - int err = 0; e = __context_engines_await(ctx, NULL); - for_each_gem_engine(ce, e, it) { - err = fn(ce, data); - if (err) - break; - } + for_each_gem_engine(ce, e, it) + fn(ce, data); i915_sw_fence_complete(&e->fence); - - return err; } -static int __apply_ppgtt(struct intel_context *ce, void *vm) +static void __apply_ppgtt(struct intel_context *ce, void *vm) { i915_vm_put(ce->vm); ce->vm = i915_vm_get(vm); - return 0; } static struct i915_address_space * @@ -783,10 +776,9 @@ static void __set_timeline(struct intel_timeline **dst, intel_timeline_put(old); } -static int __apply_timeline(struct intel_context *ce, void *timeline) +static void __apply_timeline(struct intel_context *ce, void *timeline) { __set_timeline(&ce->timeline, timeline); - return 0; } static void __assign_timeline(struct i915_gem_context *ctx, @@ -1842,19 +1834,17 @@ set_persistence(struct i915_gem_context *ctx, return __context_set_persistence(ctx, args->value); } -static int __apply_priority(struct intel_context *ce, void *arg) +static void __apply_priority(struct intel_context *ce, void *arg) { struct i915_gem_context *ctx = arg; if (!intel_engine_has_timeslices(ce->engine)) - return 0; + return; if (ctx->sched.priority >= I915_PRIORITY_NORMAL) intel_context_set_use_semaphores(ce); else intel_context_clear_use_semaphores(ce); - - return 0; } static int set_priority(struct i915_gem_context *ctx, -- 2.31.1 _______________________________________________ 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: Jason Ekstrand <jason@jlekstrand.net> To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 04/21] drm/i915/gem: Return void from context_apply_all Date: Fri, 23 Apr 2021 17:31:14 -0500 [thread overview] Message-ID: <20210423223131.879208-5-jason@jlekstrand.net> (raw) In-Reply-To: <20210423223131.879208-1-jason@jlekstrand.net> None of the callbacks we use with it return an error code anymore; they all return 0 unconditionally. Signed-off-by: Jason Ekstrand <jason@jlekstrand.net> --- drivers/gpu/drm/i915/gem/i915_gem_context.c | 26 +++++++-------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c index 1091cc04a242a..8a77855123cec 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c @@ -718,32 +718,25 @@ __context_engines_await(const struct i915_gem_context *ctx, return engines; } -static int +static void context_apply_all(struct i915_gem_context *ctx, - int (*fn)(struct intel_context *ce, void *data), + void (*fn)(struct intel_context *ce, void *data), void *data) { struct i915_gem_engines_iter it; struct i915_gem_engines *e; struct intel_context *ce; - int err = 0; e = __context_engines_await(ctx, NULL); - for_each_gem_engine(ce, e, it) { - err = fn(ce, data); - if (err) - break; - } + for_each_gem_engine(ce, e, it) + fn(ce, data); i915_sw_fence_complete(&e->fence); - - return err; } -static int __apply_ppgtt(struct intel_context *ce, void *vm) +static void __apply_ppgtt(struct intel_context *ce, void *vm) { i915_vm_put(ce->vm); ce->vm = i915_vm_get(vm); - return 0; } static struct i915_address_space * @@ -783,10 +776,9 @@ static void __set_timeline(struct intel_timeline **dst, intel_timeline_put(old); } -static int __apply_timeline(struct intel_context *ce, void *timeline) +static void __apply_timeline(struct intel_context *ce, void *timeline) { __set_timeline(&ce->timeline, timeline); - return 0; } static void __assign_timeline(struct i915_gem_context *ctx, @@ -1842,19 +1834,17 @@ set_persistence(struct i915_gem_context *ctx, return __context_set_persistence(ctx, args->value); } -static int __apply_priority(struct intel_context *ce, void *arg) +static void __apply_priority(struct intel_context *ce, void *arg) { struct i915_gem_context *ctx = arg; if (!intel_engine_has_timeslices(ce->engine)) - return 0; + return; if (ctx->sched.priority >= I915_PRIORITY_NORMAL) intel_context_set_use_semaphores(ce); else intel_context_clear_use_semaphores(ce); - - return 0; } static int set_priority(struct i915_gem_context *ctx, -- 2.31.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-04-23 22:31 UTC|newest] Thread overview: 226+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-23 22:31 [PATCH 00/21] drm/i915/gem: ioctl clean-ups Jason Ekstrand 2021-04-23 22:31 ` [Intel-gfx] " Jason Ekstrand 2021-04-23 22:31 ` [PATCH 01/21] drm/i915: Drop I915_CONTEXT_PARAM_RINGSIZE Jason Ekstrand 2021-04-23 22:31 ` [Intel-gfx] " Jason Ekstrand 2021-04-27 9:32 ` Daniel Vetter 2021-04-27 9:32 ` [Intel-gfx] " Daniel Vetter 2021-04-28 3:33 ` Jason Ekstrand 2021-04-28 3:33 ` [Intel-gfx] " Jason Ekstrand 2021-04-23 22:31 ` [PATCH 02/21] drm/i915: Drop I915_CONTEXT_PARAM_NO_ZEROMAP Jason Ekstrand 2021-04-23 22:31 ` [Intel-gfx] " Jason Ekstrand 2021-04-27 9:38 ` Daniel Vetter 2021-04-27 9:38 ` Daniel Vetter 2021-04-23 22:31 ` [PATCH 03/21] drm/i915/gem: Set the watchdog timeout directly in intel_context_set_gem Jason Ekstrand 2021-04-23 22:31 ` [Intel-gfx] " Jason Ekstrand 2021-04-27 9:42 ` Daniel Vetter 2021-04-27 9:42 ` [Intel-gfx] " Daniel Vetter 2021-04-28 15:55 ` Tvrtko Ursulin 2021-04-28 15:55 ` Tvrtko Ursulin 2021-04-28 17:24 ` Jason Ekstrand 2021-04-28 17:24 ` Jason Ekstrand 2021-04-29 8:04 ` Tvrtko Ursulin 2021-04-29 8:04 ` Tvrtko Ursulin 2021-04-29 14:54 ` Jason Ekstrand 2021-04-29 14:54 ` Jason Ekstrand 2021-04-29 17:12 ` Daniel Vetter 2021-04-29 17:12 ` Daniel Vetter 2021-04-29 17:13 ` Daniel Vetter 2021-04-29 17:13 ` Daniel Vetter 2021-04-29 18:41 ` Jason Ekstrand 2021-04-29 18:41 ` Jason Ekstrand 2021-04-30 11:18 ` Tvrtko Ursulin 2021-04-30 11:18 ` Tvrtko Ursulin 2021-04-30 15:35 ` Jason Ekstrand 2021-04-30 15:35 ` Jason Ekstrand 2021-04-23 22:31 ` Jason Ekstrand [this message] 2021-04-23 22:31 ` [Intel-gfx] [PATCH 04/21] drm/i915/gem: Return void from context_apply_all Jason Ekstrand 2021-04-27 9:42 ` Daniel Vetter 2021-04-27 9:42 ` [Intel-gfx] " Daniel Vetter 2021-04-23 22:31 ` [PATCH 05/21] drm/i915: Drop the CONTEXT_CLONE API Jason Ekstrand 2021-04-23 22:31 ` [Intel-gfx] " Jason Ekstrand 2021-04-27 9:49 ` Daniel Vetter 2021-04-27 9:49 ` Daniel Vetter 2021-04-28 17:38 ` Jason Ekstrand 2021-04-28 17:38 ` Jason Ekstrand 2021-04-28 15:59 ` Tvrtko Ursulin 2021-04-28 15:59 ` Tvrtko Ursulin 2021-04-23 22:31 ` [PATCH 06/21] drm/i915: Implement SINGLE_TIMELINE with a syncobj (v3) Jason Ekstrand 2021-04-23 22:31 ` [Intel-gfx] " Jason Ekstrand 2021-04-27 9:55 ` Daniel Vetter 2021-04-27 9:55 ` Daniel Vetter 2021-04-28 15:49 ` Tvrtko Ursulin 2021-04-28 15:49 ` Tvrtko Ursulin 2021-04-28 17:26 ` Jason Ekstrand 2021-04-28 17:26 ` Jason Ekstrand 2021-04-29 8:06 ` Tvrtko Ursulin 2021-04-29 8:06 ` Tvrtko Ursulin 2021-04-29 12:08 ` Daniel Vetter 2021-04-29 12:08 ` Daniel Vetter 2021-04-29 14:47 ` Jason Ekstrand 2021-04-29 14:47 ` Jason Ekstrand 2021-04-23 22:31 ` [PATCH 07/21] drm/i915: Drop getparam support for I915_CONTEXT_PARAM_ENGINES Jason Ekstrand 2021-04-23 22:31 ` [Intel-gfx] " Jason Ekstrand 2021-04-27 9:58 ` Daniel Vetter 2021-04-27 9:58 ` [Intel-gfx] " Daniel Vetter 2021-04-23 22:31 ` [PATCH 08/21] drm/i915/gem: Disallow bonding of virtual engines Jason Ekstrand 2021-04-23 22:31 ` [Intel-gfx] " Jason Ekstrand 2021-04-26 23:43 ` [PATCH 08/20] drm/i915/gem: Disallow bonding of virtual engines (v2) Jason Ekstrand 2021-04-26 23:43 ` [Intel-gfx] " Jason Ekstrand 2021-04-27 13:58 ` Daniel Vetter 2021-04-27 13:58 ` Daniel Vetter 2021-04-27 13:51 ` [PATCH 08/21] drm/i915/gem: Disallow bonding of virtual engines Jason Ekstrand 2021-04-27 13:51 ` [Intel-gfx] " Jason Ekstrand 2021-04-28 10:13 ` Daniel Vetter 2021-04-28 10:13 ` [Intel-gfx] " Daniel Vetter 2021-04-28 17:18 ` Jason Ekstrand 2021-04-28 17:18 ` [Intel-gfx] " Jason Ekstrand 2021-04-28 17:18 ` Matthew Brost 2021-04-28 17:18 ` Matthew Brost 2021-04-28 17:46 ` Jason Ekstrand 2021-04-28 17:46 ` Jason Ekstrand 2021-04-28 17:55 ` Matthew Brost 2021-04-28 17:55 ` Matthew Brost 2021-04-28 18:17 ` Jason Ekstrand 2021-04-28 18:17 ` Jason Ekstrand 2021-04-29 12:14 ` Daniel Vetter 2021-04-29 12:14 ` Daniel Vetter 2021-04-30 4:03 ` Matthew Brost 2021-04-30 4:03 ` Matthew Brost 2021-04-30 10:11 ` Daniel Vetter 2021-04-30 10:11 ` Daniel Vetter 2021-05-01 17:17 ` Matthew Brost 2021-05-01 17:17 ` Matthew Brost 2021-05-04 7:36 ` Daniel Vetter 2021-05-04 7:36 ` Daniel Vetter 2021-04-28 18:58 ` Jason Ekstrand 2021-04-28 18:58 ` [Intel-gfx] " Jason Ekstrand 2021-04-29 12:16 ` Daniel Vetter 2021-04-29 12:16 ` [Intel-gfx] " Daniel Vetter 2021-04-29 16:02 ` Jason Ekstrand 2021-04-29 16:02 ` [Intel-gfx] " Jason Ekstrand 2021-04-29 17:14 ` Daniel Vetter 2021-04-29 17:14 ` [Intel-gfx] " Daniel Vetter 2021-04-28 15:51 ` Tvrtko Ursulin 2021-04-28 15:51 ` Tvrtko Ursulin 2021-04-29 12:24 ` Daniel Vetter 2021-04-29 12:24 ` Daniel Vetter 2021-04-29 12:54 ` Tvrtko Ursulin 2021-04-29 12:54 ` Tvrtko Ursulin 2021-04-29 15:41 ` Jason Ekstrand 2021-04-29 15:41 ` Jason Ekstrand 2021-04-23 22:31 ` [PATCH 09/21] drm/i915/gem: Disallow creating contexts with too many engines Jason Ekstrand 2021-04-23 22:31 ` [Intel-gfx] " Jason Ekstrand 2021-04-28 10:16 ` Daniel Vetter 2021-04-28 10:16 ` Daniel Vetter 2021-04-28 10:42 ` Tvrtko Ursulin 2021-04-28 10:42 ` Tvrtko Ursulin 2021-04-28 14:02 ` Daniel Vetter 2021-04-28 14:02 ` Daniel Vetter 2021-04-28 14:26 ` Tvrtko Ursulin 2021-04-28 14:26 ` Tvrtko Ursulin 2021-04-28 17:09 ` Jason Ekstrand 2021-04-28 17:09 ` Jason Ekstrand 2021-04-29 8:01 ` Tvrtko Ursulin 2021-04-29 8:01 ` Tvrtko Ursulin 2021-04-29 19:16 ` Jason Ekstrand 2021-04-29 19:16 ` Jason Ekstrand 2021-04-30 11:40 ` Tvrtko Ursulin 2021-04-30 11:40 ` Tvrtko Ursulin 2021-04-30 15:54 ` Jason Ekstrand 2021-04-30 15:54 ` Jason Ekstrand 2021-04-23 22:31 ` [PATCH 10/21] drm/i915/request: Remove the hook from await_execution Jason Ekstrand 2021-04-23 22:31 ` [Intel-gfx] " Jason Ekstrand 2021-04-26 23:44 ` Jason Ekstrand 2021-04-26 23:44 ` [Intel-gfx] " Jason Ekstrand 2021-04-23 22:31 ` [PATCH 11/21] drm/i915: Stop manually RCU banging in reset_stats_ioctl Jason Ekstrand 2021-04-23 22:31 ` [Intel-gfx] " Jason Ekstrand 2021-04-28 10:27 ` Daniel Vetter 2021-04-28 10:27 ` [Intel-gfx] " Daniel Vetter 2021-04-28 18:22 ` Jason Ekstrand 2021-04-28 18:22 ` [Intel-gfx] " Jason Ekstrand 2021-04-29 12:22 ` Daniel Vetter 2021-04-29 12:22 ` [Intel-gfx] " Daniel Vetter 2021-04-23 22:31 ` [PATCH 12/21] drm/i915/gem: Add a separate validate_priority helper Jason Ekstrand 2021-04-23 22:31 ` [Intel-gfx] " Jason Ekstrand 2021-04-28 14:37 ` Daniel Vetter 2021-04-28 14:37 ` [Intel-gfx] " Daniel Vetter 2021-04-23 22:31 ` [PATCH 13/21] drm/i915/gem: Add an intermediate proto_context struct Jason Ekstrand 2021-04-23 22:31 ` [Intel-gfx] " Jason Ekstrand 2021-04-29 13:02 ` Daniel Vetter 2021-04-29 13:02 ` Daniel Vetter 2021-04-29 16:44 ` Jason Ekstrand 2021-04-29 16:44 ` Jason Ekstrand 2021-04-23 22:31 ` [PATCH 14/21] drm/i915/gem: Return an error ptr from context_lookup Jason Ekstrand 2021-04-23 22:31 ` [Intel-gfx] " Jason Ekstrand 2021-04-29 13:27 ` Daniel Vetter 2021-04-29 13:27 ` Daniel Vetter 2021-04-29 15:29 ` Jason Ekstrand 2021-04-29 15:29 ` Jason Ekstrand 2021-04-29 17:16 ` Daniel Vetter 2021-04-29 17:16 ` Daniel Vetter 2021-04-23 22:31 ` [PATCH 15/21] drm/i915/gt: Drop i915_address_space::file Jason Ekstrand 2021-04-23 22:31 ` [Intel-gfx] " Jason Ekstrand 2021-04-29 12:37 ` Daniel Vetter 2021-04-29 12:37 ` [Intel-gfx] " Daniel Vetter 2021-04-29 15:26 ` Jason Ekstrand 2021-04-29 15:26 ` [Intel-gfx] " Jason Ekstrand 2021-04-23 22:31 ` [PATCH 16/21] drm/i915/gem: Delay context creation Jason Ekstrand 2021-04-23 22:31 ` [Intel-gfx] " Jason Ekstrand 2021-04-24 3:21 ` kernel test robot 2021-04-24 3:21 ` kernel test robot 2021-04-24 3:21 ` kernel test robot 2021-04-24 3:24 ` kernel test robot 2021-04-24 3:24 ` kernel test robot 2021-04-24 3:24 ` kernel test robot 2021-04-29 15:51 ` Daniel Vetter 2021-04-29 15:51 ` Daniel Vetter 2021-04-29 18:16 ` Jason Ekstrand 2021-04-29 18:16 ` Jason Ekstrand 2021-04-29 18:56 ` Daniel Vetter 2021-04-29 18:56 ` Daniel Vetter 2021-04-29 19:01 ` Jason Ekstrand 2021-04-29 19:01 ` Jason Ekstrand 2021-04-29 19:07 ` Daniel Vetter 2021-04-29 19:07 ` Daniel Vetter 2021-04-29 21:35 ` Jason Ekstrand 2021-04-29 21:35 ` Jason Ekstrand 2021-04-30 6:53 ` Daniel Vetter 2021-04-30 6:53 ` Daniel Vetter 2021-04-30 11:58 ` Tvrtko Ursulin 2021-04-30 11:58 ` Tvrtko Ursulin 2021-04-30 12:30 ` Daniel Vetter 2021-04-30 12:30 ` Daniel Vetter 2021-04-30 12:44 ` Tvrtko Ursulin 2021-04-30 12:44 ` Tvrtko Ursulin 2021-04-30 13:07 ` Daniel Vetter 2021-04-30 13:07 ` Daniel Vetter 2021-04-30 13:15 ` Tvrtko Ursulin 2021-04-30 13:15 ` Tvrtko Ursulin 2021-04-30 16:27 ` Jason Ekstrand 2021-04-30 16:27 ` Jason Ekstrand 2021-04-30 16:33 ` Daniel Vetter 2021-04-30 16:33 ` Daniel Vetter 2021-04-30 16:57 ` Jason Ekstrand 2021-04-30 16:57 ` Jason Ekstrand 2021-04-30 17:08 ` Daniel Vetter 2021-04-30 17:08 ` Daniel Vetter 2021-04-23 22:31 ` [PATCH 17/21] drm/i915/gem: Don't allow changing the VM on running contexts Jason Ekstrand 2021-04-23 22:31 ` [Intel-gfx] " Jason Ekstrand 2021-04-23 22:31 ` [PATCH 18/21] drm/i915/gem: Don't allow changing the engine set " Jason Ekstrand 2021-04-23 22:31 ` [Intel-gfx] " Jason Ekstrand 2021-04-29 17:21 ` Daniel Vetter 2021-04-29 17:21 ` [Intel-gfx] " Daniel Vetter 2021-04-23 22:31 ` [PATCH 19/21] drm/i915/selftests: Take a VM in kernel_context() Jason Ekstrand 2021-04-23 22:31 ` [Intel-gfx] " Jason Ekstrand 2021-04-23 22:31 ` [PATCH 20/21] i915/gem/selftests: Assign the VM at context creation in igt_shared_ctx_exec Jason Ekstrand 2021-04-23 22:31 ` [Intel-gfx] " Jason Ekstrand 2021-04-29 17:19 ` Daniel Vetter 2021-04-29 17:19 ` Daniel Vetter 2021-04-23 22:31 ` [PATCH 21/21] drm/i915/gem: Roll all of context creation together Jason Ekstrand 2021-04-23 22:31 ` [Intel-gfx] " Jason Ekstrand 2021-04-29 17:25 ` Daniel Vetter 2021-04-29 17:25 ` [Intel-gfx] " Daniel Vetter 2021-04-23 22:49 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/gem: ioctl clean-ups Patchwork 2021-04-23 22:51 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2021-04-23 23:16 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2021-04-24 2:14 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " 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=20210423223131.879208-5-jason@jlekstrand.net \ --to=jason@jlekstrand.net \ --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: 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.