Commit 2393c1a9 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/pm: add VCN activity for SMU 13.0.0/7 



Wire up the query.

Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarKenneth Feng <kenneth.feng@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6a87982b

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

+10 −0
Original line number Diff line number Diff line
@@ -836,6 +836,10 @@ static int smu_v13_0_0_get_smu_metrics_data(struct smu_context *smu, 
	case METRICS_AVERAGE_MEMACTIVITY:

		*value = metrics->AverageUclkActivity;

		break;

	case METRICS_AVERAGE_VCNACTIVITY:

		*value = max(metrics->Vcn0ActivityPercentage,

			     metrics->Vcn1ActivityPercentage);

		break;

	case METRICS_AVERAGE_SOCKETPOWER:

		*value = metrics->AverageSocketPower << 8;

		break;
@@ -962,6 +966,12 @@ static int smu_v13_0_0_read_sensor(struct smu_context *smu, 
						       (uint32_t *)data);

		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_VCN_LOAD:

		ret = smu_v13_0_0_get_smu_metrics_data(smu,

						       METRICS_AVERAGE_VCNACTIVITY,

						       (uint32_t *)data);

		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_GPU_AVG_POWER:

		ret = smu_v13_0_0_get_smu_metrics_data(smu,

						       METRICS_AVERAGE_SOCKETPOWER,

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

+10 −0
Original line number Diff line number Diff line
@@ -807,6 +807,10 @@ static int smu_v13_0_7_get_smu_metrics_data(struct smu_context *smu, 
		else

			*value = metrics->AverageMemclkFrequencyPreDs;

		break;

	case METRICS_AVERAGE_VCNACTIVITY:

		*value = max(metrics->Vcn0ActivityPercentage,

			     metrics->Vcn1ActivityPercentage);

		break;

	case METRICS_AVERAGE_VCLK:

		*value = metrics->AverageVclk0Frequency;

		break;
@@ -951,6 +955,12 @@ static int smu_v13_0_7_read_sensor(struct smu_context *smu, 
						       (uint32_t *)data);

		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_VCN_LOAD:

		ret = smu_v13_0_7_get_smu_metrics_data(smu,

						       METRICS_AVERAGE_VCNACTIVITY,

						       (uint32_t *)data);

		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_GPU_AVG_POWER:

		ret = smu_v13_0_7_get_smu_metrics_data(smu,

						       METRICS_AVERAGE_SOCKETPOWER,