From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Cc: Daniel Vetter <daniel.vetter@intel.com>
Subject: Re: [PATCH] drm/i915: Stop asserting on set-wedged vs nop_submit_request ordering
Date: Fri, 13 Oct 2017 17:23:41 +0300 [thread overview]
Message-ID: <87y3ofi0sy.fsf@gaia.fi.intel.com> (raw)
In-Reply-To: <20171012204019.3557-1-chris@chris-wilson.co.uk>
Chris Wilson <chris@chris-wilson.co.uk> writes:
> Since the removal of the stop_machine(), it is allowed and expected for
> the nop_submit_request() and nop_complete_submit_request() to run in
> parallel to the i915_gem_set_wedged() processing. As such we can no
> longer assert that i915_gem_set_wedged() has completed inside the
> stop_machine prior to the individual nop_submit_request execution.
>
> Fixes: af7a8ffad9c5 ("drm/i915: Use rcu instead of stop_machine in set_wedged")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Mika Kuoppala <mika.kuoppala@intel.com>
from irc:
17:12 < danvet> r-b: me
also,
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/i915_gem.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 20fcac37c85a..d9d39b309ce8 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -3087,7 +3087,6 @@ void i915_gem_reset_finish(struct drm_i915_private *dev_priv)
>
> static void nop_submit_request(struct drm_i915_gem_request *request)
> {
> - GEM_BUG_ON(!i915_terminally_wedged(&request->i915->gpu_error));
> dma_fence_set_error(&request->fence, -EIO);
>
> i915_gem_request_submit(request);
> @@ -3097,7 +3096,6 @@ static void nop_complete_submit_request(struct drm_i915_gem_request *request)
> {
> unsigned long flags;
>
> - GEM_BUG_ON(!i915_terminally_wedged(&request->i915->gpu_error));
> dma_fence_set_error(&request->fence, -EIO);
>
> spin_lock_irqsave(&request->engine->timeline->lock, flags);
> --
> 2.15.0.rc0
>
> _______________________________________________
> 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:[~2017-10-13 14:23 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-12 20:40 [PATCH] drm/i915: Stop asserting on set-wedged vs nop_submit_request ordering Chris Wilson
2017-10-12 21:05 ` ✗ Fi.CI.BAT: failure for " Patchwork
2017-10-13 14:23 ` Mika Kuoppala [this message]
2017-10-13 14:40 ` [PATCH] " Chris Wilson
2017-10-14 17:05 ` Chris Wilson
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=87y3ofi0sy.fsf@gaia.fi.intel.com \
--to=mika.kuoppala@linux.intel.com \
--cc=chris@chris-wilson.co.uk \
--cc=daniel.vetter@intel.com \
--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