update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * drivers/media/platform/samsung/mfc5/s5p_mfc_opr_v5.c
3
4
  *
..
..
@@ -6,10 +7,6 @@
6
7
  *
7
8
  * Kamil Debski, Copyright (c) 2011 Samsung Electronics
8
9
  * http://www.samsung.com/
9
- *
10
- * This program is free software; you can redistribute it and/or modify
11
- * it under the terms of the GNU General Public License version 2 as
12
- * published by the Free Software Foundation.
13
10
  */
14
11
 
15
12
 #include "s5p_mfc_common.h"
..
..
@@ -695,9 +692,9 @@
695
692
 	/* multi-slice control */
696
693
 	/* multi-slice MB number or bit size */
697
694
 	mfc_write(dev, p->slice_mode, S5P_FIMV_ENC_MSLICE_CTRL);
698
-	if (p->slice_mode == V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB) {
695
+	if (p->slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB) {
699
696
 		mfc_write(dev, p->slice_mb, S5P_FIMV_ENC_MSLICE_MB);
700
-	} else if (p->slice_mode == V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES) {
697
+	} else if (p->slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES) {
701
698
 		mfc_write(dev, p->slice_bit, S5P_FIMV_ENC_MSLICE_BIT);
702
699
 	} else {
703
700
 		mfc_write(dev, 0, S5P_FIMV_ENC_MSLICE_MB);
..
..
@@ -714,7 +711,7 @@
714
711
 	reg = mfc_read(dev, S5P_FIMV_ENC_PADDING_CTRL);
715
712
 	if (p->pad) {
716
713
 		/** enable */
717
-		reg |= (1 << 31);
714
+		reg |= (1UL << 31);
718
715
 		/** cr value */
719
716
 		reg &= ~(0xFF << 16);
720
717
 		reg |= (p->pad_cr << 16);
..
..
@@ -958,7 +955,7 @@
958
955
 				S5P_FIMV_ENC_RC_FRAME_RATE);
959
956
 			shm = s5p_mfc_read_info_v5(ctx, RC_VOP_TIMING);
960
957
 			shm &= ~(0xFFFFFFFF);
961
-			shm |= (1 << 31);
958
+			shm |= (1UL << 31);
962
959
 			shm |= ((p->rc_framerate_num & 0x7FFF) << 16);
963
960
 			shm |= (p->rc_framerate_denom & 0xFFFF);
964
961
 			s5p_mfc_write_info_v5(ctx, shm, RC_VOP_TIMING);
..
..
@@ -1293,7 +1290,7 @@
1293
1290
 	 * First set the output frame buffers
1294
1291
 	 */
1295
1292
 	if (ctx->capture_state != QUEUE_BUFS_MMAPED) {
1296
-		mfc_err("It seems that not all destination buffers were mmaped\nMFC requires that all destination are mmaped before starting processing\n");
1293
+		mfc_err("It seems that not all destination buffers were mmapped\nMFC requires that all destination are mmapped before starting processing\n");
1297
1294
 		return -EAGAIN;
1298
1295
 	}
1299
1296
 	if (list_empty(&ctx->src_queue)) {