update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/gpu/drm/armada/armada_overlay.c
..
..
@@ -4,6 +4,8 @@
4
4
  *  Rewritten from the dovefb driver, and Armada510 manuals.
5
5
  */
6
6
 
7
+#include <linux/bitfield.h>
8
+
7
9
 #include <drm/armada_drm.h>
8
10
 #include <drm/drm_atomic.h>
9
11
 #include <drm/drm_atomic_helper.h>
..
..
@@ -446,8 +448,8 @@
446
448
 			     drm_to_overlay_state(state)->colorkey_ug,
447
449
 			     drm_to_overlay_state(state)->colorkey_vb, 0);
448
450
 	} else if (property == priv->colorkey_mode_prop) {
449
-		*val = (drm_to_overlay_state(state)->colorkey_mode &
450
-			CFG_CKMODE_MASK) >> ffs(CFG_CKMODE_MASK);
451
+		*val = FIELD_GET(CFG_CKMODE_MASK,
452
+				 drm_to_overlay_state(state)->colorkey_mode);
451
453
 	} else if (property == priv->brightness_prop) {
452
454
 		*val = drm_to_overlay_state(state)->brightness + 256;
453
455
 	} else if (property == priv->contrast_prop) {