Re: [PATCH v3 2/3] media: rkvdec: Add support for the VDPU346 variant

["Diederik de Haas" <diederik@cknow-tech.com>]

On Sun Jan 11, 2026 at 2:30 PM CET, Christian Hewitt wrote:
>> On 10 Jan 2026, at 11:35 pm, Diederik de Haas <diederik@cknow-tech.com> wrote:
>> On Sat Jan 10, 2026 at 6:37 AM CET, Christian Hewitt wrote:
>>> VDPU346 is similar to VDPU381 but with a single core and limited
>>> to 4K60 media. It is also limited to H264 L5.1 and omits AV1 and
>>> AVS2 capabilities. VDPU346 is used with RK3566 and RK3568.
>>> 
>>> Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
>>> Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
>>> Tested-by: Dang Huynh <dang.huynh@mainlining.org> # Pinetab2
>>> ---
>>> .../media/platform/rockchip/rkvdec/rkvdec.c   | 103 ++++++++++++++++++
>>> 1 file changed, 103 insertions(+)
>>> 
>>> diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.c b/drivers/media/platform/rockchip/rkvdec/rkvdec.c
>>> index a5cf6f3240f8..6e49b129d11f 100644
>>> --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c
>>> +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c
>>> @@ -236,6 +236,62 @@ static const struct rkvdec_ctrls rkvdec_hevc_ctrls = {
>>> .num_ctrls = ARRAY_SIZE(rkvdec_hevc_ctrl_descs),
>>> };
>>> 
>>> +static const struct rkvdec_ctrl_desc vdpu346_hevc_ctrl_descs[] = {
>>> + {
>>> + .cfg.id = V4L2_CID_STATELESS_HEVC_DECODE_PARAMS,
>>> + },
>>> + {
>>> + .cfg.id = V4L2_CID_STATELESS_HEVC_SPS,
>>> + .cfg.ops = &rkvdec_ctrl_ops,
>>> + },
>>> + {
>>> + .cfg.id = V4L2_CID_STATELESS_HEVC_PPS,
>>> + },
>>> + {
>>> + .cfg.id = V4L2_CID_STATELESS_HEVC_SCALING_MATRIX,
>>> + },
>>> + {
>>> + .cfg.id = V4L2_CID_STATELESS_HEVC_DECODE_MODE,
>>> + .cfg.min = V4L2_STATELESS_HEVC_DECODE_MODE_FRAME_BASED,
>>> + .cfg.max = V4L2_STATELESS_HEVC_DECODE_MODE_FRAME_BASED,
>>> + .cfg.def = V4L2_STATELESS_HEVC_DECODE_MODE_FRAME_BASED,
>>> + },
>>> + {
>>> + .cfg.id = V4L2_CID_STATELESS_HEVC_START_CODE,
>>> + .cfg.min = V4L2_STATELESS_HEVC_START_CODE_ANNEX_B,
>>> + .cfg.def = V4L2_STATELESS_HEVC_START_CODE_ANNEX_B,
>>> + .cfg.max = V4L2_STATELESS_HEVC_START_CODE_ANNEX_B,
>>> + },
>>> + {
>>> + .cfg.id = V4L2_CID_MPEG_VIDEO_HEVC_PROFILE,
>>> + .cfg.min = V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN,
>>> + .cfg.max = V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10,
>>> + .cfg.menu_skip_mask =
>>> + BIT(V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_STILL_PICTURE),
>>> + .cfg.def = V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN,
>>> + },
>>> + {
>>> + .cfg.id = V4L2_CID_MPEG_VIDEO_HEVC_LEVEL,
>>> + .cfg.min = V4L2_MPEG_VIDEO_HEVC_LEVEL_1,
>>> + .cfg.max = V4L2_MPEG_VIDEO_HEVC_LEVEL_5_1,
>>> + },
>>> + {
>>> + .cfg.id = V4L2_CID_STATELESS_HEVC_EXT_SPS_ST_RPS,
>>> + .cfg.ops = &rkvdec_ctrl_ops,
>>> + .cfg.dims = { 65 },
>>> + },
>>> + {
>>> + .cfg.id = V4L2_CID_STATELESS_HEVC_EXT_SPS_LT_RPS,
>>> + .cfg.ops = &rkvdec_ctrl_ops,
>>> + .cfg.dims = { 65 },
>>> + },
>>> +};
>>> +
>>> +static const struct rkvdec_ctrls vdpu346_hevc_ctrls = {
>>> + .ctrls = vdpu346_hevc_ctrl_descs,
>>> + .num_ctrls = ARRAY_SIZE(vdpu346_hevc_ctrl_descs),
>>> +};
>>> +
>>> static const struct rkvdec_ctrl_desc vdpu38x_hevc_ctrl_descs[] = {
>>> {
>>> .cfg.id = V4L2_CID_STATELESS_HEVC_DECODE_PARAMS,
>>> @@ -463,6 +519,41 @@ static const struct rkvdec_coded_fmt_desc rk3288_coded_fmts[] = {
>>> }
>>> };
>>> 
>>> +static const struct rkvdec_coded_fmt_desc vdpu346_coded_fmts[] = {
>>> + {
>>> + .fourcc = V4L2_PIX_FMT_HEVC_SLICE,
>>> + .frmsize = {
>>> + .min_width = 64,
>>> + .max_width = 4096,
>>> + .step_width = 64,
>>> + .min_height = 64,
>>> + .max_height = 2304,
>>> + .step_height = 16,
>>> + },
>>> + .ctrls = &vdpu346_hevc_ctrls,
>>> + .ops = &rkvdec_vdpu381_hevc_fmt_ops,
>>> + .num_decoded_fmts = ARRAY_SIZE(rkvdec_hevc_decoded_fmts),
>>> + .decoded_fmts = rkvdec_hevc_decoded_fmts,
>>> + .subsystem_flags = VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF,
>>> + },
>>> + {
>>> + .fourcc = V4L2_PIX_FMT_H264_SLICE,
>>> + .frmsize = {
>>> + .min_width = 64,
>>> + .max_width =  4096,
>>> + .step_width = 64,
>>> + .min_height = 64,
>>> + .max_height =  2304,
>>> + .step_height = 16,
>>> + },
>>> + .ctrls = &rkvdec_h264_ctrls,
>>> + .ops = &rkvdec_vdpu381_h264_fmt_ops,
>>> + .num_decoded_fmts = ARRAY_SIZE(rkvdec_h264_decoded_fmts),
>>> + .decoded_fmts = rkvdec_h264_decoded_fmts,
>>> + .subsystem_flags = VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF,
>>> + },
>>> +};
>>> +
>>> static const struct rkvdec_coded_fmt_desc vdpu381_coded_fmts[] = {
>>> {
>>> .fourcc = V4L2_PIX_FMT_HEVC_SLICE,
>>> @@ -1657,6 +1748,14 @@ static const struct rkvdec_variant_ops vdpu381_variant_ops = {
>>> .flatten_matrices = transpose_and_flatten_matrices,
>>> };
>>> 
>>> +static const struct rkvdec_variant vdpu346_variant = {
>>> + .coded_fmts = vdpu346_coded_fmts,
>>> + .num_coded_fmts = ARRAY_SIZE(vdpu346_coded_fmts),
>>> + .rcb_sizes = vdpu381_rcb_sizes,
>> 
>> AFAICT this is not correct, the rcb_sizes are different for vdpu346 vs
>> vdpu381. While for vdpu381 the sizes are the same across codecs, they
>> vary for vdpu346. And vdpu346 does not have 'STRMD Row', 'Transd Row'
>> and 'Transd col'.
>> 
>> For RK3588/vdpu381 it is defined in RK3588 TRM V1.0 Part1 in
>> paragraph 5.4.4.3 in 'Table 5-13 Row or Col buffer size required' on
>> page 381.
>> 
>> For RK3568/vdpu346 is is defines in RK3568 TRM V1.1 Part2 in
>> paragraph 10.4.8 in 'Table 10-9 Row or Col buffer size required' on page
>> 474 and 475.
>
> This is what I’m hinting/referring to in the cover-letter. How
> to correctly handle the differences in code is currently beyond
> my n00b level comprehension of c and coding skills. I’ll need to
> ask the audience for some assistance and coaching :)

Sorry, I should've been (more) clear that this remark was meant as a
'research note', to further improve support for RK3568.

And I forgot to mention that with Detlev's v8 series and your patch set,
all my test videos, except 4K, now play without any (visual) artifacts.
\o/

I still want to do more/further tests and wait till Detlev's series get
accepted, before giving my Tested-by tag.

Cheers,
  Diederik

> Christian
>
>>> + .num_rcb_sizes = ARRAY_SIZE(vdpu381_rcb_sizes),
>>> + .ops = &vdpu381_variant_ops,
>>> +};
>>> +
>>> static const struct rkvdec_variant vdpu381_variant = {
>>> .coded_fmts = vdpu381_coded_fmts,
>>> .num_coded_fmts = ARRAY_SIZE(vdpu381_coded_fmts),
>>> @@ -1705,6 +1804,10 @@ static const struct of_device_id of_rkvdec_match[] = {
>>> .compatible = "rockchip,rk3399-vdec",
>>> .data = &rk3399_rkvdec_variant,
>>> },
>>> + {
>>> + .compatible = "rockchip,rk3568-vdec",
>>> + .data = &vdpu346_variant,
>>> + },
>>> {
>>> .compatible = "rockchip,rk3588-vdec",
>>> .data = &vdpu381_variant,