Commit 4cd694fd authored by Lijo Lazar's avatar Lijo Lazar Committed by Alex Deucher
Browse files

drm/amd/pm: Fetch partition metrics on SMUv13.0.6 



Add support to fetch compute partition related metrics in SMUv13.0.6
SOCs.

Signed-off-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarAsad Kamal <asad.kamal@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cbbab292

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c

+112 −0
Original line number Diff line number Diff line
@@ -2536,6 +2536,117 @@ static int smu_v13_0_6_get_current_pcie_link_speed(struct smu_context *smu) 
	return pcie_gen_to_speed(speed_level + 1);

}



static ssize_t smu_v13_0_6_get_xcp_metrics(struct smu_context *smu, int xcp_id,

					   void *table)

{

	const u8 num_jpeg_rings = AMDGPU_MAX_JPEG_RINGS_4_0_3;

	int version = smu_v13_0_6_get_metrics_version(smu);

	struct amdgpu_partition_metrics_v1_0 *xcp_metrics;

	struct amdgpu_device *adev = smu->adev;

	int ret, inst, i, j, k, idx;

	MetricsTableV0_t *metrics_v0;

	MetricsTableV1_t *metrics_v1;

	MetricsTableV2_t *metrics_v2;

	struct amdgpu_xcp *xcp;

	u32 inst_mask;

	bool per_inst;



	if (!table)

		return sizeof(*xcp_metrics);



	for_each_xcp(adev->xcp_mgr, xcp, i) {

		if (xcp->id == xcp_id)

			break;

	}

	if (i == adev->xcp_mgr->num_xcps)

		return -EINVAL;



	xcp_metrics = (struct amdgpu_partition_metrics_v1_0 *)table;

	smu_cmn_init_partition_metrics(xcp_metrics, 1, 0);



	metrics_v0 = kzalloc(METRICS_TABLE_SIZE, GFP_KERNEL);

	if (!metrics_v0)

		return -ENOMEM;



	ret = smu_v13_0_6_get_metrics_table(smu, metrics_v0, false);

	if (ret) {

		kfree(metrics_v0);

		return ret;

	}

	metrics_v1 = (MetricsTableV1_t *)metrics_v0;

	metrics_v2 = (MetricsTableV2_t *)metrics_v0;



	per_inst = smu_v13_0_6_cap_supported(smu, SMU_CAP(PER_INST_METRICS));



	amdgpu_xcp_get_inst_details(xcp, AMDGPU_XCP_VCN, &inst_mask);

	idx = 0;

	for_each_inst(k, inst_mask) {

		/* Both JPEG and VCN has same instances */

		inst = GET_INST(VCN, k);



		for (j = 0; j < num_jpeg_rings; ++j) {

			xcp_metrics->jpeg_busy[(idx * num_jpeg_rings) + j] =

				SMUQ10_ROUND(GET_METRIC_FIELD(

					JpegBusy,

					version)[(inst * num_jpeg_rings) + j]);

		}

		xcp_metrics->vcn_busy[idx] =

			SMUQ10_ROUND(GET_METRIC_FIELD(VcnBusy, version)[inst]);



		xcp_metrics->current_vclk0[idx] = SMUQ10_ROUND(

			GET_METRIC_FIELD(VclkFrequency, version)[inst]);

		xcp_metrics->current_dclk0[idx] = SMUQ10_ROUND(

			GET_METRIC_FIELD(DclkFrequency, version)[inst]);

		xcp_metrics->current_socclk[idx] = SMUQ10_ROUND(

			GET_METRIC_FIELD(SocclkFrequency, version)[inst]);



		idx++;

	}



	xcp_metrics->current_uclk =

		SMUQ10_ROUND(GET_METRIC_FIELD(UclkFrequency, version));



	if (per_inst) {

		amdgpu_xcp_get_inst_details(xcp, AMDGPU_XCP_GFX, &inst_mask);

		idx = 0;

		for_each_inst(k, inst_mask) {

			inst = GET_INST(GC, k);

			xcp_metrics->current_gfxclk[idx] =

				SMUQ10_ROUND(GET_METRIC_FIELD(GfxclkFrequency,

							      version)[inst]);



			xcp_metrics->gfx_busy_inst[idx] = SMUQ10_ROUND(

				GET_GPU_METRIC_FIELD(GfxBusy, version)[inst]);

			xcp_metrics->gfx_busy_acc[idx] = SMUQ10_ROUND(

				GET_GPU_METRIC_FIELD(GfxBusyAcc,

						     version)[inst]);

			if (smu_v13_0_6_cap_supported(

				    smu, SMU_CAP(HST_LIMIT_METRICS))) {

				xcp_metrics->gfx_below_host_limit_ppt_acc

					[idx] = SMUQ10_ROUND(

					metrics_v0->GfxclkBelowHostLimitPptAcc

						[inst]);

				xcp_metrics->gfx_below_host_limit_thm_acc

					[idx] = SMUQ10_ROUND(

					metrics_v0->GfxclkBelowHostLimitThmAcc

						[inst]);

				xcp_metrics->gfx_low_utilization_acc

					[idx] = SMUQ10_ROUND(

					metrics_v0

						->GfxclkLowUtilizationAcc[inst]);

				xcp_metrics->gfx_below_host_limit_total_acc

					[idx] = SMUQ10_ROUND(

					metrics_v0->GfxclkBelowHostLimitTotalAcc

						[inst]);

			}

			idx++;

		}

	}

	kfree(metrics_v0);



	return sizeof(*xcp_metrics);

}



static ssize_t smu_v13_0_6_get_gpu_metrics(struct smu_context *smu, void **table)

{

	struct smu_table_context *smu_table = &smu->smu_table;
@@ -3680,6 +3791,7 @@ static const struct pptable_funcs smu_v13_0_6_ppt_funcs = { 
	.get_pp_feature_mask = smu_cmn_get_pp_feature_mask,

	.get_gpu_metrics = smu_v13_0_6_get_gpu_metrics,

	.get_pm_metrics = smu_v13_0_6_get_pm_metrics,

	.get_xcp_metrics = smu_v13_0_6_get_xcp_metrics,

	.get_thermal_temperature_range = smu_v13_0_6_get_thermal_temperature_range,

	.mode1_reset_is_support = smu_v13_0_6_is_mode1_reset_supported,

	.link_reset_is_support = smu_v13_0_6_is_link_reset_supported,