Skip to content

Commit 4538a93

Browse files
Lijo Lazaralexdeucher
authored andcommitted
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: Lijo Lazar <[email protected]> Reviewed-by: Asad Kamal <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent b809ca9 commit 4538a93

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,8 @@ int smu_v13_0_check_fw_version(struct smu_context *smu)
288288
* Considering above, we just leave user a verbal message instead
289289
* of halt driver loading.
290290
*/
291-
if (if_version != smu->smc_driver_if_version) {
291+
if (smu->smc_driver_if_version != SMU_IGNORE_IF_VERSION &&
292+
if_version != smu->smc_driver_if_version) {
292293
dev_info(adev->dev, "smu driver if version = 0x%08x, smu fw if version = 0x%08x, "
293294
"smu fw program = %d, smu fw version = 0x%08x (%d.%d.%d)\n",
294295
smu->smc_driver_if_version, if_version,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3933,7 +3933,7 @@ void smu_v13_0_6_set_ppt_funcs(struct smu_context *smu)
39333933
smu->feature_map = (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 12)) ?
39343934
smu_v13_0_12_feature_mask_map : smu_v13_0_6_feature_mask_map;
39353935
smu->table_map = smu_v13_0_6_table_map;
3936-
smu->smc_driver_if_version = SMU13_0_6_DRIVER_IF_VERSION;
3936+
smu->smc_driver_if_version = SMU_IGNORE_IF_VERSION;
39373937
smu->smc_fw_caps |= SMU_FW_CAP_RAS_PRI;
39383938
smu_v13_0_set_smu_mailbox_registers(smu);
39393939
smu_v13_0_6_set_temp_funcs(smu);

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
#define SMU_IH_INTERRUPT_CONTEXT_ID_FAN_ABNORMAL 0x8
4141
#define SMU_IH_INTERRUPT_CONTEXT_ID_FAN_RECOVERY 0x9
4242

43+
#define SMU_IGNORE_IF_VERSION 0xFFFFFFFF
44+
4345
#define smu_cmn_init_soft_gpu_metrics(ptr, frev, crev) \
4446
do { \
4547
typecheck(struct gpu_metrics_v##frev##_##crev *, (ptr)); \

0 commit comments

Comments
 (0)