update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/platform/mtk-vcodec/venc_vpu_if.h
..
..
@@ -1,22 +1,13 @@
1
+/* SPDX-License-Identifier: GPL-2.0 */
1
2
 /*
2
3
  * Copyright (c) 2016 MediaTek Inc.
3
4
  * Author: PoChun Lin <pochun.lin@mediatek.com>
4
- *
5
- * This program is free software; you can redistribute it and/or
6
- * modify
7
- * it under the terms of the GNU General Public License version 2 as
8
- * published by the Free Software Foundation.
9
- *
10
- * This program is distributed in the hope that it will be useful,
11
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
12
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
- * GNU General Public License for more details.
14
5
  */
15
6
 
16
7
 #ifndef _VENC_VPU_IF_H_
17
8
 #define _VENC_VPU_IF_H_
18
9
 
19
-#include "mtk_vpu.h"
10
+#include "mtk_vcodec_fw.h"
20
11
 #include "venc_drv_if.h"
21
12
 
22
13
 /*
..
..
@@ -43,9 +34,8 @@
43
34
 	int is_key_frm;
44
35
 	unsigned int inst_addr;
45
36
 	void *vsi;
46
-	enum ipi_id id;
37
+	int id;
47
38
 	struct mtk_vcodec_ctx *ctx;
48
-	struct platform_device *dev;
49
39
 };
50
40
 
51
41
 int vpu_enc_init(struct venc_vpu_inst *vpu);
..
..
@@ -55,7 +45,8 @@
55
45
 int vpu_enc_encode(struct venc_vpu_inst *vpu, unsigned int bs_mode,
56
46
 		   struct venc_frm_buf *frm_buf,
57
47
 		   struct mtk_vcodec_mem *bs_buf,
58
-		   unsigned int *bs_size);
48
+		   unsigned int *bs_size,
49
+		   struct venc_frame_info *frame_info);
59
50
 int vpu_enc_deinit(struct venc_vpu_inst *vpu);
60
51
 
61
52
 #endif