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

Commit 1f332460 authored by Dmytro Laktyushkin's avatar Dmytro Laktyushkin Committed by Alex Deucher
Browse files

drm/amd/display: fix dp stream enable 



A previous odm change broke stream enable by always setting
n_multiply as if odm was on.

This fixes the check for odm by making sure opp count is >1
rather than not 0.

Signed-off-by: default avatarDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: default avatarCharlene Liu <Charlene.Liu@amd.com>
Acked-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 361c61f4

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

+2 −2
Original line number Diff line number Diff line
@@ -1581,10 +1581,10 @@ void dcn20_unblank_stream(struct pipe_ctx *pipe_ctx, 
	params.link_settings.link_rate = link_settings->link_rate;



	if (dc_is_dp_signal(pipe_ctx->stream->signal)) {

		if (optc1_is_two_pixels_per_containter(&stream->timing) || params.opp_cnt)

		if (optc1_is_two_pixels_per_containter(&stream->timing) || params.opp_cnt > 1)

			params.timing.pix_clk_100hz /= 2;

		pipe_ctx->stream_res.stream_enc->funcs->dp_set_odm_combine(

				pipe_ctx->stream_res.stream_enc, params.opp_cnt);

				pipe_ctx->stream_res.stream_enc, params.opp_cnt > 1);

		pipe_ctx->stream_res.stream_enc->funcs->dp_unblank(pipe_ctx->stream_res.stream_enc, &params);

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ void enc2_stream_encoder_dp_unblank( 
		uint64_t m_vid_l = n_vid;



		/* YCbCr 4:2:0 : Computed VID_M will be 2X the input rate */

		if (is_two_pixels_per_containter(&param->timing) || param->opp_cnt) {

		if (is_two_pixels_per_containter(&param->timing) || param->opp_cnt > 1) {

			/*this logic should be the same in get_pixel_clock_parameters() */

			n_multiply = 1;

		}