Commit 572200db authored by Taimur Hassan's avatar Taimur Hassan Committed by Alex Deucher
Browse files

drm/amd/display: Set ODM policy based on number of DSC slices 



[Why & How]
Add addtional check in CalculateODMMode for cases where the ODM combine
is needed due to number of DSC slices.

Reviewed-by: default avatarAlvin Lee <alvin.lee2@amd.com>
Acked-by: default avatarBrian Chang <Brian.Chang@amd.com>
Signed-off-by: default avatarTaimur Hassan <Syed.Hassan@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 62f6b0dc

drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c

+2 −0
Original line number Diff line number Diff line
@@ -2045,6 +2045,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l 
						mode_lib->vba.DISPCLKDPPCLKDSCCLKDownSpreading,

						mode_lib->vba.DISPCLKRampingMargin,

						mode_lib->vba.DISPCLKDPPCLKVCOSpeed,

						mode_lib->vba.NumberOfDSCSlices[k],



						/* Output */

						&v->dummy_vars.dml32_ModeSupportAndSystemConfigurationFull.TotalAvailablePipesSupportNoDSC,
@@ -2066,6 +2067,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l 
						mode_lib->vba.DISPCLKDPPCLKDSCCLKDownSpreading,

						mode_lib->vba.DISPCLKRampingMargin,

						mode_lib->vba.DISPCLKDPPCLKVCOSpeed,

						mode_lib->vba.NumberOfDSCSlices[k],



						/* Output */

						&v->dummy_vars.dml32_ModeSupportAndSystemConfigurationFull.TotalAvailablePipesSupportDSC,

drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_util_32.c

+5 −2
Original line number Diff line number Diff line
@@ -1193,6 +1193,7 @@ void dml32_CalculateODMMode( 
		double DISPCLKDPPCLKDSCCLKDownSpreading,

		double DISPCLKRampingMargin,

		double DISPCLKDPPCLKVCOSpeed,

		unsigned int NumberOfDSCSlices,



		/* Output */

		bool *TotalAvailablePipesSupport,
@@ -1228,7 +1229,8 @@ void dml32_CalculateODMMode( 


	if (!(Output == dm_hdmi || Output == dm_dp || Output == dm_edp) && (ODMUse == dm_odm_combine_policy_4to1 ||

			((SurfaceRequiredDISPCLKWithODMCombineTwoToOne > StateDispclk ||

					(DSCEnable && (HActive > 2 * MaximumPixelsPerLinePerDSCUnit)))))) {

					(DSCEnable && (HActive > 2 * MaximumPixelsPerLinePerDSCUnit))

					|| NumberOfDSCSlices > 8)))) {

		if (TotalNumberOfActiveDPP + 4 <= MaxNumDPP) {

			*ODMMode = dm_odm_combine_mode_4to1;

			*RequiredDISPCLKPerSurface = SurfaceRequiredDISPCLKWithODMCombineFourToOne;
@@ -1239,7 +1241,8 @@ void dml32_CalculateODMMode( 
	} else if (Output != dm_hdmi && (ODMUse == dm_odm_combine_policy_2to1 ||

			(((SurfaceRequiredDISPCLKWithoutODMCombine > StateDispclk &&

					SurfaceRequiredDISPCLKWithODMCombineTwoToOne <= StateDispclk) ||

					(DSCEnable && (HActive > MaximumPixelsPerLinePerDSCUnit)))))) {

					(DSCEnable && (HActive > MaximumPixelsPerLinePerDSCUnit))

					|| (NumberOfDSCSlices <= 8 && NumberOfDSCSlices > 4))))) {

		if (TotalNumberOfActiveDPP + 2 <= MaxNumDPP) {

			*ODMMode = dm_odm_combine_mode_2to1;

			*RequiredDISPCLKPerSurface = SurfaceRequiredDISPCLKWithODMCombineTwoToOne;

drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_util_32.h

+1 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ void dml32_CalculateODMMode( 
		double DISPCLKDPPCLKDSCCLKDownSpreading,

		double DISPCLKRampingMargin,

		double DISPCLKDPPCLKVCOSpeed,

		unsigned int NumberOfDSCSlices,



		/* Output */

		bool *TotalAvailablePipesSupport,