update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c
..
..
@@ -3897,14 +3897,14 @@
3897
3897
 					mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine = mode_lib->vba.PixelClock[k] / 2
3898
3898
 							* (1 + mode_lib->vba.DISPCLKDPPCLKDSCCLKDownSpreading / 100.0);
3899
3899
 
3900
-				locals->ODMCombineEnablePerState[i][k] = false;
3900
+				locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_disabled;
3901
3901
 				mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithoutODMCombine;
3902
3902
 				if (mode_lib->vba.ODMCapability) {
3903
3903
 					if (locals->PlaneRequiredDISPCLKWithoutODMCombine > mode_lib->vba.MaxDispclkRoundedDownToDFSGranularity) {
3904
-						locals->ODMCombineEnablePerState[i][k] = true;
3904
+						locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1;
3905
3905
 						mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine;
3906
3906
 					} else if (locals->HActive[k] > DCN20_MAX_420_IMAGE_WIDTH && locals->OutputFormat[k] == dm_420) {
3907
-						locals->ODMCombineEnablePerState[i][k] = true;
3907
+						locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1;
3908
3908
 						mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine;
3909
3909
 					}
3910
3910
 				}
..
..
@@ -3957,7 +3957,7 @@
3957
3957
 				locals->RequiredDISPCLK[i][j] = 0.0;
3958
3958
 				locals->DISPCLK_DPPCLK_Support[i][j] = true;
3959
3959
 				for (k = 0; k <= mode_lib->vba.NumberOfActivePlanes - 1; k++) {
3960
-					locals->ODMCombineEnablePerState[i][k] = false;
3960
+					locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_disabled;
3961
3961
 					if (locals->SwathWidthYSingleDPP[k] <= locals->MaximumSwathWidth[k]) {
3962
3962
 						locals->NoOfDPP[i][j][k] = 1;
3963
3963
 						locals->RequiredDPPCLK[i][j][k] = locals->MinDPPCLKUsingSingleDPP[k]