drm/i915: Cleanup request skip decision

Since we now only skip banned contexts, preventing the skip of default
contexts is no longer sensible. For a similar argument as before
'commit 7ec73b7e36d0 ("drm/i915: Only skip requests once a context is banned")'
we end up with an inconsistent API if we only mark future execbufs from
the default ctx as banned but fail to mark those currently executing
as failed.

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1484668747-9120-3-git-send-email-mika.kuoppala@intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index a83a4cc52fc9696f54023f97bafae1ad327fe0aa..0fe4875580fd0a22be455e6f3242182cc144aa5e 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2704,21 +2704,8 @@ static void i915_gem_reset_engine(struct intel_engine_cs *engine)
        engine->reset_hw(engine, request);
 
        /* If this context is now banned, skip all of its pending requests. */
-       if (!i915_gem_context_is_banned(hung_ctx))
-               return;
-
-       /* Users of the default context do not rely on logical state
-        * preserved between batches. They have to emit full state on
-        * every batch and so it is safe to execute queued requests following
-        * the hang.
-        *
-        * Other contexts preserve state, now corrupt. We want to skip all
-        * queued requests that reference the corrupt context.
-        */
-       if (i915_gem_context_is_default(hung_ctx))
-               return;
-
-       engine_skip_context(request);
+       if (i915_gem_context_is_banned(hung_ctx))
+               engine_skip_context(request);
 }
 
 void i915_gem_reset_finish(struct drm_i915_private *dev_priv)