]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
drm/amd/display: remove redundant msg to pmfw at boot/resume
authorCharlene Liu <Charlene.Liu@amd.com>
Thu, 1 Aug 2024 22:18:20 +0000 (18:18 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 13 Aug 2024 14:45:58 +0000 (10:45 -0400)
[why & how]
this is to remove redundant msg to pmfw at boot/resume
since bios already power up dcn.

Reviewed-by: Chris Park <chris.park@amd.com>
Signed-off-by: Charlene Liu <Charlene.Liu@amd.com>
Signed-off-by: Tom Chung <chiahsuan.chung@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c

index e2f5c4d34a553ebc8e69ccdd8ecb3fa06c9f2fac..217344ccf6440a064c0f0e414f30d2caf133612b 100644 (file)
@@ -1845,6 +1845,7 @@ void dce110_enable_accelerated_mode(struct dc *dc, struct dc_state *context)
        bool can_apply_edp_fast_boot = false;
        bool can_apply_seamless_boot = false;
        bool keep_edp_vdd_on = false;
+       struct dc_bios *dcb = dc->ctx->dc_bios;
        DC_LOGGER_INIT();
 
 
@@ -1921,13 +1922,15 @@ void dce110_enable_accelerated_mode(struct dc *dc, struct dc_state *context)
                        hws->funcs.edp_backlight_control(edp_link_with_sink, false);
                }
                /*resume from S3, no vbios posting, no need to power down again*/
-               clk_mgr_exit_optimized_pwr_state(dc, dc->clk_mgr);
+               if (dcb && dcb->funcs && !dcb->funcs->is_accelerated_mode(dcb))
+                       clk_mgr_exit_optimized_pwr_state(dc, dc->clk_mgr);
 
                power_down_all_hw_blocks(dc);
                disable_vga_and_power_gate_all_controllers(dc);
                if (edp_link_with_sink && !keep_edp_vdd_on)
                        dc->hwss.edp_power_control(edp_link_with_sink, false);
-               clk_mgr_optimize_pwr_state(dc, dc->clk_mgr);
+               if (dcb && dcb->funcs && !dcb->funcs->is_accelerated_mode(dcb))
+                       clk_mgr_optimize_pwr_state(dc, dc->clk_mgr);
        }
        bios_set_scratch_acc_mode_change(dc->ctx->dc_bios, 1);
 }