Commit 5df79ff1 authored by Daniele Ceraolo Spurio's avatar Daniele Ceraolo Spurio Committed by Chris Wilson
Browse files

drm/i915: gt-fy sseu debugfs 



Ahead of moving the sseu debugfs logic under gt/, update the functions
to use intel_gt where possible to make the move cleaner.

Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Andi Shyti <andi.shyti@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/20200708003952.21831-9-daniele.ceraolospurio@intel.com
parent 0b6613c6

drivers/gpu/drm/i915/i915_debugfs.c

+51 −44
Original line number Original line Diff line number Diff line
@@ -1578,31 +1578,31 @@ i915_cache_sharing_set(void *data, u64 val) 
	return 0;

	return 0;

}

}





static void

DEFINE_SIMPLE_ATTRIBUTE(i915_cache_sharing_fops,

intel_sseu_copy_subslices(const struct sseu_dev_info *sseu, int slice,

			i915_cache_sharing_get, i915_cache_sharing_set,

			  u8 *to_mask)

			"%llu\n");



static void sseu_copy_subslices(const struct sseu_dev_info *sseu,

				int slice, u8 *to_mask)

{

{

	int offset = slice * sseu->ss_stride;

	int offset = slice * sseu->ss_stride;





	memcpy(&to_mask[offset], &sseu->subslice_mask[offset], sseu->ss_stride);

	memcpy(&to_mask[offset], &sseu->subslice_mask[offset], sseu->ss_stride);

}

}





DEFINE_SIMPLE_ATTRIBUTE(i915_cache_sharing_fops,

static void cherryview_sseu_device_status(struct intel_gt *gt,

			i915_cache_sharing_get, i915_cache_sharing_set,

			"%llu\n");



static void cherryview_sseu_device_status(struct drm_i915_private *dev_priv,

					  struct sseu_dev_info *sseu)

					  struct sseu_dev_info *sseu)

{

{

#define SS_MAX 2

#define SS_MAX 2

	struct intel_uncore *uncore = gt->uncore;

	const int ss_max = SS_MAX;

	const int ss_max = SS_MAX;

	u32 sig1[SS_MAX], sig2[SS_MAX];

	u32 sig1[SS_MAX], sig2[SS_MAX];

	int ss;

	int ss;





	sig1[0] = I915_READ(CHV_POWER_SS0_SIG1);

	sig1[0] = intel_uncore_read(uncore, CHV_POWER_SS0_SIG1);

	sig1[1] = I915_READ(CHV_POWER_SS1_SIG1);

	sig1[1] = intel_uncore_read(uncore, CHV_POWER_SS1_SIG1);

	sig2[0] = I915_READ(CHV_POWER_SS0_SIG2);

	sig2[0] = intel_uncore_read(uncore, CHV_POWER_SS0_SIG2);

	sig2[1] = I915_READ(CHV_POWER_SS1_SIG2);

	sig2[1] = intel_uncore_read(uncore, CHV_POWER_SS1_SIG2);





	for (ss = 0; ss < ss_max; ss++) {

	for (ss = 0; ss < ss_max; ss++) {

		unsigned int eu_cnt;

		unsigned int eu_cnt;
@@ -1624,11 +1624,12 @@ static void cherryview_sseu_device_status(struct drm_i915_private *dev_priv, 
#undef SS_MAX

#undef SS_MAX

}

}





static void gen10_sseu_device_status(struct drm_i915_private *dev_priv,

static void gen10_sseu_device_status(struct intel_gt *gt,

				     struct sseu_dev_info *sseu)

				     struct sseu_dev_info *sseu)

{

{

#define SS_MAX 6

#define SS_MAX 6

	const struct intel_gt_info *info = &dev_priv->gt.info;

	struct intel_uncore *uncore = gt->uncore;

	const struct intel_gt_info *info = &gt->info;

	u32 s_reg[SS_MAX], eu_reg[2 * SS_MAX], eu_mask[2];

	u32 s_reg[SS_MAX], eu_reg[2 * SS_MAX], eu_mask[2];

	int s, ss;

	int s, ss;
@@ -1639,10 +1640,12 @@ static void gen10_sseu_device_status(struct drm_i915_private *dev_priv, 
		 * although this seems wrong because it would leave many

		 * although this seems wrong because it would leave many

		 * subslices without ACK.

		 * subslices without ACK.

		 */

		 */

		s_reg[s] = I915_READ(GEN10_SLICE_PGCTL_ACK(s)) &

		s_reg[s] = intel_uncore_read(uncore, GEN10_SLICE_PGCTL_ACK(s)) &

			GEN10_PGCTL_VALID_SS_MASK(s);

			GEN10_PGCTL_VALID_SS_MASK(s);

		eu_reg[2 * s] = I915_READ(GEN10_SS01_EU_PGCTL_ACK(s));

		eu_reg[2 * s] = intel_uncore_read(uncore,

		eu_reg[2 * s + 1] = I915_READ(GEN10_SS23_EU_PGCTL_ACK(s));

						  GEN10_SS01_EU_PGCTL_ACK(s));

		eu_reg[2 * s + 1] = intel_uncore_read(uncore,

						      GEN10_SS23_EU_PGCTL_ACK(s));

	}

	}





	eu_mask[0] = GEN9_PGCTL_SSA_EU08_ACK |

	eu_mask[0] = GEN9_PGCTL_SSA_EU08_ACK |
@@ -1660,7 +1663,7 @@ static void gen10_sseu_device_status(struct drm_i915_private *dev_priv, 
			continue;

			continue;





		sseu->slice_mask |= BIT(s);

		sseu->slice_mask |= BIT(s);

		intel_sseu_copy_subslices(&info->sseu, s, sseu->subslice_mask);

		sseu_copy_subslices(&info->sseu, s, sseu->subslice_mask);





		for (ss = 0; ss < info->sseu.max_subslices; ss++) {

		for (ss = 0; ss < info->sseu.max_subslices; ss++) {

			unsigned int eu_cnt;

			unsigned int eu_cnt;
@@ -1681,18 +1684,21 @@ static void gen10_sseu_device_status(struct drm_i915_private *dev_priv, 
#undef SS_MAX

#undef SS_MAX

}

}





static void gen9_sseu_device_status(struct drm_i915_private *dev_priv,

static void gen9_sseu_device_status(struct intel_gt *gt,

				    struct sseu_dev_info *sseu)

				    struct sseu_dev_info *sseu)

{

{

#define SS_MAX 3

#define SS_MAX 3

	const struct intel_gt_info *info = &dev_priv->gt.info;

	struct intel_uncore *uncore = gt->uncore;

	const struct intel_gt_info *info = &gt->info;

	u32 s_reg[SS_MAX], eu_reg[2 * SS_MAX], eu_mask[2];

	u32 s_reg[SS_MAX], eu_reg[2 * SS_MAX], eu_mask[2];

	int s, ss;

	int s, ss;





	for (s = 0; s < info->sseu.max_slices; s++) {

	for (s = 0; s < info->sseu.max_slices; s++) {

		s_reg[s] = I915_READ(GEN9_SLICE_PGCTL_ACK(s));

		s_reg[s] = intel_uncore_read(uncore, GEN9_SLICE_PGCTL_ACK(s));

		eu_reg[2*s] = I915_READ(GEN9_SS01_EU_PGCTL_ACK(s));

		eu_reg[2 * s] =

		eu_reg[2*s + 1] = I915_READ(GEN9_SS23_EU_PGCTL_ACK(s));

			intel_uncore_read(uncore, GEN9_SS01_EU_PGCTL_ACK(s));

		eu_reg[2 * s + 1] =

			intel_uncore_read(uncore, GEN9_SS23_EU_PGCTL_ACK(s));

	}

	}





	eu_mask[0] = GEN9_PGCTL_SSA_EU08_ACK |

	eu_mask[0] = GEN9_PGCTL_SSA_EU08_ACK |
@@ -1711,8 +1717,8 @@ static void gen9_sseu_device_status(struct drm_i915_private *dev_priv, 




		sseu->slice_mask |= BIT(s);

		sseu->slice_mask |= BIT(s);





		if (IS_GEN9_BC(dev_priv))

		if (IS_GEN9_BC(gt->i915))

			intel_sseu_copy_subslices(&info->sseu, s,

			sseu_copy_subslices(&info->sseu, s,

					    sseu->subslice_mask);

					    sseu->subslice_mask);





		for (ss = 0; ss < info->sseu.max_subslices; ss++) {

		for (ss = 0; ss < info->sseu.max_subslices; ss++) {
@@ -1720,7 +1726,7 @@ static void gen9_sseu_device_status(struct drm_i915_private *dev_priv, 
			u8 ss_idx = s * info->sseu.ss_stride +

			u8 ss_idx = s * info->sseu.ss_stride +

				    ss / BITS_PER_BYTE;

				    ss / BITS_PER_BYTE;





			if (IS_GEN9_LP(dev_priv)) {

			if (IS_GEN9_LP(gt->i915)) {

				if (!(s_reg[s] & (GEN9_PGCTL_SS_ACK(ss))))

				if (!(s_reg[s] & (GEN9_PGCTL_SS_ACK(ss))))

					/* skip disabled subslice */

					/* skip disabled subslice */

					continue;

					continue;
@@ -1740,11 +1746,11 @@ static void gen9_sseu_device_status(struct drm_i915_private *dev_priv, 
#undef SS_MAX

#undef SS_MAX

}

}





static void bdw_sseu_device_status(struct drm_i915_private *dev_priv,

static void bdw_sseu_device_status(struct intel_gt *gt,

				   struct sseu_dev_info *sseu)

				   struct sseu_dev_info *sseu)

{

{

	const struct intel_gt_info *info = &dev_priv->gt.info;

	const struct intel_gt_info *info = &gt->info;

	u32 slice_info = I915_READ(GEN8_GT_SLICE_INFO);

	u32 slice_info = intel_uncore_read(gt->uncore, GEN8_GT_SLICE_INFO);

	int s;

	int s;





	sseu->slice_mask = slice_info & GEN8_LSLICESTAT_MASK;

	sseu->slice_mask = slice_info & GEN8_LSLICESTAT_MASK;
@@ -1752,7 +1758,7 @@ static void bdw_sseu_device_status(struct drm_i915_private *dev_priv, 
	if (sseu->slice_mask) {

	if (sseu->slice_mask) {

		sseu->eu_per_subslice = info->sseu.eu_per_subslice;

		sseu->eu_per_subslice = info->sseu.eu_per_subslice;

		for (s = 0; s < fls(sseu->slice_mask); s++)

		for (s = 0; s < fls(sseu->slice_mask); s++)

			intel_sseu_copy_subslices(&info->sseu, s,

			sseu_copy_subslices(&info->sseu, s,

					    sseu->subslice_mask);

					    sseu->subslice_mask);

		sseu->eu_total = sseu->eu_per_subslice *

		sseu->eu_total = sseu->eu_per_subslice *

				 intel_sseu_subslice_total(sseu);

				 intel_sseu_subslice_total(sseu);
@@ -1805,12 +1811,13 @@ static void i915_print_sseu_info(struct seq_file *m, bool is_available_info, 




static int i915_sseu_status(struct seq_file *m, void *unused)

static int i915_sseu_status(struct seq_file *m, void *unused)

{

{

	struct drm_i915_private *dev_priv = node_to_i915(m->private);

	struct drm_i915_private *i915 = node_to_i915(m->private);

	const struct intel_gt_info *info = &dev_priv->gt.info;

	struct intel_gt *gt = &i915->gt;

	const struct intel_gt_info *info = &gt->info;

	struct sseu_dev_info sseu;

	struct sseu_dev_info sseu;

	intel_wakeref_t wakeref;

	intel_wakeref_t wakeref;





	if (INTEL_GEN(dev_priv) < 8)

	if (INTEL_GEN(i915) < 8)

		return -ENODEV;

		return -ENODEV;





	seq_puts(m, "SSEU Device Info\n");

	seq_puts(m, "SSEU Device Info\n");
@@ -1822,15 +1829,15 @@ static int i915_sseu_status(struct seq_file *m, void *unused) 
			    info->sseu.max_subslices,

			    info->sseu.max_subslices,

			    info->sseu.max_eus_per_subslice);

			    info->sseu.max_eus_per_subslice);





	with_intel_runtime_pm(&dev_priv->runtime_pm, wakeref) {

	with_intel_runtime_pm(&i915->runtime_pm, wakeref) {

		if (IS_CHERRYVIEW(dev_priv))

		if (IS_CHERRYVIEW(i915))

			cherryview_sseu_device_status(dev_priv, &sseu);

			cherryview_sseu_device_status(gt, &sseu);

		else if (IS_BROADWELL(dev_priv))

		else if (IS_BROADWELL(i915))

			bdw_sseu_device_status(dev_priv, &sseu);

			bdw_sseu_device_status(gt, &sseu);

		else if (IS_GEN(dev_priv, 9))

		else if (IS_GEN(i915, 9))

			gen9_sseu_device_status(dev_priv, &sseu);

			gen9_sseu_device_status(gt, &sseu);

		else if (INTEL_GEN(dev_priv) >= 10)

		else if (INTEL_GEN(i915) >= 10)

			gen10_sseu_device_status(dev_priv, &sseu);

			gen10_sseu_device_status(gt, &sseu);

	}

	}





	i915_print_sseu_info(m, false, &sseu);

	i915_print_sseu_info(m, false, &sseu);