update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/gpu/drm/vc4/vc4_hdmi.c
..
..
@@ -567,11 +567,12 @@
567
567
 		     VC4_SET_FIELD(mode->crtc_vdisplay, VC5_HDMI_VERTA_VAL));
568
568
 	u32 vertb = (VC4_SET_FIELD(mode->htotal >> (2 - pixel_rep),
569
569
 				   VC5_HDMI_VERTB_VSPO) |
570
-		     VC4_SET_FIELD(mode->crtc_vtotal - mode->crtc_vsync_end,
570
+		     VC4_SET_FIELD(mode->crtc_vtotal - mode->crtc_vsync_end +
571
+				   interlaced,
571
572
 				   VC4_HDMI_VERTB_VBP));
572
573
 	u32 vertb_even = (VC4_SET_FIELD(0, VC5_HDMI_VERTB_VSPO) |
573
574
 			  VC4_SET_FIELD(mode->crtc_vtotal -
574
-					mode->crtc_vsync_end - interlaced,
575
+					mode->crtc_vsync_end,
575
576
 					VC4_HDMI_VERTB_VBP));
576
577
 
577
578
 	HDMI_WRITE(HDMI_VEC_INTERFACE_XBAR, 0x354021);
..
..
@@ -1491,7 +1492,8 @@
1491
1492
 		return 0;
1492
1493
 
1493
1494
 	vc4_hdmi->cec_adap = cec_allocate_adapter(&vc4_hdmi_cec_adap_ops,
1494
-						  vc4_hdmi, "vc4",
1495
+						  vc4_hdmi,
1496
+						  vc4_hdmi->variant->card_name,
1495
1497
 						  CEC_CAP_DEFAULTS |
1496
1498
 						  CEC_CAP_CONNECTOR_INFO, 1);
1497
1499
 	ret = PTR_ERR_OR_ZERO(vc4_hdmi->cec_adap);