Skip to content

Commit 401c90c

Browse files
Nicholas Kazlauskasalexdeucher
authored andcommitted
drm/amd/display: Block dynamic IPS2 on DCN35 for incompatible FW versions
[WHY] Hangs with Z8 can occur if running an older unfixed PMFW version. [HOW] Fallback to RCG only for dynamic IPS2 states if it's not newer than 93.12. Limit to DCN35. Cc: Mario Limonciello <mario.limonciello@amd.com> Cc: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org Reviewed-by: Charlene Liu <charlene.liu@amd.com> Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> Signed-off-by: Alex Hung <alex.hung@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 09cb922 commit 401c90c

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1222,6 +1222,12 @@ void dcn35_clk_mgr_construct(
12221222
ctx->dc->debug.disable_dpp_power_gate = false;
12231223
ctx->dc->debug.disable_hubp_power_gate = false;
12241224
ctx->dc->debug.disable_dsc_power_gate = false;
1225+
1226+
/* Disable dynamic IPS2 in older PMFW (93.12) for Z8 interop. */
1227+
if (ctx->dc->config.disable_ips == DMUB_IPS_ENABLE &&
1228+
ctx->dce_version == DCN_VERSION_3_5 &&
1229+
((clk_mgr->base.smu_ver & 0x00FFFFFF) <= 0x005d0c00))
1230+
ctx->dc->config.disable_ips = DMUB_IPS_RCG_IN_ACTIVE_IPS2_IN_OFF;
12251231
} else {
12261232
/*let's reset the config control flag*/
12271233
ctx->dc->config.disable_ips = DMUB_IPS_DISABLE_ALL; /*pmfw not support it, disable it all*/

0 commit comments

Comments
 (0)