Skip to content

Commit ca4b32b

Browse files
Luben Tuikovalexdeucher
authored andcommitted
drm/amd/pm: Add debug prints
Add prints where there are none and none are printed in the callee. Remove the word "previous" from comment and print to make it shorter and avoid confusion in various prints. Cc: Alex Deucher <[email protected]> Signed-off-by: Luben Tuikov <[email protected]> Reviewed-by: Alex Deucher <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 1223c15 commit ca4b32b

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1153,6 +1153,8 @@ static int smu_smc_hw_setup(struct smu_context *smu)
11531153
case IP_VERSION(11, 5, 0):
11541154
case IP_VERSION(11, 0, 12):
11551155
ret = smu_system_features_control(smu, true);
1156+
if (ret)
1157+
dev_err(adev->dev, "Failed system features control!\n");
11561158
break;
11571159
default:
11581160
break;
@@ -1277,17 +1279,17 @@ static int smu_smc_hw_setup(struct smu_context *smu)
12771279
}
12781280

12791281
ret = smu_notify_display_change(smu);
1280-
if (ret)
1282+
if (ret) {
1283+
dev_err(adev->dev, "Failed to notify display change!\n");
12811284
return ret;
1285+
}
12821286

12831287
/*
12841288
* Set min deep sleep dce fclk with bootup value from vbios via
12851289
* SetMinDeepSleepDcefclk MSG.
12861290
*/
12871291
ret = smu_set_min_dcef_deep_sleep(smu,
12881292
smu->smu_table.boot_values.dcefclk / 100);
1289-
if (ret)
1290-
return ret;
12911293

12921294
return ret;
12931295
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ static void smu_cmn_read_arg(struct smu_context *smu,
9797
* smu: a pointer to SMU context
9898
*
9999
* Returns the status of the SMU, which could be,
100-
* 0, the SMU is busy with your previous command;
100+
* 0, the SMU is busy with your command;
101101
* 1, execution status: success, execution result: success;
102102
* 0xFF, execution status: success, execution result: failure;
103103
* 0xFE, unknown command;
@@ -143,7 +143,7 @@ static void __smu_cmn_reg_print_error(struct smu_context *smu,
143143
u32 msg_idx = RREG32_SOC15(MP1, 0, mmMP1_SMN_C2PMSG_66);
144144
u32 prm = RREG32_SOC15(MP1, 0, mmMP1_SMN_C2PMSG_82);
145145
dev_err_ratelimited(adev->dev,
146-
"SMU: I'm not done with your previous command: SMN_C2PMSG_66:0x%08X SMN_C2PMSG_82:0x%08X",
146+
"SMU: I'm not done with your command: SMN_C2PMSG_66:0x%08X SMN_C2PMSG_82:0x%08X",
147147
msg_idx, prm);
148148
}
149149
break;

0 commit comments

Comments
 (0)