diff --git a/patch/kernel/archive/rockchip64-5.10/general-rkvdec_nv15.patch b/patch/kernel/archive/rockchip64-5.10/general-rkvdec_nv15.patch index 33a18dd365..d89d01e3d1 100644 --- a/patch/kernel/archive/rockchip64-5.10/general-rkvdec_nv15.patch +++ b/patch/kernel/archive/rockchip64-5.10/general-rkvdec_nv15.patch @@ -173,45 +173,6 @@ index 3498e9eec3d8..6576b4a101ae 100644 -- 2.25.1 - -From c1cb24d82d654583f9b716f8385254d61223aa03 Mon Sep 17 00:00:00 2001 -From: Jonas Karlman -Date: Mon, 6 Jul 2020 21:54:35 +0000 -Subject: [PATCH 08/18] media: rkvdec: h264: Do not override output buffer - sizeimage - -The output buffer sizeimage is currently forced to 2 bytes per pixel, this -can lead to high memory usage for 4K content when multiple output buffers -is created by userspace. - -Do not override output buffer sizeimage and let userspace have control of -output buffer sizeimage by only setting sizeimage if none is provided. - -Signed-off-by: Jonas Karlman ---- - drivers/staging/media/rkvdec/rkvdec-h264.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/drivers/staging/media/rkvdec/rkvdec-h264.c b/drivers/staging/media/rkvdec/rkvdec-h264.c -index 6576b4a101ae..3a85545bcb38 100644 ---- a/drivers/staging/media/rkvdec/rkvdec-h264.c -+++ b/drivers/staging/media/rkvdec/rkvdec-h264.c -@@ -1012,8 +1012,9 @@ static int rkvdec_h264_adjust_fmt(struct rkvdec_ctx *ctx, - struct v4l2_pix_format_mplane *fmt = &f->fmt.pix_mp; - - fmt->num_planes = 1; -- fmt->plane_fmt[0].sizeimage = fmt->width * fmt->height * -- RKVDEC_H264_MAX_DEPTH_IN_BYTES; -+ if (!fmt->plane_fmt[0].sizeimage) -+ fmt->plane_fmt[0].sizeimage = fmt->width * fmt->height * -+ RKVDEC_H264_MAX_DEPTH_IN_BYTES; - return 0; - } - --- -2.25.1 - - From 1f381d3ddd88174c12846ba93ddd7deb47089a8e Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Mon, 6 Jul 2020 21:54:35 +0000 diff --git a/patch/kernel/archive/rockchip64-5.10/rk3328-fix-mali-node.patch b/patch/kernel/archive/rockchip64-5.10/rk3328-fix-mali-node.patch deleted file mode 100644 index beb707d170..0000000000 --- a/patch/kernel/archive/rockchip64-5.10/rk3328-fix-mali-node.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -index bbdb19a3e..f623d5fd9 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -@@ -603,7 +603,7 @@ - - gpu: gpu@ff300000 { - compatible = "rockchip,rk3328-mali", "arm,mali-450"; -- reg = <0x0 0xff300000 0x0 0x40000>; -+ reg = <0x0 0xff300000 0x0 0x30000>; - interrupts = , - , - ,