Commit 5e908012 authored by Chris Park's avatar Chris Park Committed by Alex Deucher
Browse files

drm/amd/display: Allow 4 split on 10K 420 modes 



[Why]
10K YCbCr420 does not need ODM 4:1, but it requires MPC 4 split
indicated on the flags.

[How]
Make pixel encoding and resolution size specific workaround to enable
ODM combine on YCbCr420 high resolution modes.

Signed-off-by: default avatarChris Park <Chris.Park@amd.com>
Reviewed-by: default avatarCharlene Liu <Charlene.Liu@amd.com>
Acked-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7715fdf3

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

+5 −0
Original line number Diff line number Diff line
@@ -2745,6 +2745,11 @@ int dcn20_validate_apply_pipe_split_flags( 
			split[i] = 4;

			v->ODMCombineEnablePerState[vlevel][pipe_plane] = dm_odm_combine_mode_4to1;

		}

		/*420 format workaround*/

		if (pipe->stream->timing.h_addressable > 7680 &&

				pipe->stream->timing.pixel_encoding == PIXEL_ENCODING_YCBCR420) {

			split[i] = 4;

		}

#endif

		v->ODMCombineEnabled[pipe_plane] =

			v->ODMCombineEnablePerState[vlevel][pipe_plane];

drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c

+0 −5
Original line number Diff line number Diff line
@@ -3986,11 +3986,6 @@ void dml30_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l 
				} else if (v->PlaneRequiredDISPCLKWithoutODMCombine > v->MaxDispclkRoundedDownToDFSGranularity) {

					v->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1;

					v->PlaneRequiredDISPCLK = v->PlaneRequiredDISPCLKWithODMCombine2To1;

					/*420 format workaround*/

					if (v->HActive[k] > 7680 && v->OutputFormat[k] == dm_420) {

						v->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1;

						v->PlaneRequiredDISPCLK = v->PlaneRequiredDISPCLKWithODMCombine2To1;

					}

				} else {

					v->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_disabled;

					v->PlaneRequiredDISPCLK = v->PlaneRequiredDISPCLKWithoutODMCombine;

CRA Git | Maintained and supported by SUSTech CRA and CCSE