diff options
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_execbuffer.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lrc.c | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index a4d07ab56e48..54175d8c71c9 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -1296,6 +1296,12 @@ int i915_gem_ringbuffer_submission_final(struct i915_execbuffer_params *params) /* The mutex must be acquired before calling this function */ WARN_ON(!mutex_is_locked(¶ms->dev->struct_mutex)); + /* Check the context wasn't banned between submission and execution: */ + if (params->ctx->hang_stats.banned) { + DRM_DEBUG("Trying to execute for banned context!\n"); + return -ENOENT; + } + /* Make sure the request's seqno is the latest and greatest: */ if (req->reserved_seqno != dev_priv->last_seqno) { ret = i915_gem_get_seqno(engine->dev, &req->reserved_seqno); diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index b9258ee07480..02808f71ee82 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -1034,6 +1034,12 @@ int intel_execlists_submission_final(struct i915_execbuffer_params *params) /* The mutex must be acquired before calling this function */ WARN_ON(!mutex_is_locked(¶ms->dev->struct_mutex)); + /* Check the context wasn't banned between submission and execution: */ + if (params->ctx->hang_stats.banned) { + DRM_DEBUG("Trying to execute for banned context!\n"); + return -ENOENT; + } + /* Make sure the request's seqno is the latest and greatest: */ if (req->reserved_seqno != dev_priv->last_seqno) { ret = i915_gem_get_seqno(engine->dev, &req->reserved_seqno); |