Commit b02a284c authored by Asad Kamal's avatar Asad Kamal Committed by Alex Deucher
Browse files

drm/amd/pm: Add ip version check for smu_v13_0_12 functions 



Add ip version check to use smu_v13_0_12 specific functions

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

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

+6 −3
Original line number Diff line number Diff line
@@ -748,7 +748,8 @@ static int smu_v13_0_6_setup_driver_pptable(struct smu_context *smu) 
	int ret, i, retry = 100;

	uint32_t table_version;



	if (smu_v13_0_6_cap_supported(smu, SMU_CAP(STATIC_METRICS)))

	if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 12) &&

	    smu_v13_0_6_cap_supported(smu, SMU_CAP(STATIC_METRICS)))

		return smu_v13_0_12_setup_driver_pptable(smu);



	/* Store one-time values in driver PPTable */
@@ -1131,7 +1132,8 @@ static int smu_v13_0_6_get_smu_metrics_data(struct smu_context *smu, 
	if (ret)

		return ret;



	if (smu_v13_0_6_cap_supported(smu, SMU_CAP(STATIC_METRICS)))

	if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 12) &&

	    smu_v13_0_6_cap_supported(smu, SMU_CAP(STATIC_METRICS)))

		return smu_v13_0_12_get_smu_metrics_data(smu, member, value);



	/* For clocks with multiple instances, only report the first one */
@@ -2496,7 +2498,8 @@ static ssize_t smu_v13_0_6_get_gpu_metrics(struct smu_context *smu, void **table 
		return ret;

	}



	if (smu_v13_0_6_cap_supported(smu, SMU_CAP(STATIC_METRICS)))

	if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 12) &&

	    smu_v13_0_6_cap_supported(smu, SMU_CAP(STATIC_METRICS)))

		return smu_v13_0_12_get_gpu_metrics(smu, table);



	metrics_v1 = (MetricsTableV1_t *)metrics_v0;