Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c850b7b authored by Dmytro Laktyushkin's avatar Dmytro Laktyushkin Committed by Alex Deucher
Browse files

drm/amd/display: add n_vid_mul and half pix_rate for odm 



Dp needs half container rate to properly support odm

Signed-off-by: default avatarDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: default avatarNikola Cornij <Nikola.Cornij@amd.com>
Acked-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent fb55546e

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

+2 −2
Original line number Diff line number Diff line
@@ -1032,8 +1032,7 @@ void dce110_unblank_stream(struct pipe_ctx *pipe_ctx, 
	struct dc_link *link = stream->link;



	/* only 3 items below are used by unblank */

	params.pixel_clk_khz =

		pipe_ctx->stream->timing.pix_clk_100hz / 10;

	params.pixel_clk_khz = pipe_ctx->stream->timing.pix_clk_100hz / 10;

	params.link_settings.link_rate = link_settings->link_rate;



	if (dc_is_dp_signal(pipe_ctx->stream->signal))
@@ -1043,6 +1042,7 @@ void dce110_unblank_stream(struct pipe_ctx *pipe_ctx, 
		link->dc->hwss.edp_backlight_control(link, true);

	}

}



void dce110_blank_stream(struct pipe_ctx *pipe_ctx)

{

	struct dc_stream_state *stream = pipe_ctx->stream;

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

+5 −2
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ void optc1_program_timing( 


	h_div_2 = optc1_is_two_pixels_per_containter(&patched_crtc_timing);

	REG_UPDATE(OTG_H_TIMING_CNTL,

			OTG_H_TIMING_DIV_BY2, h_div_2);

			OTG_H_TIMING_DIV_BY2, h_div_2 || optc1->comb_opp_id != 0xf);



}
@@ -1531,10 +1531,13 @@ void dcn10_timing_generator_init(struct optc *optc1) 
	optc1->min_v_blank_interlace = 5;

	optc1->min_h_sync_width = 8;

	optc1->min_v_sync_width = 1;

	optc1->comb_opp_id = 0xf;

}



bool optc1_is_two_pixels_per_containter(const struct dc_crtc_timing *timing)

{

	return timing->pixel_encoding == PIXEL_ENCODING_YCBCR420;

	bool two_pix = timing->pixel_encoding == PIXEL_ENCODING_YCBCR420;



	return two_pix;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ struct optc { 
	const struct dcn_optc_shift *tg_shift;

	const struct dcn_optc_mask *tg_mask;



	enum controller_id controller_id;

	int comb_opp_id;



	uint32_t max_h_total;

	uint32_t max_v_total;