linux (Rockchip): patches upstreamed in 5.10.50

projects/Rockchip/patches/linux/default/linux-2000-v4l-wip-rkvdec-vp9.patch

@@ -1,41 +1,3 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ezequiel Garcia <ezequiel@collabora.com>
-Date: Mon, 2 Nov 2020 21:05:49 +0200
-Subject: [PATCH] media: rkvdec: Fix .buf_prepare
-
-The driver should only set the payload on .buf_prepare if the
-buffer is CAPTURE type. If an OUTPUT buffer has a zero bytesused
-set by userspace then v4l2-core will set it to buffer length.
-
-Fixes: cd33c830448ba ("media: rkvdec: Add the rkvdec driver")
-Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
-Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com>
----
- drivers/staging/media/rkvdec/rkvdec.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c
-index 4111155d62f4..c4e0ec16c285 100644
---- a/drivers/staging/media/rkvdec/rkvdec.c
-+++ b/drivers/staging/media/rkvdec/rkvdec.c
-@@ -546,7 +546,15 @@ static int rkvdec_buf_prepare(struct vb2_buffer *vb)
- 		if (vb2_plane_size(vb, i) < sizeimage)
- 			return -EINVAL;
- 	}
--	vb2_set_plane_payload(vb, 0, f->fmt.pix_mp.plane_fmt[0].sizeimage);
-+
-+	/*
-+	 * Buffer bytesused is written by driver for CAPTURE buffers.
-+	 * (if userspace passes 0 bytesused for OUTPUT buffers, v4l2-core sets
-+	 * it to buffer length).
-+	 */
-+	if (!V4L2_TYPE_IS_OUTPUT(vq->type))
-+		vb2_set_plane_payload(vb, 0, f->fmt.pix_mp.plane_fmt[0].sizeimage);
-+
- 	return 0;
- }
- 
-
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Boris Brezillon <boris.brezillon@collabora.com>
 Date: Mon, 2 Nov 2020 21:05:50 +0200

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

@@ -2464,7 +2464,7 @@ index 000000000000..03ba848411c6
 +	/* write pps */
 +	WRITE_PPS(pps->pic_parameter_set_id, PIC_PARAMETER_SET_ID);
 +	WRITE_PPS(sps->seq_parameter_set_id, PPS_SEQ_PARAMETER_SET_ID);
-+	WRITE_PPS(!!(pps->flags & V4L2_HEVC_PPS_FLAG_DEPENDENT_SLICE_SEGMENT),
++	WRITE_PPS(!!(pps->flags & V4L2_HEVC_PPS_FLAG_DEPENDENT_SLICE_SEGMENT_ENABLED),
 +		  DEPENDENT_SLICE_SEGMENTS_ENABLED_FLAG);
 +	WRITE_PPS(!!(pps->flags & V4L2_HEVC_PPS_FLAG_OUTPUT_FLAG_PRESENT),
 +		  OUTPUT_FLAG_PRESENT_FLAG);
@@ -3164,8 +3164,7 @@ Subject: [PATCH] WIP: media: rkvdec: hevc: implement lowdelay
 Signed-off-by: Alex Bee <knaerzche@gmail.com>
 ---
  drivers/staging/media/rkvdec/rkvdec-hevc.c | 16 ++++++++++++++--
- include/media/hevc-ctrls.h                 |  1 +
+ 1 files changed, 14 insertions(+), 2 deletions(-)
- 2 files changed, 15 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/staging/media/rkvdec/rkvdec-hevc.c b/drivers/staging/media/rkvdec/rkvdec-hevc.c
 index 93b4e09e5bf1..8a94fc04980f 100644
@@ -3208,19 +3207,6 @@ index 93b4e09e5bf1..8a94fc04980f 100644
  
  		WRITE_RPS(sl_params->long_term_ref_pic_set_size +
  			  sl_params->short_term_ref_pic_set_size,
-diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h
-index b33e1a8141e1..bda0ea61f331 100644
---- a/include/media/hevc-ctrls.h
-+++ b/include/media/hevc-ctrls.h
-@@ -168,6 +168,7 @@ struct v4l2_hevc_pred_weight_table {
- #define V4L2_HEVC_SLICE_PARAMS_FLAG_USE_INTEGER_MV		(1ULL << 6)
- #define V4L2_HEVC_SLICE_PARAMS_FLAG_SLICE_DEBLOCKING_FILTER_DISABLED (1ULL << 7)
- #define V4L2_HEVC_SLICE_PARAMS_FLAG_SLICE_LOOP_FILTER_ACROSS_SLICES_ENABLED (1ULL << 8)
-+#define V4L2_HEVC_SLICE_PARAMS_FLAG_DEPENDENT_SLICE_SEGMENT   (1ULL << 9)
- 
- struct v4l2_ctrl_hevc_slice_params {
- 	__u32	bit_size;
-
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Alex Bee <knaerzche@gmail.com>
 Date: Sat, 30 Jan 2021 18:16:39 +0100