Commit 49c70ece authored by Alvin Lee's avatar Alvin Lee Committed by Alex Deucher
Browse files

drm/amd/display: Change input parameter for set_drr 



[Why]
Change set_drr to pass in the entire dc_crtc_timing_adjust
structure instead of passing in the parameters individually.
This is to more easily pass in required parameters in the
adjust structure when it gets updated.

Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlvin Lee <alvin.lee2@amd.com>
Reviewed-by: default avatarJun Lei <Jun.Lei@amd.com>
Acked-by: default avatarSolomon Chiu <solomon.chiu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8c1f05e2

drivers/gpu/drm/amd/display/dc/core/dc.c

+5 −5
Original line number Diff line number Diff line
@@ -304,7 +304,10 @@ bool dc_stream_adjust_vmin_vmax(struct dc *dc, 
	int i = 0;

	bool ret = false;



	stream->adjust = *adjust;

	stream->adjust.v_total_max = adjust->v_total_max;

	stream->adjust.v_total_mid = adjust->v_total_mid;

	stream->adjust.v_total_mid_frame_num = adjust->v_total_mid_frame_num;

	stream->adjust.v_total_min = adjust->v_total_min;



	for (i = 0; i < MAX_PIPES; i++) {

		struct pipe_ctx *pipe = &dc->current_state->res_ctx.pipe_ctx[i];
@@ -312,10 +315,7 @@ bool dc_stream_adjust_vmin_vmax(struct dc *dc, 
		if (pipe->stream == stream && pipe->stream_res.tg) {

			dc->hwss.set_drr(&pipe,

					1,

					adjust->v_total_min,

					adjust->v_total_max,

					adjust->v_total_mid,

					adjust->v_total_mid_frame_num);

					*adjust);



			ret = true;

		}

drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c

+4 −5
Original line number Diff line number Diff line
@@ -1846,8 +1846,7 @@ void dce110_set_safe_displaymarks( 
 ******************************************************************************/



static void set_drr(struct pipe_ctx **pipe_ctx,

		int num_pipes, unsigned int vmin, unsigned int vmax,

		unsigned int vmid, unsigned int vmid_frame_number)

		int num_pipes, struct dc_crtc_timing_adjust adjust)

{

	int i = 0;

	struct drr_params params = {0};
@@ -1856,8 +1855,8 @@ static void set_drr(struct pipe_ctx **pipe_ctx, 
	// Note DRR trigger events are generated regardless of whether num frames met.

	unsigned int num_frames = 2;



	params.vertical_total_max = vmax;

	params.vertical_total_min = vmin;

	params.vertical_total_max = adjust.v_total_max;

	params.vertical_total_min = adjust.v_total_min;



	/* TODO: If multiple pipes are to be supported, you need

	 * some GSL stuff. Static screen triggers may be programmed differently
@@ -1867,7 +1866,7 @@ static void set_drr(struct pipe_ctx **pipe_ctx, 
		pipe_ctx[i]->stream_res.tg->funcs->set_drr(

			pipe_ctx[i]->stream_res.tg, &params);



		if (vmax != 0 && vmin != 0)

		if (adjust.v_total_max != 0 && adjust.v_total_min != 0)

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

					pipe_ctx[i]->stream_res.tg,

					event_triggers, num_frames);

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c

+6 −8
Original line number Diff line number Diff line
@@ -3271,8 +3271,7 @@ void dcn10_optimize_bandwidth( 
}



void dcn10_set_drr(struct pipe_ctx **pipe_ctx,

		int num_pipes, unsigned int vmin, unsigned int vmax,

		unsigned int vmid, unsigned int vmid_frame_number)

		int num_pipes, struct dc_crtc_timing_adjust adjust)

{

	int i = 0;

	struct drr_params params = {0};
@@ -3281,11 +3280,10 @@ void dcn10_set_drr(struct pipe_ctx **pipe_ctx, 
	// Note DRR trigger events are generated regardless of whether num frames met.

	unsigned int num_frames = 2;



	params.vertical_total_max = vmax;

	params.vertical_total_min = vmin;

	params.vertical_total_mid = vmid;

	params.vertical_total_mid_frame_num = vmid_frame_number;



	params.vertical_total_max = adjust.v_total_max;

	params.vertical_total_min = adjust.v_total_min;

	params.vertical_total_mid = adjust.v_total_mid;

	params.vertical_total_mid_frame_num = adjust.v_total_mid_frame_num;

	/* TODO: If multiple pipes are to be supported, you need

	 * some GSL stuff. Static screen triggers may be programmed differently

	 * as well.
@@ -3293,7 +3291,7 @@ void dcn10_set_drr(struct pipe_ctx **pipe_ctx, 
	for (i = 0; i < num_pipes; i++) {

		pipe_ctx[i]->stream_res.tg->funcs->set_drr(

			pipe_ctx[i]->stream_res.tg, &params);

		if (vmax != 0 && vmin != 0)

		if (adjust.v_total_max != 0 && adjust.v_total_min != 0)

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

					pipe_ctx[i]->stream_res.tg,

					event_triggers, num_frames);

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h

+1 −2
Original line number Diff line number Diff line
@@ -145,8 +145,7 @@ bool dcn10_dummy_display_power_gating( 
		struct dc_bios *dcb,

		enum pipe_gating_control power_gating);

void dcn10_set_drr(struct pipe_ctx **pipe_ctx,

		int num_pipes, unsigned int vmin, unsigned int vmax,

		unsigned int vmid, unsigned int vmid_frame_number);

		int num_pipes, struct dc_crtc_timing_adjust adjust);

void dcn10_get_position(struct pipe_ctx **pipe_ctx,

		int num_pipes,

		struct crtc_position *position);

drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h

+1 −2
Original line number Diff line number Diff line
@@ -118,8 +118,7 @@ struct hw_sequencer_funcs { 
			struct pipe_ctx *pipe_ctx,

			enum vline_select vline);

	void (*set_drr)(struct pipe_ctx **pipe_ctx, int num_pipes,

			unsigned int vmin, unsigned int vmax,

			unsigned int vmid, unsigned int vmid_frame_number);

			struct dc_crtc_timing_adjust adjust);

	void (*set_static_screen_control)(struct pipe_ctx **pipe_ctx,

			int num_pipes,

			const struct dc_static_screen_params *events);