All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chris Wilson <chris@chris-wilson.co.uk>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 09/10] drm/i915: Assert that machine is wedged for nop_submit_request
Date: Tue,  4 Jul 2017 13:22:55 +0100	[thread overview]
Message-ID: <20170704122256.31654-9-chris@chris-wilson.co.uk> (raw)
In-Reply-To: <20170704122256.31654-1-chris@chris-wilson.co.uk>

We should only ever do nop_submit_request when the machine is wedged, so
assert it is so.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/i915_gem.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 074c37378dac..a055736bfcd8 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3025,6 +3025,7 @@ 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);
 	intel_engine_init_global_seqno(request->engine, request->global_seqno);
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2017-07-04 12:23 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-04 12:22 [PATCH 01/10] drm/i915: Report execlists irq bit in debugfs Chris Wilson
2017-07-04 12:22 ` [PATCH 02/10] drm/i915: Reset context image on engines after triggering the reset Chris Wilson
2017-07-04 12:22 ` [PATCH 03/10] drm/i915: Serialize per-engine resets against new requests Chris Wilson
2017-07-04 12:22 ` [PATCH 04/10] drm/i915: Flush the execlist ports if idle Chris Wilson
2017-07-04 12:22 ` [PATCH 05/10] drm/i915: Check execlist/ring status during hangcheck Chris Wilson
2017-07-04 12:22 ` [PATCH 06/10] drm/i915: Check the execlist queue for pending requests before declaring idle Chris Wilson
2017-07-04 12:22 ` [PATCH 07/10] drm/i915: Clear execlist port[] before updating seqno on wedging Chris Wilson
2017-07-04 12:22 ` [PATCH 08/10] drm/i915: Wake up waiters after setting the WEDGED bit Chris Wilson
2017-07-04 12:22 ` Chris Wilson [this message]
2017-07-04 12:22 ` [PATCH 10/10] drm/i915: Clear engine irq posted following a reset Chris Wilson
2017-07-04 13:28 ` ✓ Fi.CI.BAT: success for series starting with [01/10] drm/i915: Report execlists irq bit in debugfs 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=20170704122256.31654-9-chris@chris-wilson.co.uk \
    --to=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 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.