| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <6476a0906402a5b6ea51801c7d7de1be13aa753c.camel@collabora.com>
Date: Mon, 11 Aug 2025 17:11:28 -0400
From: Nicolas Dufresne <nicolas.dufresne@...labora.com>
To: Jonas Karlman <jonas@...boo.se>, Ezequiel Garcia
<ezequiel@...guardiasur.com.ar>, Detlev Casanova
<detlev.casanova@...labora.com>, Mauro Carvalho Chehab
<mchehab@...nel.org>, Heiko Stuebner <heiko@...ech.de>
Cc: Alex Bee <knaerzche@...il.com>, Sebastian Fricke
<sebastian.fricke@...labora.com>, linux-media@...r.kernel.org,
linux-rockchip@...ts.infradead.org, devicetree@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2 2/7] media: rkvdec: Add variants support
Le dimanche 10 août 2025 à 21:24 +0000, Jonas Karlman a écrit :
> From: Alex Bee <knaerzche@...il.com>
>
> Different versions of the Rockchip VDEC IP exists and one way they can
> differ is what decoding formats are supported.
>
> Add a variant implementation in order to support flagging different
> capabilities.
>
> Signed-off-by: Alex Bee <knaerzche@...il.com>
> Signed-off-by: Jonas Karlman <jonas@...boo.se>
> ---
> Changes in v2:
> - No change
> ---
> .../media/platform/rockchip/rkvdec/rkvdec.c | 21 ++++++++++++++++++-
> .../media/platform/rockchip/rkvdec/rkvdec.h | 10 +++++++++
> 2 files changed, 30 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.c
> b/drivers/media/platform/rockchip/rkvdec/rkvdec.c
> index cfb326600a2d..e7b9dfc2d1ab 100644
> --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c
> +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c
> @@ -14,6 +14,7 @@
> #include <linux/iommu.h>
> #include <linux/module.h>
> #include <linux/of.h>
> +#include <linux/of_device.h>
> #include <linux/platform_device.h>
> #include <linux/pm.h>
> #include <linux/pm_runtime.h>
> @@ -327,6 +328,7 @@ static const struct rkvdec_coded_fmt_desc
> rkvdec_coded_fmts[] = {
> .ops = &rkvdec_hevc_fmt_ops,
> .num_decoded_fmts = ARRAY_SIZE(rkvdec_hevc_decoded_fmts),
> .decoded_fmts = rkvdec_hevc_decoded_fmts,
> + .capability = RKVDEC_CAPABILITY_HEVC,
> },
> {
> .fourcc = V4L2_PIX_FMT_H264_SLICE,
> @@ -343,6 +345,7 @@ static const struct rkvdec_coded_fmt_desc
> rkvdec_coded_fmts[] = {
> .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,
> + .capability = RKVDEC_CAPABILITY_H264,
> },
> {
> .fourcc = V4L2_PIX_FMT_VP9_FRAME,
> @@ -358,6 +361,7 @@ static const struct rkvdec_coded_fmt_desc
> rkvdec_coded_fmts[] = {
> .ops = &rkvdec_vp9_fmt_ops,
> .num_decoded_fmts = ARRAY_SIZE(rkvdec_vp9_decoded_fmts),
> .decoded_fmts = rkvdec_vp9_decoded_fmts,
> + .capability = RKVDEC_CAPABILITY_VP9,
> }
> };
>
> @@ -1187,8 +1191,17 @@ static void rkvdec_watchdog_func(struct work_struct
> *work)
> }
> }
>
> +static const struct rkvdec_variant rk3399_rkvdec_variant = {
> + .capabilities = RKVDEC_CAPABILITY_HEVC |
> + RKVDEC_CAPABILITY_H264 |
> + RKVDEC_CAPABILITY_VP9,
> +};
> +
> static const struct of_device_id of_rkvdec_match[] = {
> - { .compatible = "rockchip,rk3399-vdec" },
> + {
> + .compatible = "rockchip,rk3399-vdec",
> + .data = &rk3399_rkvdec_variant,
> + },
> { /* sentinel */ }
> };
> MODULE_DEVICE_TABLE(of, of_rkvdec_match);
> @@ -1199,16 +1212,22 @@ static const char * const rkvdec_clk_names[] = {
>
> static int rkvdec_probe(struct platform_device *pdev)
> {
> + const struct rkvdec_variant *variant;
> struct rkvdec_dev *rkvdec;
> unsigned int i;
> int ret, irq;
>
> + variant = of_device_get_match_data(&pdev->dev);
> + if (!variant)
> + return -EINVAL;
> +
> rkvdec = devm_kzalloc(&pdev->dev, sizeof(*rkvdec), GFP_KERNEL);
> if (!rkvdec)
> return -ENOMEM;
>
> platform_set_drvdata(pdev, rkvdec);
> rkvdec->dev = &pdev->dev;
> + rkvdec->capabilities = variant->capabilities;
> mutex_init(&rkvdec->vdev_lock);
> INIT_DELAYED_WORK(&rkvdec->watchdog_work, rkvdec_watchdog_func);
>
> diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.h
> b/drivers/media/platform/rockchip/rkvdec/rkvdec.h
> index c062c5c5bbb2..8e1f8548eae4 100644
> --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.h
> +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.h
> @@ -22,6 +22,10 @@
> #include <media/videobuf2-core.h>
> #include <media/videobuf2-dma-contig.h>
>
> +#define RKVDEC_CAPABILITY_HEVC BIT(0)
> +#define RKVDEC_CAPABILITY_H264 BIT(1)
> +#define RKVDEC_CAPABILITY_VP9 BIT(2)
> +
> struct rkvdec_ctx;
>
> struct rkvdec_ctrl_desc {
> @@ -63,6 +67,10 @@ vb2_to_rkvdec_decoded_buf(struct vb2_buffer *buf)
> base.vb.vb2_buf);
> }
>
> +struct rkvdec_variant {
> + unsigned int capabilities;
> +};
> +
> struct rkvdec_coded_fmt_ops {
> int (*adjust_fmt)(struct rkvdec_ctx *ctx,
> struct v4l2_format *f);
> @@ -98,6 +106,7 @@ struct rkvdec_coded_fmt_desc {
> unsigned int num_decoded_fmts;
> const struct rkvdec_decoded_fmt_desc *decoded_fmts;
> u32 subsystem_flags;
> + unsigned int capability;
> };
>
> struct rkvdec_dev {
> @@ -111,6 +120,7 @@ struct rkvdec_dev {
> struct mutex vdev_lock; /* serializes ioctls */
> struct delayed_work watchdog_work;
> struct iommu_domain *empty_domain;
> + unsigned int capabilities;
> };
>
> struct rkvdec_ctx {
Should be simple to rebase Detlev branch on this.
Reviewed-by: Nicolas Dufresne <nicolas.dufresne@...labora.com>
Nicolas
Download attachment "signature.asc" of type "application/pgp-signature" (196 bytes)
Powered by blists - more mailing lists