From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Cc: Matthew Auld <matthew.auld@intel.com>
Subject: Re: [Intel-gfx] [PATCH] drm/i915/execlists: Leave resetting ring to intel_ring
Date: Thu, 16 Jan 2020 14:34:39 +0200 [thread overview]
Message-ID: <87v9pbpokg.fsf@gaia.fi.intel.com> (raw)
In-Reply-To: <20200115175829.2761329-1-chris@chris-wilson.co.uk>
Chris Wilson <chris@chris-wilson.co.uk> writes:
> We need to allow concurrent intel_context_unpin, which means avoiding
> doing destructive operations like intel_ring_reset(). This was already
> fixed for intel_ring_unpin() in commit 0725d9a31869 ("drm/i915/gt: Make
> intel_ring_unpin() safe for concurrent pint"), but I overlooked that
> execlists_context_unpin() also made the same mistake.
>
> Reported-by: Matthew Brost <matthew.brost@intel.com>
> Fixes: 841350223816 ("drm/i915/gt: Drop mutex serialisation between context pin/unpin")
> References: 0725d9a31869 ("drm/i915/gt: Make intel_ring_unpin() safe for concurrent pint")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Matthew Brost <matthew.brost@intel.com>
> Cc: Matthew Auld <matthew.auld@intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> ---
> drivers/gpu/drm/i915/gt/intel_lrc.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
> index a8fe2f16c910..999fe82190da 100644
> --- a/drivers/gpu/drm/i915/gt/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
> @@ -2532,7 +2532,6 @@ static void execlists_context_unpin(struct intel_context *ce)
> ce->engine);
>
> i915_gem_object_unpin_map(ce->state->obj);
> - intel_ring_reset(ce->ring, ce->ring->tail);
It seems we have entered an era where intel_ring_reset()
is actually resetting the ring. Long live the engine(s)!
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> }
>
> static void
> --
> 2.25.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-01-16 12:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-15 17:58 [Intel-gfx] [PATCH] drm/i915/execlists: Leave resetting ring to intel_ring Chris Wilson
2020-01-15 18:11 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2020-01-15 18:51 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-01-15 18:51 ` [Intel-gfx] ✗ Fi.CI.BUILD: warning " Patchwork
2020-01-16 12:34 ` Mika Kuoppala [this message]
2020-01-18 6:43 ` [Intel-gfx] ✓ Fi.CI.IGT: success " 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=87v9pbpokg.fsf@gaia.fi.intel.com \
--to=mika.kuoppala@linux.intel.com \
--cc=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
--cc=matthew.auld@intel.com \
/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;
as well as URLs for NNTP newsgroup(s).