Commit 9af68235 authored by Yiling Chen's avatar Yiling Chen Committed by Alex Deucher
Browse files

drm/amd/display: Fix static screen event mask definition change 



[why]
The static screen event mask definition is different
betwnn DCN31 after and before.

[how]
Rename DCN30_set_static_screen_control to DCN31.

Reviewed-by: default avatarCharlene Liu <charlene.liu@amd.com>
Acked-by: default avatarTom Chung <chiahsuan.chung@amd.com>
Signed-off-by: default avatarYiling Chen <yi-ling.chen2@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ba162ae7

drivers/gpu/drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c

+0 −18
Original line number Diff line number Diff line
@@ -1164,21 +1164,3 @@ void dcn30_prepare_bandwidth(struct dc *dc, 
	if (!dc->clk_mgr->clks.fw_based_mclk_switching)

		dc_dmub_srv_p_state_delegate(dc, false, context);

}
 


void dcn30_set_static_screen_control(struct pipe_ctx **pipe_ctx,

		int num_pipes, const struct dc_static_screen_params *params)

{

	unsigned int i;

	unsigned int triggers = 0;



	if (params->triggers.surface_update)

		triggers |= 0x100;

	if (params->triggers.cursor_update)

		triggers |= 0x8;

	if (params->triggers.force_trigger)

		triggers |= 0x1;



	for (i = 0; i < num_pipes; i++)

		pipe_ctx[i]->stream_res.tg->funcs->set_static_screen_control(pipe_ctx[i]->stream_res.tg,

					triggers, params->num_frames);

}

drivers/gpu/drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.h

+0 −3
Original line number Diff line number Diff line
@@ -93,7 +93,4 @@ void dcn30_set_hubp_blank(const struct dc *dc, 
void dcn30_prepare_bandwidth(struct dc *dc,

	struct dc_state *context);



void dcn30_set_static_screen_control(struct pipe_ctx **pipe_ctx,

		int num_pipes, const struct dc_static_screen_params *params);



#endif /* __DC_HWSS_DCN30_H__ */

drivers/gpu/drm/amd/display/dc/hwss/dcn30/dcn30_init.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static const struct hw_sequencer_funcs dcn30_funcs = { 
	.update_bandwidth = dcn20_update_bandwidth,

	.set_drr = dcn10_set_drr,

	.get_position = dcn10_get_position,

	.set_static_screen_control = dcn30_set_static_screen_control,

	.set_static_screen_control = dcn10_set_static_screen_control,

	.setup_stereo = dcn10_setup_stereo,

	.set_avmute = dcn30_set_avmute,

	.log_hw_state = dcn10_log_hw_state,

drivers/gpu/drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c

+18 −0
Original line number Diff line number Diff line
@@ -617,3 +617,21 @@ void dcn31_setup_hpo_hw_control(const struct dce_hwseq *hws, bool enable) 
	if (hws->ctx->dc->debug.hpo_optimization)

		REG_UPDATE(HPO_TOP_HW_CONTROL, HPO_IO_EN, !!enable);

}



void dcn31_set_static_screen_control(struct pipe_ctx **pipe_ctx,

		int num_pipes, const struct dc_static_screen_params *params)

{

	unsigned int i;

	unsigned int triggers = 0;



	if (params->triggers.surface_update)

		triggers |= 0x100;

	if (params->triggers.cursor_update)

		triggers |= 0x8;

	if (params->triggers.force_trigger)

		triggers |= 0x1;



	for (i = 0; i < num_pipes; i++)

		pipe_ctx[i]->stream_res.tg->funcs->set_static_screen_control(pipe_ctx[i]->stream_res.tg,

					triggers, params->num_frames);

}

drivers/gpu/drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.h

+4 −0
Original line number Diff line number Diff line
@@ -56,4 +56,8 @@ bool dcn31_is_abm_supported(struct dc *dc, 
void dcn31_init_pipes(struct dc *dc, struct dc_state *context);

void dcn31_setup_hpo_hw_control(const struct dce_hwseq *hws, bool enable);



void dcn31_set_static_screen_control(struct pipe_ctx **pipe_ctx,

		int num_pipes, const struct dc_static_screen_params *params);





#endif /* __DC_HWSS_DCN31_H__ */