Commit 486cc0ee authored by Nikola Cornij's avatar Nikola Cornij Committed by Alex Deucher
Browse files

drm/amd/display: Add output bitrate to DML calculations 



[why]
Output bitrate was mistakenly left out, causing corruption on some
DSC low resolution (such as 800x600) modes.

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

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

+4 −1
Original line number Diff line number Diff line
@@ -1894,7 +1894,7 @@ int dcn20_populate_dml_pipes_from_context( 
			break;

		case PIXEL_ENCODING_YCBCR420:

			pipes[pipe_cnt].dout.output_format = dm_420;

			pipes[pipe_cnt].dout.output_bpp = (output_bpc * 3) / 2;

			pipes[pipe_cnt].dout.output_bpp = (output_bpc * 3.0) / 2;

			break;

		case PIXEL_ENCODING_YCBCR422:

			if (true) /* todo */
@@ -1908,6 +1908,9 @@ int dcn20_populate_dml_pipes_from_context( 
			pipes[pipe_cnt].dout.output_bpp = output_bpc * 3;

		}



		if (res_ctx->pipe_ctx[i].stream->timing.flags.DSC)

			pipes[pipe_cnt].dout.output_bpp = res_ctx->pipe_ctx[i].stream->timing.dsc_cfg.bits_per_pixel / 16.0;



		/* todo: default max for now, until there is logic reflecting this in dc*/

		pipes[pipe_cnt].dout.output_bpc = 12;

		/*

drivers/gpu/drm/amd/display/dc/dml/display_mode_structs.h

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ struct writeback_st { 


struct _vcs_dpi_display_output_params_st {

	int dp_lanes;

	int output_bpp;

	double output_bpp;

	int dsc_enable;

	int wb_enable;

	int num_active_wb;

drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c

+2 −0
Original line number Diff line number Diff line
@@ -434,6 +434,8 @@ static void fetch_pipe_params(struct display_mode_lib *mode_lib) 
				dst->odm_combine;

		mode_lib->vba.OutputFormat[mode_lib->vba.NumberOfActivePlanes] =

				(enum output_format_class) (dout->output_format);

		mode_lib->vba.OutputBpp[mode_lib->vba.NumberOfActivePlanes] =

				dout->output_bpp;

		mode_lib->vba.Output[mode_lib->vba.NumberOfActivePlanes] =

				(enum output_encoder_class) (dout->output_type);

CRA Git | Maintained and supported by SUSTech CRA and CCSE