From 038d00c68814f6b15e8e26dbe9d9d2b9f3088f04 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 12 Jun 2025 12:58:53 +0000 Subject: [PATCH] linux (Rockchip): rebase patches for 6.16-rc1 media: rkvdec: Add image format concept - https://github.com/torvalds/linux/commit/774837ed8749fb58a5a4079d0750e151b1ed01a6 fixes: drivers/staging/media/rkvdec/rkvdec.c:327:33: error: initialization of 'const struct rkvdec_decoded_fmt_desc *' from incompatible pointer type 'const u32 *' {aka 'const unsigned int *'} [-Wincompatible-pointer-types] 327 | .decoded_fmts = rkvdec_hevc_decoded_fmts, | ^~~~~~~~~~~~~~~~~~~~~~~~ drivers/staging/media/rkvdec/rkvdec.c:327:33: note: (near initialization for 'rkvdec_coded_fmts[0].decoded_fmts') --- .../default/linux-2000-v4l2-wip-rkvdec-hevc.patch | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/projects/Rockchip/patches/linux/default/linux-2000-v4l2-wip-rkvdec-hevc.patch b/projects/Rockchip/patches/linux/default/linux-2000-v4l2-wip-rkvdec-hevc.patch index 4c0f91c308..aaf821f32c 100644 --- a/projects/Rockchip/patches/linux/default/linux-2000-v4l2-wip-rkvdec-hevc.patch +++ b/projects/Rockchip/patches/linux/default/linux-2000-v4l2-wip-rkvdec-hevc.patch @@ -2620,7 +2620,7 @@ diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvde index f55abb7c377f..00a9bf583596 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c -@@ -134,6 +134,62 @@ static const struct rkvdec_ctrl_desc rkvdec_h264_ctrl_descs[] = { +@@ -134,6 +134,68 @@ static const struct rkvdec_ctrl_desc rkvdec_h264_ctrl_descs[] = { }, }; @@ -2674,9 +2674,15 @@ index f55abb7c377f..00a9bf583596 100644 + .num_ctrls = ARRAY_SIZE(rkvdec_hevc_ctrl_descs), +}; + -+static const u32 rkvdec_hevc_decoded_fmts[] = { -+ V4L2_PIX_FMT_NV12, -+ V4L2_PIX_FMT_NV15, ++static const struct rkvdec_decoded_fmt_desc rkvdec_hevc_decoded_fmts[] = { ++ { ++ .fourcc = V4L2_PIX_FMT_NV12, ++ .image_fmt = RKVDEC_IMG_FMT_420_8BIT, ++ }, ++ { ++ .fourcc = V4L2_PIX_FMT_NV15, ++ .image_fmt = RKVDEC_IMG_FMT_420_10BIT, ++ }, +}; + +