From 02d5841af0e433d577a87e4503aea2ff6e729a46 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 12 Jun 2025 07:48:04 +0000 Subject: [PATCH] linux (Rockchip): rkvdec_s_ctrl function is now upstream Patch as-is for HEVC does not apply https://github.com/torvalds/linux/commit/d35c64eccf3b15a38a168a8c36096b960e8fbc1d --- .../linux/default/linux-2000-v4l2-wip-rkvdec-hevc.patch | 9 --------- 1 file changed, 9 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 58b3e72e5a..4c0f91c308 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,15 +2620,6 @@ 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 -@@ -74,7 +74,7 @@ static int rkvdec_s_ctrl(struct v4l2_ctrl *ctrl) - { - struct rkvdec_ctx *ctx = container_of(ctrl->handler, struct rkvdec_ctx, ctrl_hdl); - -- if (ctrl->id == V4L2_CID_STATELESS_H264_SPS && !ctx->valid_fmt) { -+ if (!ctx->valid_fmt) { - ctx->valid_fmt = rkvdec_valid_fmt(ctx, ctrl); - if (ctx->valid_fmt) { - struct v4l2_pix_format_mplane *pix_mp; @@ -134,6 +134,62 @@ static const struct rkvdec_ctrl_desc rkvdec_h264_ctrl_descs[] = { }, };