Skip to content

Commit dcbc4e3

Browse files
Darren Powellgregkh
authored andcommitted
amdgpu/pm: Prevent force of DCEFCLK on NAVI10 and SIENNA_CICHLID
[ Upstream commit b117b39 ] Writing to dcefclk causes the gpu to become unresponsive, and requires a reboot. Patch ignores a .force_clk_levels(SMU_DCEFCLK) call and issues an info message. Signed-off-by: Darren Powell <darren.powell@amd.com> Reviewed-by: Kenneth Feng <kenneth.feng@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent d47d0d1 commit dcbc4e3

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1110,7 +1110,6 @@ static int navi10_force_clk_levels(struct smu_context *smu,
11101110
case SMU_SOCCLK:
11111111
case SMU_MCLK:
11121112
case SMU_UCLK:
1113-
case SMU_DCEFCLK:
11141113
case SMU_FCLK:
11151114
/* There is only 2 levels for fine grained DPM */
11161115
if (navi10_is_support_fine_grained_dpm(smu, clk_type)) {
@@ -1130,6 +1129,10 @@ static int navi10_force_clk_levels(struct smu_context *smu,
11301129
if (ret)
11311130
return size;
11321131
break;
1132+
case SMU_DCEFCLK:
1133+
dev_info(smu->adev->dev,"Setting DCEFCLK min/max dpm level is not supported!\n");
1134+
break;
1135+
11331136
default:
11341137
break;
11351138
}

drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1018,7 +1018,6 @@ static int sienna_cichlid_force_clk_levels(struct smu_context *smu,
10181018
case SMU_SOCCLK:
10191019
case SMU_MCLK:
10201020
case SMU_UCLK:
1021-
case SMU_DCEFCLK:
10221021
case SMU_FCLK:
10231022
/* There is only 2 levels for fine grained DPM */
10241023
if (sienna_cichlid_is_support_fine_grained_dpm(smu, clk_type)) {
@@ -1038,6 +1037,9 @@ static int sienna_cichlid_force_clk_levels(struct smu_context *smu,
10381037
if (ret)
10391038
goto forec_level_out;
10401039
break;
1040+
case SMU_DCEFCLK:
1041+
dev_info(smu->adev->dev,"Setting DCEFCLK min/max dpm level is not supported!\n");
1042+
break;
10411043
default:
10421044
break;
10431045
}

0 commit comments

Comments
 (0)