From: Tvrtko Ursulin Date: Thu, 8 Oct 2015 14:37:00 +0000 (+0100) Subject: drm/i915: Remove wrong warning from i915_gem_context_clean X-Git-Tag: MMI-PSA29.97-13-9~7427^2~45^2~1311 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=61fb58815192c558d74016721dae6235c18c0fbf;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git drm/i915: Remove wrong warning from i915_gem_context_clean commit e9f24d5fb7cf3628b195b18ff3ac4e37937ceeae Author: Tvrtko Ursulin Date: Mon Oct 5 13:26:36 2015 +0100 drm/i915: Clean up associated VMAs on context destruction Introduced a wrong assumption that all contexts have a ppgtt instance. This is not true when full PPGTT is not active so remove the WARN_ON_ONCE from the context cleanup code. Signed-off-by: Tvrtko Ursulin Cc: Michel Thierry Reviewed-by: Michel Thierry Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 680b4c9f6b73..8c688a5f1589 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -138,7 +138,7 @@ static void i915_gem_context_clean(struct intel_context *ctx) struct i915_hw_ppgtt *ppgtt = ctx->ppgtt; struct i915_vma *vma, *next; - if (WARN_ON_ONCE(!ppgtt)) + if (!ppgtt) return; WARN_ON(!list_empty(&ppgtt->base.active_list));