drm/amd/display: set dpp dto as per requested clk for lower case.

[Why]
Blue screen when PNP with multiple monitor or hotplug external monitor when playing video
due to dpp dto isn't programmed properly.
If lower dpp clock, dpp dto need to be programmed first, and actual dpp clk not avalable yet.

[How]
set dpp dto as per request clk for lower case before dpp clk update, and after dpp clk updated
set dpp dto again with actual dpp clk.

Signed-off-by: Yongqiang Sun <yongqiang.sun@amd.com>
Acked-by: Bindu Ramamurthy <bindu.r@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c
index 9e3d8af3895f2f29e25dac068fe1825675e12b6b..8d8ee4b9fee1625caf991662525c29094df902b2 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c
+++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c
@@ -104,11 +104,12 @@ void rn_set_low_power_state(struct clk_mgr *clk_mgr_base)
 }
 
 static void rn_update_clocks_update_dpp_dto(struct clk_mgr_internal *clk_mgr,
-               struct dc_state *context, bool safe_to_lower)
+               struct dc_state *context, int ref_dpp_clk, bool safe_to_lower)
 {
        int i;
 
-       clk_mgr->dccg->ref_dppclk = clk_mgr->base.clks.actual_dppclk_khz;
+       clk_mgr->dccg->ref_dppclk = ref_dpp_clk;
+
        for (i = 0; i < clk_mgr->base.ctx->dc->res_pool->pipe_count; i++) {
                int dpp_inst, dppclk_khz, prev_dppclk_khz;
 
@@ -200,19 +201,36 @@ void rn_update_clocks(struct clk_mgr *clk_mgr_base,
        }
 
        if (dpp_clock_lowered) {
-               // increase per DPP DTO before lowering global dppclk
-               rn_update_clocks_update_dpp_dto(clk_mgr, context, safe_to_lower);
+               // increase per DPP DTO before lowering global dppclk with requested dppclk
+               rn_update_clocks_update_dpp_dto(
+                               clk_mgr,
+                               context,
+                               clk_mgr_base->clks.dppclk_khz,
+                               safe_to_lower);
+
                clk_mgr_base->clks.actual_dppclk_khz =
                                rn_vbios_smu_set_dppclk(clk_mgr, clk_mgr_base->clks.dppclk_khz);
 
+               //update dpp dto with actual dpp clk.
+               rn_update_clocks_update_dpp_dto(
+                               clk_mgr,
+                               context,
+                               clk_mgr_base->clks.actual_dppclk_khz,
+                               safe_to_lower);
+
        } else {
                // increase global DPPCLK before lowering per DPP DTO
                if (update_dppclk || update_dispclk)
                        clk_mgr_base->clks.actual_dppclk_khz =
                                        rn_vbios_smu_set_dppclk(clk_mgr, clk_mgr_base->clks.dppclk_khz);
+
                // always update dtos unless clock is lowered and not safe to lower
                if (new_clocks->dppclk_khz >= dc->current_state->bw_ctx.bw.dcn.clk.dppclk_khz)
-                       rn_update_clocks_update_dpp_dto(clk_mgr, context, safe_to_lower);
+                       rn_update_clocks_update_dpp_dto(
+                                       clk_mgr,
+                                       context,
+                                       clk_mgr_base->clks.actual_dppclk_khz,
+                                       safe_to_lower);
        }
 
        if (update_dispclk &&