update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

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