Commit c59397ef authored by Charlene Liu's avatar Charlene Liu Committed by Alex Deucher

drm/amd/display: revert removing otg toggle w/a back when no active display

w/a use case:
- dual display, compliance, toggling between the displays
- switching between 120Hz 420 -> 144Hz 444 and vice versa
- switching between 144Hz -> 60Hz TMDS or vice versa

It'd typically involve TMDS in some capacity since that's the only link
signal we leave the OTG running but DIO/PHY off you can hit this in
cases where you have multiple displays as well it syncs with the first
active OTG, so if you had OTG[0] mapped and FIFO off you'd hit it even
if OTG[1] was mapped and had FIFO
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Reviewed-by: default avatarNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Acked-by: default avatarRodrigo Siqueira <rodrigo.siqueira@amd.com>
Signed-off-by: default avatarCharlene Liu <charlene.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d2182915
...@@ -312,13 +312,11 @@ void dcn35_update_clocks(struct clk_mgr *clk_mgr_base, ...@@ -312,13 +312,11 @@ void dcn35_update_clocks(struct clk_mgr *clk_mgr_base,
} }
if (should_set_clock(safe_to_lower, new_clocks->dispclk_khz, clk_mgr_base->clks.dispclk_khz)) { if (should_set_clock(safe_to_lower, new_clocks->dispclk_khz, clk_mgr_base->clks.dispclk_khz)) {
dcn35_disable_otg_wa(clk_mgr_base, context, safe_to_lower, true);
clk_mgr_base->clks.dispclk_khz = new_clocks->dispclk_khz; clk_mgr_base->clks.dispclk_khz = new_clocks->dispclk_khz;
if (all_active_disps != 0) { dcn35_smu_set_dispclk(clk_mgr, clk_mgr_base->clks.dispclk_khz);
dcn35_disable_otg_wa(clk_mgr_base, context, safe_to_lower, true); dcn35_disable_otg_wa(clk_mgr_base, context, safe_to_lower, false);
dcn35_smu_set_dispclk(clk_mgr, clk_mgr_base->clks.dispclk_khz);
dcn35_disable_otg_wa(clk_mgr_base, context, safe_to_lower, false);
} else
dcn35_smu_set_dispclk(clk_mgr, clk_mgr_base->clks.dispclk_khz);
update_dispclk = true; update_dispclk = true;
} }
......
...@@ -475,14 +475,14 @@ int dcn35_smu_get_ips_supported(struct clk_mgr_internal *clk_mgr) ...@@ -475,14 +475,14 @@ int dcn35_smu_get_ips_supported(struct clk_mgr_internal *clk_mgr)
VBIOSSMC_MSG_QueryIPS2Support, VBIOSSMC_MSG_QueryIPS2Support,
0); 0);
smu_print("%s: VBIOSSMC_MSG_QueryIPS2Support return = %x\n", __func__, retv); //smu_print("%s: VBIOSSMC_MSG_QueryIPS2Support return = %x\n", __func__, retv);
return retv; return retv;
} }
void dcn35_smu_write_ips_scratch(struct clk_mgr_internal *clk_mgr, uint32_t param) void dcn35_smu_write_ips_scratch(struct clk_mgr_internal *clk_mgr, uint32_t param)
{ {
REG_WRITE(MP1_SMN_C2PMSG_71, param); REG_WRITE(MP1_SMN_C2PMSG_71, param);
smu_print("%s: write_ips_scratch = %x\n", __func__, param); //smu_print("%s: write_ips_scratch = %x\n", __func__, param);
} }
uint32_t dcn35_smu_read_ips_scratch(struct clk_mgr_internal *clk_mgr) uint32_t dcn35_smu_read_ips_scratch(struct clk_mgr_internal *clk_mgr)
...@@ -490,6 +490,6 @@ uint32_t dcn35_smu_read_ips_scratch(struct clk_mgr_internal *clk_mgr) ...@@ -490,6 +490,6 @@ uint32_t dcn35_smu_read_ips_scratch(struct clk_mgr_internal *clk_mgr)
uint32_t retv; uint32_t retv;
retv = REG_READ(MP1_SMN_C2PMSG_71); retv = REG_READ(MP1_SMN_C2PMSG_71);
smu_print("%s: dcn35_smu_read_ips_scratch = %x\n", __func__, retv); //smu_print("%s: dcn35_smu_read_ips_scratch = %x\n", __func__, retv);
return retv; return retv;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment