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

Commit 0db18b17 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Make engine state pretty-printer header configurable 



Pass in a format string (and args) to specify the header to be emitted
along with the engine state when pretty-printing. This allows the header
to be emitted inside the drm_printer stream, so sharing the same prefix
and output characteristics (e.g. debug level and filtering).

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171208012303.25504-2-chris@chris-wilson.co.uk
parent e8a70cab

drivers/gpu/drm/i915/i915_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -3213,7 +3213,7 @@ static int i915_engine_info(struct seq_file *m, void *unused) 


	p = drm_seq_file_printer(m);

	for_each_engine(engine, dev_priv, id)

		intel_engine_dump(engine, &p);

		intel_engine_dump(engine, &p, "%s\n", engine->name);



	intel_runtime_pm_put(dev_priv);

drivers/gpu/drm/i915/intel_engine_cs.c

+12 −3
Original line number Diff line number Diff line
@@ -1596,7 +1596,7 @@ void intel_engines_park(struct drm_i915_private *i915) 
			dev_err(i915->drm.dev,

				"%s is not idle before parking\n",

				engine->name);

			intel_engine_dump(engine, &p);

			intel_engine_dump(engine, &p, NULL);

		}



		if (engine->park)
@@ -1666,7 +1666,9 @@ static void print_request(struct drm_printer *m, 
		   rq->timeline->common->name);

}



void intel_engine_dump(struct intel_engine_cs *engine, struct drm_printer *m)

void intel_engine_dump(struct intel_engine_cs *engine,

		       struct drm_printer *m,

		       const char *header, ...)

{

	struct intel_breadcrumbs * const b = &engine->breadcrumbs;

	const struct intel_engine_execlists * const execlists = &engine->execlists;
@@ -1677,7 +1679,14 @@ void intel_engine_dump(struct intel_engine_cs *engine, struct drm_printer *m) 
	char hdr[80];

	u64 addr;



	drm_printf(m, "%s\n", engine->name);

	if (header) {

		va_list ap;



		va_start(ap, header);

		drm_vprintf(m, header, &ap);

		va_end(ap);

	}



	drm_printf(m, "\tcurrent seqno %x, last %x, hangcheck %x [%d ms], inflight %d\n",

		   intel_engine_get_seqno(engine),

		   intel_engine_last_submit(engine),

drivers/gpu/drm/i915/intel_ringbuffer.h

+4 −1
Original line number Diff line number Diff line
@@ -1013,7 +1013,10 @@ unsigned int intel_engines_has_context_isolation(struct drm_i915_private *i915); 


bool intel_engine_can_store_dword(struct intel_engine_cs *engine);



void intel_engine_dump(struct intel_engine_cs *engine, struct drm_printer *p);

__printf(3, 4)

void intel_engine_dump(struct intel_engine_cs *engine,

		       struct drm_printer *m,

		       const char *header, ...);



struct intel_engine_cs *

intel_engine_lookup_user(struct drm_i915_private *i915, u8 class, u8 instance);

drivers/gpu/drm/i915/selftests/intel_hangcheck.c

+4 −3
Original line number Diff line number Diff line
@@ -619,7 +619,7 @@ static int igt_wait_reset(void *arg) 


		pr_err("Failed to start request %x, at %x\n",

		       rq->fence.seqno, hws_seqno(&h, rq));

		intel_engine_dump(rq->engine, &p);

		intel_engine_dump(rq->engine, &p, "%s\n", rq->engine->name);



		i915_reset(i915, 0);

		i915_gem_set_wedged(i915);
@@ -714,7 +714,8 @@ static int igt_reset_queue(void *arg) 


				pr_err("Failed to start request %x, at %x\n",

				       prev->fence.seqno, hws_seqno(&h, prev));

				intel_engine_dump(rq->engine, &p);

				intel_engine_dump(prev->engine, &p,

						  "%s\n", prev->engine->name);



				i915_gem_request_put(rq);

				i915_gem_request_put(prev);
@@ -820,7 +821,7 @@ static int igt_handle_error(void *arg) 


		pr_err("Failed to start request %x, at %x\n",

		       rq->fence.seqno, hws_seqno(&h, rq));

		intel_engine_dump(rq->engine, &p);

		intel_engine_dump(rq->engine, &p, "%s\n", rq->engine->name);



		i915_reset(i915, 0);

		i915_gem_set_wedged(i915);