update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.c
..
..
@@ -3975,17 +3975,17 @@
3975
3975
 					mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine = mode_lib->vba.PixelClock[k] / 2
3976
3976
 							* (1 + mode_lib->vba.DISPCLKDPPCLKDSCCLKDownSpreading / 100.0);
3977
3977
 
3978
-				locals->ODMCombineEnablePerState[i][k] = false;
3978
+				locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_disabled;
3979
3979
 				mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithoutODMCombine;
3980
3980
 				if (mode_lib->vba.ODMCapability) {
3981
3981
 					if (locals->PlaneRequiredDISPCLKWithoutODMCombine > MaxMaxDispclkRoundedDown) {
3982
-						locals->ODMCombineEnablePerState[i][k] = true;
3982
+						locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1;
3983
3983
 						mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine;
3984
3984
 					} else if (locals->DSCEnabled[k] && (locals->HActive[k] > DCN21_MAX_DSC_IMAGE_WIDTH)) {
3985
-						locals->ODMCombineEnablePerState[i][k] = true;
3985
+						locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1;
3986
3986
 						mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine;
3987
3987
 					} else if (locals->HActive[k] > DCN21_MAX_420_IMAGE_WIDTH && locals->OutputFormat[k] == dm_420) {
3988
-						locals->ODMCombineEnablePerState[i][k] = true;
3988
+						locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1;
3989
3989
 						mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine;
3990
3990
 					}
3991
3991
 				}
..
..
@@ -4038,7 +4038,7 @@
4038
4038
 				locals->RequiredDISPCLK[i][j] = 0.0;
4039
4039
 				locals->DISPCLK_DPPCLK_Support[i][j] = true;
4040
4040
 				for (k = 0; k <= mode_lib->vba.NumberOfActivePlanes - 1; k++) {
4041
-					locals->ODMCombineEnablePerState[i][k] = false;
4041
+					locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_disabled;
4042
4042
 					if (locals->SwathWidthYSingleDPP[k] <= locals->MaximumSwathWidth[k]) {
4043
4043
 						locals->NoOfDPP[i][j][k] = 1;
4044
4044
 						locals->RequiredDPPCLK[i][j][k] = locals->MinDPPCLKUsingSingleDPP[k]
..
..
@@ -5213,7 +5213,7 @@
5213
5213
 			mode_lib->vba.ODMCombineEnabled[k] =
5214
5214
 					locals->ODMCombineEnablePerState[mode_lib->vba.VoltageLevel][k];
5215
5215
 		} else {
5216
-			mode_lib->vba.ODMCombineEnabled[k] = false;
5216
+			mode_lib->vba.ODMCombineEnabled[k] = dm_odm_combine_mode_disabled;
5217
5217
 		}
5218
5218
 		mode_lib->vba.DSCEnabled[k] =
5219
5219
 				locals->RequiresDSC[mode_lib->vba.VoltageLevel][k];