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

Commit 4b378c06 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Consolidate reset-request debug message 



Move the pair of messages to the common callsite where it makes sense to
include a bit more information about which request is being reset.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190312111146.10662-1-chris@chris-wilson.co.uk
parent 3461cbfd

drivers/gpu/drm/i915/i915_reset.c

+6 −0
Original line number Diff line number Diff line
@@ -98,6 +98,12 @@ static void context_mark_innocent(struct i915_gem_context *ctx) 


void i915_reset_request(struct i915_request *rq, bool guilty)

{

	GEM_TRACE("%s rq=%llx:%lld, guilty? %s\n",

		  rq->engine->name,

		  rq->fence.context,

		  rq->fence.seqno,

		  yesno(guilty));



	lockdep_assert_held(&rq->engine->timeline.lock);

	GEM_BUG_ON(i915_request_completed(rq));

drivers/gpu/drm/i915/intel_lrc.c

+0 −1
Original line number Diff line number Diff line
@@ -1957,7 +1957,6 @@ static void execlists_reset(struct intel_engine_cs *engine, bool stalled) 
	/* Following the reset, we need to reload the CSB read/write pointers */

	reset_csb_pointers(&engine->execlists);



	GEM_TRACE("%s stalled? %s\n", engine->name, yesno(stalled));

	if (!rq)

		goto out_unlock;

drivers/gpu/drm/i915/intel_ringbuffer.c

+0 −2
Original line number Diff line number Diff line
@@ -757,8 +757,6 @@ static void reset_ring(struct intel_engine_cs *engine, bool stalled) 
		}

	}



	GEM_TRACE("%s stalled? %s\n", engine->name, yesno(stalled));



	/*

	 * The guilty request will get skipped on a hung engine.

	 *