Commit eb1b4573 authored by Yongqiang Sun's avatar Yongqiang Sun Committed by Alex Deucher
Browse files

drm/amd/display: DPP DTO isn't update properly. 



[Why]
before update dpp DTO, we check dppclks in context to determine it is
changed or not, but dppclks in context will be updated anyways after
flip is done, so compare dppclks in context will always get an equal
result.

[How]
Add pipe dpp clks in dccg and compare values between dccg and context.

Signed-off-by: default avatarYongqiang Sun <yongqiang.sun@amd.com>
Reviewed-by: default avatarDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Acked-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2f752e91

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c

+2 −3
Original line number Diff line number Diff line
@@ -115,14 +115,13 @@ void dcn20_update_clocks_update_dpp_dto(struct clk_mgr_internal *clk_mgr, 
		dpp_inst = i;

		dppclk_khz = context->res_ctx.pipe_ctx[i].plane_res.bw.dppclk_khz;



		prev_dppclk_khz = clk_mgr->base.ctx->dc->current_state->res_ctx.pipe_ctx[i].plane_res.bw.dppclk_khz;

		prev_dppclk_khz = clk_mgr->dccg->pipe_dppclk_khz[i];



		if (safe_to_lower || prev_dppclk_khz < dppclk_khz) {

		if (safe_to_lower || prev_dppclk_khz < dppclk_khz)

			clk_mgr->dccg->funcs->update_dpp_dto(

							clk_mgr->dccg, dpp_inst, dppclk_khz);

	}

}

}



void dcn20_update_clocks_update_dentist(struct clk_mgr_internal *clk_mgr)

{

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ void dccg2_update_dpp_dto(struct dccg *dccg, int dpp_inst, int req_dppclk) 
		REG_UPDATE(DPPCLK_DTO_CTRL,

				DPPCLK_DTO_ENABLE[dpp_inst], 0);

	}



	dccg->pipe_dppclk_khz[dpp_inst] = req_dppclk;

}



void dccg2_get_dccg_ref_freq(struct dccg *dccg,

drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h

+2 −1
Original line number Diff line number Diff line
@@ -27,11 +27,12 @@ 
#define __DAL_DCCG_H__



#include "dc_types.h"

#include "hw_shared.h"



struct dccg {

	struct dc_context *ctx;

	const struct dccg_funcs *funcs;



	int pipe_dppclk_khz[MAX_PIPES];

	int ref_dppclk;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE