From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Redo "Remove i915_request.lock requirement for execution callbacks"
Date: Thu, 24 Sep 2020 14:16:26 +0100 [thread overview]
Message-ID: <e9123c83-ef8f-ec26-b878-300610899dee@linux.intel.com> (raw)
In-Reply-To: <20200915093010.30573-1-chris@chris-wilson.co.uk>
On 15/09/2020 10:30, Chris Wilson wrote:
> The reordering and rebasing of commit 2e4c6c1a9db5 ("drm/i915: Remove
> i915_request.lock requirement for execution callbacks") caused it to
> revert an earlier correction. Let us restore commit 99f0a640d464
> ("drm/i915: Remove requirement for holding i915_request.lock for
> breadcrumbs")
>
> Fixes: 2e4c6c1a9db5 ("drm/i915: Remove i915_request.lock requirement for execution callbacks")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> ---
> drivers/gpu/drm/i915/i915_request.c | 12 ++----------
> 1 file changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c
> index 11e272422fb7..436ce368ddaa 100644
> --- a/drivers/gpu/drm/i915/i915_request.c
> +++ b/drivers/gpu/drm/i915/i915_request.c
> @@ -593,16 +593,8 @@ bool __i915_request_submit(struct i915_request *request)
> __notify_execute_cb_irq(request);
>
> /* We may be recursing from the signal callback of another i915 fence */
> - if (!i915_request_signaled(request)) {
> - spin_lock_nested(&request->lock, SINGLE_DEPTH_NESTING);
> -
> - if (test_bit(DMA_FENCE_FLAG_ENABLE_SIGNAL_BIT,
> - &request->fence.flags) &&
> - !i915_request_enable_breadcrumb(request))
> - intel_engine_signal_breadcrumbs(engine);
> -
> - spin_unlock(&request->lock);
> - }
> + if (test_bit(DMA_FENCE_FLAG_ENABLE_SIGNAL_BIT, &request->fence.flags))
> + i915_request_enable_breadcrumb(request);
>
> return result;
> }
>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2020-09-24 13:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-15 9:30 [Intel-gfx] [PATCH] drm/i915: Redo "Remove i915_request.lock requirement for execution callbacks" Chris Wilson
2020-09-15 10:07 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2020-09-15 10:31 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-09-15 12:23 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2020-09-24 13:16 ` Tvrtko Ursulin [this message]
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=e9123c83-ef8f-ec26-b878-300610899dee@linux.intel.com \
--to=tvrtko.ursulin@linux.intel.com \
--cc=chris@chris-wilson.co.uk \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox