Commit 0647ece3 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915/selftests: Fix engine reset count storage for multi-tile 



Engine->id namespace is per-tile so struct igt_live_test->reset_engine[]
needs to be two-dimensional so engine reset counts from all tiles can be
stored with no aliasing. With aliasing, if we had a real multi-tile
platform, the reset counts would be incorrect for same engine instance on
different tiles.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Fixes: 0c29efa2 ("drm/i915/selftests: Consider multi-gt instead of to_gt()")
Reported-by: default avatarAlan Previn Teres Alexis <alan.previn.teres.alexis@intel.com>
Cc: Tejas Upadhyay <tejas.upadhyay@intel.com>
Cc: Andi Shyti <andi.shyti@linux.intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231201122109.729006-1-tvrtko.ursulin@linux.intel.com
parent 706785c1

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

+5 −4
Original line number Diff line number Diff line
@@ -37,8 +37,9 @@ int igt_live_test_begin(struct igt_live_test *t, 
		}



		for_each_engine(engine, gt, id)

			t->reset_engine[id] =

			i915_reset_engine_count(&i915->gpu_error, engine);

			t->reset_engine[i][id] =

				i915_reset_engine_count(&i915->gpu_error,

							engine);

	}



	t->reset_global = i915_reset_count(&i915->gpu_error);
@@ -66,14 +67,14 @@ int igt_live_test_end(struct igt_live_test *t) 


	for_each_gt(gt, i915, i) {

		for_each_engine(engine, gt, id) {

			if (t->reset_engine[id] ==

			if (t->reset_engine[i][id] ==

			    i915_reset_engine_count(&i915->gpu_error, engine))

				continue;



			gt_err(gt, "%s(%s): engine '%s' was reset %d times!\n",

			       t->func, t->name, engine->name,

			       i915_reset_engine_count(&i915->gpu_error, engine) -

			       t->reset_engine[id]);

			       t->reset_engine[i][id]);

			return -EIO;

		}

	}

drivers/gpu/drm/i915/selftests/igt_live_test.h

+2 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#ifndef IGT_LIVE_TEST_H

#define IGT_LIVE_TEST_H



#include "gt/intel_gt_defines.h" /* for I915_MAX_GT */

#include "gt/intel_engine.h" /* for I915_NUM_ENGINES */



struct drm_i915_private;
@@ -17,7 +18,7 @@ struct igt_live_test { 
	const char *name;



	unsigned int reset_global;

	unsigned int reset_engine[I915_NUM_ENGINES];

	unsigned int reset_engine[I915_MAX_GT][I915_NUM_ENGINES];

};



/*