Commit eaef5b3c authored by Stuart Summers's avatar Stuart Summers Committed by Chris Wilson
Browse files

drm/i915: Refactor instdone loops on new subslice functions 



Refactor instdone loops to use the new intel_sseu_has_subslice
function.

Signed-off-by: default avatarStuart Summers <stuart.summers@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190823160307.180813-10-stuart.summers@intel.com
parent e1210bbf

drivers/gpu/drm/i915/gt/intel_engine_cs.c

+2 −1
Original line number Diff line number Diff line
@@ -948,6 +948,7 @@ void intel_engine_get_instdone(struct intel_engine_cs *engine, 
			       struct intel_instdone *instdone)

{

	struct drm_i915_private *i915 = engine->i915;

	const struct sseu_dev_info *sseu = &RUNTIME_INFO(i915)->sseu;

	struct intel_uncore *uncore = engine->uncore;

	u32 mmio_base = engine->mmio_base;

	int slice;
@@ -965,7 +966,7 @@ void intel_engine_get_instdone(struct intel_engine_cs *engine, 


		instdone->slice_common =

			intel_uncore_read(uncore, GEN7_SC_INSTDONE);

		for_each_instdone_slice_subslice(i915, slice, subslice) {

		for_each_instdone_slice_subslice(i915, sseu, slice, subslice) {

			instdone->sampler[slice][subslice] =

				read_subslice_reg(engine, slice, subslice,

						  GEN7_SAMPLER_INSTDONE);

drivers/gpu/drm/i915/gt/intel_engine_types.h

+14 −16
Original line number Diff line number Diff line
@@ -576,20 +576,18 @@ intel_engine_is_virtual(const struct intel_engine_cs *engine) 
	return engine->flags & I915_ENGINE_IS_VIRTUAL;

}



#define instdone_slice_mask(dev_priv__) \

	(IS_GEN(dev_priv__, 7) ? \

	 1 : RUNTIME_INFO(dev_priv__)->sseu.slice_mask)



#define instdone_subslice_mask(dev_priv__) \

	(IS_GEN(dev_priv__, 7) ? \

	 1 : RUNTIME_INFO(dev_priv__)->sseu.subslice_mask[0])



#define for_each_instdone_slice_subslice(dev_priv__, slice__, subslice__) \

	for ((slice__) = 0, (subslice__) = 0; \

	     (slice__) < I915_MAX_SLICES; \

	     (subslice__) = ((subslice__) + 1) < I915_MAX_SUBSLICES ? (subslice__) + 1 : 0, \

	       (slice__) += ((subslice__) == 0)) \

		for_each_if((BIT(slice__) & instdone_slice_mask(dev_priv__)) && \

			    (BIT(subslice__) & instdone_subslice_mask(dev_priv__)))



#define instdone_has_slice(dev_priv___, sseu___, slice___) \

	((IS_GEN(dev_priv___, 7) ? 1 : ((sseu___)->slice_mask)) & BIT(slice___))



#define instdone_has_subslice(dev_priv__, sseu__, slice__, subslice__) \

	(IS_GEN(dev_priv__, 7) ? (1 & BIT(subslice__)) : \

	 intel_sseu_has_subslice(sseu__, 0, subslice__))



#define for_each_instdone_slice_subslice(dev_priv_, sseu_, slice_, subslice_) \

	for ((slice_) = 0, (subslice_) = 0; (slice_) < I915_MAX_SLICES; \

	     (subslice_) = ((subslice_) + 1) % I915_MAX_SUBSLICES, \

	     (slice_) += ((subslice_) == 0)) \

		for_each_if((instdone_has_slice(dev_priv_, sseu_, slice_)) && \

			    (instdone_has_subslice(dev_priv_, sseu_, slice_, \

						    subslice_)))

#endif /* __INTEL_ENGINE_TYPES_H__ */

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

+2 −1
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ static bool instdone_unchanged(u32 current_instdone, u32 *old_instdone) 
static bool subunits_stuck(struct intel_engine_cs *engine)

{

	struct drm_i915_private *dev_priv = engine->i915;

	const struct sseu_dev_info *sseu = &RUNTIME_INFO(dev_priv)->sseu;

	struct intel_instdone instdone;

	struct intel_instdone *accu_instdone = &engine->hangcheck.instdone;

	bool stuck;
@@ -71,7 +72,7 @@ static bool subunits_stuck(struct intel_engine_cs *engine) 
	stuck &= instdone_unchanged(instdone.slice_common,

				    &accu_instdone->slice_common);



	for_each_instdone_slice_subslice(dev_priv, slice, subslice) {

	for_each_instdone_slice_subslice(dev_priv, sseu, slice, subslice) {

		stuck &= instdone_unchanged(instdone.sampler[slice][subslice],

					    &accu_instdone->sampler[slice][subslice]);

		stuck &= instdone_unchanged(instdone.row[slice][subslice],

drivers/gpu/drm/i915/i915_debugfs.c

+3 −2
Original line number Diff line number Diff line
@@ -996,6 +996,7 @@ static void i915_instdone_info(struct drm_i915_private *dev_priv, 
			       struct seq_file *m,

			       struct intel_instdone *instdone)

{

	const struct sseu_dev_info *sseu = &RUNTIME_INFO(dev_priv)->sseu;

	int slice;

	int subslice;
@@ -1011,11 +1012,11 @@ static void i915_instdone_info(struct drm_i915_private *dev_priv, 
	if (INTEL_GEN(dev_priv) <= 6)

		return;



	for_each_instdone_slice_subslice(dev_priv, slice, subslice)

	for_each_instdone_slice_subslice(dev_priv, sseu, slice, subslice)

		seq_printf(m, "\t\tSAMPLER_INSTDONE[%d][%d]: 0x%08x\n",

			   slice, subslice, instdone->sampler[slice][subslice]);



	for_each_instdone_slice_subslice(dev_priv, slice, subslice)

	for_each_instdone_slice_subslice(dev_priv, sseu, slice, subslice)

		seq_printf(m, "\t\tROW_INSTDONE[%d][%d]: 0x%08x\n",

			   slice, subslice, instdone->row[slice][subslice]);

}

drivers/gpu/drm/i915/i915_gpu_error.c

+3 −2
Original line number Diff line number Diff line
@@ -421,6 +421,7 @@ static void err_compression_marker(struct drm_i915_error_state_buf *m) 
static void error_print_instdone(struct drm_i915_error_state_buf *m,

				 const struct drm_i915_error_engine *ee)

{

	const struct sseu_dev_info *sseu = &RUNTIME_INFO(m->i915)->sseu;

	int slice;

	int subslice;
@@ -436,12 +437,12 @@ static void error_print_instdone(struct drm_i915_error_state_buf *m, 
	if (INTEL_GEN(m->i915) <= 6)

		return;



	for_each_instdone_slice_subslice(m->i915, slice, subslice)

	for_each_instdone_slice_subslice(m->i915, sseu, slice, subslice)

		err_printf(m, "  SAMPLER_INSTDONE[%d][%d]: 0x%08x\n",

			   slice, subslice,

			   ee->instdone.sampler[slice][subslice]);



	for_each_instdone_slice_subslice(m->i915, slice, subslice)

	for_each_instdone_slice_subslice(m->i915, sseu, slice, subslice)

		err_printf(m, "  ROW_INSTDONE[%d][%d]: 0x%08x\n",

			   slice, subslice,

			   ee->instdone.row[slice][subslice]);

CRA Git | Maintained and supported by SUSTech CRA and CCSE