projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2e46a2a
)
drm/i915/gt: Cancel a hung context if already closed
author
Chris Wilson
<chris@chris-wilson.co.uk>
Thu, 19 Mar 2020 17:07:07 +0000
(17:07 +0000)
committer
Rodrigo Vivi
<rodrigo.vivi@intel.com>
Thu, 26 Mar 2020 17:21:30 +0000
(10:21 -0700)
Use the restored ability to check if a context is closed to decide
whether or not to immediately ban the context from further execution
after a hang.
Fixes: be90e344836a ("drm/i915/gt: Cancel banned contexts after GT reset")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link:
https://patchwork.freedesktop.org/patch/msgid/20200319170707.8262-2-chris@chris-wilson.co.uk
(cherry picked from commit
8e37d699139128139c0468e005c2f0d6215b0c55
)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/i915/gt/intel_reset.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/gt/intel_reset.c
b/drivers/gpu/drm/i915/gt/intel_reset.c
index 8b170c1876b33a18a59ac3f634ac7940880ae2f4..80db3c9d785ed2d413f68df3472a8de15f63c84d 100644
(file)
--- a/
drivers/gpu/drm/i915/gt/intel_reset.c
+++ b/
drivers/gpu/drm/i915/gt/intel_reset.c
@@
-88,6
+88,11
@@
static bool mark_guilty(struct i915_request *rq)
bool banned;
int i;
+ if (intel_context_is_closed(rq->context)) {
+ intel_context_set_banned(rq->context);
+ return true;
+ }
+
rcu_read_lock();
ctx = rcu_dereference(rq->context->gem_context);
if (ctx && !kref_get_unless_zero(&ctx->ref))