From: Charlene Liu <[email protected]> [Why & How] At driver init time, power_source is not initialized. It will override DC's min dcfclk as well. Since latest pmfw has the fix release, we can remove the previous w/a.
Reviewed-by: Roman Li <[email protected]> Signed-off-by: Charlene Liu <[email protected]> Signed-off-by: Ray Wu <[email protected]> --- .../gpu/drm/amd/display/dc/clk_mgr/dcn42b/dcn42b_clk_mgr.c | 2 -- drivers/gpu/drm/amd/display/dmub/src/dmub_dcn42.c | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn42b/dcn42b_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn42b/dcn42b_clk_mgr.c index d500a3210eed..33f0099075c0 100644 --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn42b/dcn42b_clk_mgr.c +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn42b/dcn42b_clk_mgr.c @@ -418,8 +418,6 @@ static void dcn42b_update_clocks(struct clk_mgr *clk_mgr_base, dc->debug.force_min_dcfclk_mhz = DCN42B_MIN_DCFCLK_MHZ; else if (dc->debug.force_min_dcfclk_mhz > DCN42B_MAX_DCFCLK_MHZ) dc->debug.force_min_dcfclk_mhz = DCN42B_MAX_DCFCLK_MHZ; - } else if (power_supply_is_system_supplied()) { - dc->debug.force_min_dcfclk_mhz = DCN42B_AC_MIN_DCFCLK_MHZ; } dcn42_update_clocks(clk_mgr_base, context, safe_to_lower); diff --git a/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn42.c b/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn42.c index 3ef9a0152058..8ebd3d948567 100644 --- a/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn42.c +++ b/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn42.c @@ -392,10 +392,9 @@ bool dmub_dcn42_is_hw_init(struct dmub_srv *dmub) fw_version = REG_READ(DMCUB_SCRATCH1); is_vbios_fw = ((fw_version >> 6) & 0x01) ? true : false; - if (is_vbios_fw) { - dm_output_to_console("\n: DMU started with VBIOS FW, fw_version = 0x%x\n", fw_version); + if (is_vbios_fw) return false; - } + return is_hw_init != 0 && status.bits.dal_fw; } -- 2.43.0
