[Intel-gfx] [PATCH 42/53] drm/i915/bdw: Make sure gpu reset still works with Execlists

[oscar.mateo at intel.com]

From: Oscar Mateo <oscar.mateo at intel.com>

If we reset a ring after a hang, we have to make sure that we clear
out all queued Execlists requests.

v2: The ring is, at this point, already being correctly re-programmed
for Execlists, and the hangcheck counters cleared.

Signed-off-by: Oscar Mateo <oscar.mateo at intel.com>
---
 drivers/gpu/drm/i915/i915_gem.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 7c10540..86bfb8a 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2546,6 +2546,19 @@ static void i915_gem_reset_ring_cleanup(struct drm_i915_private *dev_priv,
 		i915_gem_free_request(request);
 	}
 
+	if (intel_enable_execlists(dev_priv->dev)) {
+		while (!list_empty(&ring->execlist_queue)) {
+			struct intel_ctx_submit_request *submit_req;
+
+			submit_req = list_first_entry(&ring->execlist_queue,
+					struct intel_ctx_submit_request,
+					execlist_link);
+			list_del(&submit_req->execlist_link);
+			i915_gem_context_unreference(submit_req->ctx);
+			kfree(submit_req);
+		}
+	}
+
 	/* These may not have been flush before the reset, do so now */
 	kfree(ring->preallocated_lazy_request);
 	ring->preallocated_lazy_request = NULL;
-- 
1.9.0