Commit 4538a93b authored by Lijo Lazar's avatar Lijo Lazar Committed by Alex Deucher
Browse files

drm/amd/pm: Avoid interface mismatch messaging 



PMFW interface version is not used by some IP implementations like SMU
v13.0.6/12, instead rely on PMFW version checks. Avoid the log if
interface version is not used.

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

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

+2 −1
Original line number Diff line number Diff line
@@ -288,7 +288,8 @@ int smu_v13_0_check_fw_version(struct smu_context *smu) 
	 * Considering above, we just leave user a verbal message instead

	 * of halt driver loading.

	 */

	if (if_version != smu->smc_driver_if_version) {

	if (smu->smc_driver_if_version != SMU_IGNORE_IF_VERSION &&

	    if_version != smu->smc_driver_if_version) {

		dev_info(adev->dev, "smu driver if version = 0x%08x, smu fw if version = 0x%08x, "

			 "smu fw program = %d, smu fw version = 0x%08x (%d.%d.%d)\n",

			 smu->smc_driver_if_version, if_version,

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

+1 −1
Original line number Diff line number Diff line
@@ -3933,7 +3933,7 @@ void smu_v13_0_6_set_ppt_funcs(struct smu_context *smu) 
	smu->feature_map = (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 12)) ?

		smu_v13_0_12_feature_mask_map : smu_v13_0_6_feature_mask_map;

	smu->table_map = smu_v13_0_6_table_map;

	smu->smc_driver_if_version = SMU13_0_6_DRIVER_IF_VERSION;

	smu->smc_driver_if_version = SMU_IGNORE_IF_VERSION;

	smu->smc_fw_caps |= SMU_FW_CAP_RAS_PRI;

	smu_v13_0_set_smu_mailbox_registers(smu);

	smu_v13_0_6_set_temp_funcs(smu);

drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ 
#define SMU_IH_INTERRUPT_CONTEXT_ID_FAN_ABNORMAL        0x8

#define SMU_IH_INTERRUPT_CONTEXT_ID_FAN_RECOVERY        0x9



#define SMU_IGNORE_IF_VERSION 0xFFFFFFFF



#define smu_cmn_init_soft_gpu_metrics(ptr, frev, crev)                   \

	do {                                                             \

		typecheck(struct gpu_metrics_v##frev##_##crev *, (ptr)); \