[PATCH 6/9] drm/i915/execlists: Prepare LRC state object for activity

Tvrtko Ursulin tursulin at ursulin.net
Tue Sep 4 17:01:06 UTC 2018


From: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

In a following patch we will start making the state object active so must
prepare the backend to correctly release it in that case.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
Cc: Chris Wilson <chris at chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/intel_lrc.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index ae835ac349f0..1bf196257995 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -1266,8 +1266,7 @@ static void execlists_context_destroy(struct intel_context *ce)
 
 	intel_ring_free(ce->ring);
 
-	GEM_BUG_ON(i915_gem_object_is_active(ce->state->obj));
-	i915_gem_object_put(ce->state->obj);
+	__i915_gem_object_release_unless_active(ce->state->obj);
 }
 
 static void execlists_context_unpin(struct intel_context *ce)
-- 
2.17.1



More information about the Intel-gfx-trybot mailing list