linux (Rockchip): patches upstreamed in 5.15

projects/Rockchip/patches/linux/default/linux-2001-v4l-wip-rkvdec-hevc.patch

@@ -189,56 +189,6 @@ index 53c0038c792b..0e5c4a2eecff 100644
  #define V4L2_CID_CODEC_HANTRO_BASE				(V4L2_CTRL_CLASS_CODEC | 0x1200)
  /*
 
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jernej Skrabec <jernej.skrabec@gmail.com>
-Date: Sun, 6 Jun 2021 10:23:13 +0200
-Subject: [PATCH] media: hevc: Add segment address field
-
-If HEVC frame consists of multiple slices, segment address has to be
-known in order to properly decode it.
-
-Add segment address field to slice parameters.
-
-Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
-Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
-Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
----
- Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst | 3 +++
- include/media/hevc-ctrls.h                                | 3 ++-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
-index dc08368d62fe..9b25674fcd40 100644
---- a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
-+++ b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
-@@ -3000,6 +3000,9 @@ enum v4l2_mpeg_video_hevc_size_of_length_field -
-     * - __u8
-       - ``pic_struct``
-       -
-+    * - __u32
-+      - ``slice_segment_addr``
-+      -
-     * - __u8
-       - ``ref_idx_l0[V4L2_HEVC_DPB_ENTRIES_NUM_MAX]``
-       - The list of L0 reference elements as indices in the DPB.
-diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h
-index 0e5c4a2eecff..ef63bc205756 100644
---- a/include/media/hevc-ctrls.h
-+++ b/include/media/hevc-ctrls.h
-@@ -198,10 +198,11 @@ struct v4l2_ctrl_hevc_slice_params {
- 	__u8	pic_struct;
- 
- 	/* ISO/IEC 23008-2, ITU-T Rec. H.265: General slice segment header */
-+	__u32	slice_segment_addr;
- 	__u8	ref_idx_l0[V4L2_HEVC_DPB_ENTRIES_NUM_MAX];
- 	__u8	ref_idx_l1[V4L2_HEVC_DPB_ENTRIES_NUM_MAX];
- 
--	__u8	padding[5];
-+	__u8	padding;
- 
- 	/* ISO/IEC 23008-2, ITU-T Rec. H.265: Weighted prediction parameter */
- 	struct v4l2_hevc_pred_weight_table pred_weight_table;
-
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 23 May 2020 15:03:46 +0000