From: Chris Wilson Date: Fri, 25 Nov 2016 13:17:16 +0000 (+0000) Subject: drm/i915: Assert no external observers when unwind a failed request alloc X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1618bdb89b5d8b47edf42d9c6ea96ecf001ad625;p=linux-beck.git drm/i915: Assert no external observers when unwind a failed request alloc Before we return the request back to the kmem_cache after a failed i915_gem_request_alloc(), we should assert that it has not been added to any global state tracking. Signed-off-by: Chris Wilson Reviewed-by: Joonas Lahtinen Link: http://patchwork.freedesktop.org/patch/msgid/20161125131718.20978-2-chris@chris-wilson.co.uk --- diff --git a/drivers/gpu/drm/i915/i915_gem_request.c b/drivers/gpu/drm/i915/i915_gem_request.c index bd7b21f70283..ed6cead22a86 100644 --- a/drivers/gpu/drm/i915/i915_gem_request.c +++ b/drivers/gpu/drm/i915/i915_gem_request.c @@ -599,6 +599,11 @@ i915_gem_request_alloc(struct intel_engine_cs *engine, return req; err_ctx: + /* Make sure we didn't add ourselves to external state before freeing */ + GEM_BUG_ON(!list_empty(&req->active_list)); + GEM_BUG_ON(!list_empty(&req->priotree.signalers_list)); + GEM_BUG_ON(!list_empty(&req->priotree.waiters_list)); + i915_gem_context_put(ctx); kmem_cache_free(dev_priv->requests, req); err_unreserve: