diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-11-22 14:41:18 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2016-11-22 17:42:17 +0000 |
| commit | d9e9da64c4a762493c5ac24b3b2bbc43c2754786 (patch) | |
| tree | 8594c57892e0b5dacad62d3938b19872d5571ce8 /drivers/gpu | |
| parent | 7abbd8d670bb928366aa94332a173aa3d394ebfe (diff) | |
drm/i915: Don't deref context->file_priv ERR_PTR upon reset
When a user context is closed, it's file_priv backpointer is replaced by
ERR_PTR(-EBADF); be careful not to chase this invalid pointer after a
hang and a GPU reset.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Fixes: b083a0870c79 ("drm/i915: Add per client max context ban limit")
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161122144121.7379-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index b38d4f8d1875..b0dd0f0ea65a 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2647,16 +2647,12 @@ static void i915_gem_context_mark_guilty(struct i915_gem_context *ctx) ctx->name, ctx->ban_score, yesno(ctx->banned)); - if (!ctx->file_priv) + if (!ctx->banned || IS_ERR_OR_NULL(ctx->file_priv)) return; - if (ctx->banned) { - ctx->file_priv->context_bans++; - - DRM_DEBUG_DRIVER("client %s has has %d context banned\n", - ctx->name, - ctx->file_priv->context_bans); - } + ctx->file_priv->context_bans++; + DRM_DEBUG_DRIVER("client %s has had %d context banned\n", + ctx->name, ctx->file_priv->context_bans); } static void i915_gem_context_mark_innocent(struct i915_gem_context *ctx) |