Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc9130be authored by Oscar Mateo's avatar Oscar Mateo Committed by Daniel Vetter
Browse files

drm/i915/bdw: Make sure gpu reset still works with Execlists 



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.

v3: Daniel suggests to drop the "if (execlists)" because the Execlists
queue should be empty in legacy mode (which is true, if we do the
INIT_LIST_HEAD).

v4: Do the pending intel_runtime_pm_put

Signed-off-by: default avatarOscar Mateo <oscar.mateo@intel.com>
Reviewed-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent b7c71823

drivers/gpu/drm/i915/i915_gem.c

+12 −0
Original line number Diff line number Diff line
@@ -2551,6 +2551,18 @@ static void i915_gem_reset_ring_cleanup(struct drm_i915_private *dev_priv, 
		i915_gem_free_request(request);

	}



	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);

		intel_runtime_pm_put(dev_priv);

		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;

drivers/gpu/drm/i915/intel_ringbuffer.c

+1 −0
Original line number Diff line number Diff line
@@ -1612,6 +1612,7 @@ static int intel_init_ring_buffer(struct drm_device *dev, 
	ring->dev = dev;

	INIT_LIST_HEAD(&ring->active_list);

	INIT_LIST_HEAD(&ring->request_list);

	INIT_LIST_HEAD(&ring->execlist_queue);

	ringbuf->size = 32 * PAGE_SIZE;

	ringbuf->ring = ring;

	memset(ring->semaphore.sync_seqno, 0, sizeof(ring->semaphore.sync_seqno));