OSDN Git Service

drm/amd/display: Formula refactor for calculating DPP CLK DTO
authorSung Lee <sung.lee@amd.com>
Thu, 5 Dec 2019 16:58:20 +0000 (11:58 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 18 Dec 2019 21:09:10 +0000 (16:09 -0500)
[Why]
Previous formula for calculating DPP CLK DTO was
hard to understand.

[How]
Replace with easier to understand formula that produces
same results.

Signed-off-by: Sung Lee <sung.lee@amd.com>
Reviewed-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c

index 1e11513..50bffbf 100644 (file)
@@ -50,20 +50,20 @@ void dccg2_update_dpp_dto(struct dccg *dccg, int dpp_inst, int req_dppclk)
 
        if (dccg->ref_dppclk && req_dppclk) {
                int ref_dppclk = dccg->ref_dppclk;
+               int modulo, phase;
 
-               ASSERT(req_dppclk <= ref_dppclk);
-               /* need to clamp to 8 bits */
-               if (ref_dppclk > 0xff) {
-                       int divider = (ref_dppclk + 0xfe) / 0xff;
+               // phase / modulo = dpp pipe clk / dpp global clk
+               modulo = 0xff;   // use FF at the end
+               phase = ((modulo * req_dppclk) + ref_dppclk - 1) / ref_dppclk;
 
-                       ref_dppclk /= divider;
-                       req_dppclk = (req_dppclk + divider - 1) / divider;
-                       if (req_dppclk > ref_dppclk)
-                               req_dppclk = ref_dppclk;
+               if (phase > 0xff) {
+                       ASSERT(false);
+                       phase = 0xff;
                }
+
                REG_SET_2(DPPCLK_DTO_PARAM[dpp_inst], 0,
-                               DPPCLK0_DTO_PHASE, req_dppclk,
-                               DPPCLK0_DTO_MODULO, ref_dppclk);
+                               DPPCLK0_DTO_PHASE, phase,
+                               DPPCLK0_DTO_MODULO, modulo);
                REG_UPDATE(DPPCLK_DTO_CTRL,
                                DPPCLK_DTO_ENABLE[dpp_inst], 1);
        } else {