]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
drm/amd/display: removing MODULO change for dcn2
authorMartin Leung <martin.leung@amd.com>
Wed, 15 May 2019 19:50:51 +0000 (15:50 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Sat, 22 Jun 2019 14:34:13 +0000 (09:34 -0500)
[why]
when resetting pipes from 480p to dual-pipe 8k, modulo reg write for
video optimized rate updated one pipe without changing the other, causing
sync error

[how]
removed code from dcn2

Signed-off-by: Martin Leung <martin.leung@amd.com>
Reviewed-by: Jun Lei <Jun.Lei@amd.com>
Acked-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c

index bf8cfd9b3e8ff1ba878dd88d6c97a36c44326493..c72aed35f4db34b8595c2909fd961aaf36a37e94 100644 (file)
@@ -1046,41 +1046,13 @@ static const struct pixel_rate_range_table_entry video_optimized_pixel_rates[] =
        {108100, 108110, 108000, 1001, 1000},//108Mhz
 };
 
-static const struct pixel_rate_range_table_entry *look_up_in_video_optimized_rate_tlb(
-               unsigned int pixel_rate_khz)
-{
-       int i;
-
-       for (i = 0; i < NUM_ELEMENTS(video_optimized_pixel_rates); i++) {
-               const struct pixel_rate_range_table_entry *e = &video_optimized_pixel_rates[i];
-
-               if (e->range_min_khz <= pixel_rate_khz && pixel_rate_khz <= e->range_max_khz) {
-                       return e;
-               }
-       }
-
-       return NULL;
-}
-
 static bool dcn20_program_pix_clk(
                struct clock_source *clock_source,
                struct pixel_clk_params *pix_clk_params,
                struct pll_settings *pll_settings)
 {
-       struct dce110_clk_src *clk_src = TO_DCE110_CLK_SRC(clock_source);
-       unsigned int inst = pix_clk_params->controller_id - CONTROLLER_ID_D0;
-       unsigned int dp_dto_ref_khz = clock_source->ctx->dc->clk_mgr->dprefclk_khz;
-       const struct pixel_rate_range_table_entry *e =
-                       look_up_in_video_optimized_rate_tlb(pll_settings->actual_pix_clk_100hz / 10);
-
        dce112_program_pix_clk(clock_source, pix_clk_params, pll_settings);
 
-       if (e) {
-               /* Set DTO values: phase = target clock, modulo = reference clock */
-               REG_WRITE(PHASE[inst], e->target_pixel_rate_khz * e->mult_factor);
-               REG_WRITE(MODULO[inst], dp_dto_ref_khz * e->div_factor);
-       }
-
        return true;
 }