| 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: <20250708151946.374349-6-detlev.casanova@collabora.com>
Date: Tue, 8 Jul 2025 11:19:38 -0400
From: Detlev Casanova <detlev.casanova@...labora.com>
To: linux-kernel@...r.kernel.org
Cc: Detlev Casanova <detlev.casanova@...labora.com>,
Mauro Carvalho Chehab <mchehab@...nel.org>,
Heiko Stuebner <heiko@...ech.de>,
linux-media@...r.kernel.org,
linux-rockchip@...ts.infradead.org,
linux-arm-kernel@...ts.infradead.org,
kernel@...labora.com,
Nicolas Frattaroli <nicolas.frattaroli@...labora.com>,
Nicolas Dufresne <nicolas.dufresne@...labora.com>
Subject: [PATCH 05/12] media: rkvdec: Add per variant configuration
This is to prepare for adding different variants of the decoder and
support specific formats and ops.
Signed-off-by: Detlev Casanova <detlev.casanova@...labora.com>
---
.../media/platform/rockchip/rkvdec/rkvdec.c | 50 ++++++++++++-------
.../media/platform/rockchip/rkvdec/rkvdec.h | 6 +++
2 files changed, 39 insertions(+), 17 deletions(-)
diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.c b/drivers/media/platform/rockchip/rkvdec/rkvdec.c
index c3f35a02d7fdb..3496216d99c18 100644
--- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c
+++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c
@@ -286,13 +286,14 @@ static const struct rkvdec_coded_fmt_desc rkvdec_coded_fmts[] = {
};
static const struct rkvdec_coded_fmt_desc *
-rkvdec_find_coded_fmt_desc(u32 fourcc)
+rkvdec_find_coded_fmt_desc(struct rkvdec_ctx *ctx, u32 fourcc)
{
+ struct rkvdec_config *cfg = ctx->dev->config;
unsigned int i;
- for (i = 0; i < ARRAY_SIZE(rkvdec_coded_fmts); i++) {
- if (rkvdec_coded_fmts[i].fourcc == fourcc)
- return &rkvdec_coded_fmts[i];
+ for (i = 0; i < cfg->coded_fmts_num; i++) {
+ if (cfg->coded_fmts[i].fourcc == fourcc)
+ return &cfg->coded_fmts[i];
}
return NULL;
@@ -300,9 +301,10 @@ rkvdec_find_coded_fmt_desc(u32 fourcc)
static void rkvdec_reset_coded_fmt(struct rkvdec_ctx *ctx)
{
+ struct rkvdec_config *cfg = ctx->dev->config;
struct v4l2_format *f = &ctx->coded_fmt;
- ctx->coded_fmt_desc = &rkvdec_coded_fmts[0];
+ ctx->coded_fmt_desc = &cfg->coded_fmts[0];
rkvdec_reset_fmt(ctx, f, ctx->coded_fmt_desc->fourcc);
f->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
@@ -316,12 +318,13 @@ static void rkvdec_reset_coded_fmt(struct rkvdec_ctx *ctx)
static int rkvdec_enum_framesizes(struct file *file, void *priv,
struct v4l2_frmsizeenum *fsize)
{
+ struct rkvdec_ctx *ctx = fh_to_rkvdec_ctx(priv);
const struct rkvdec_coded_fmt_desc *fmt;
if (fsize->index != 0)
return -EINVAL;
- fmt = rkvdec_find_coded_fmt_desc(fsize->pixel_format);
+ fmt = rkvdec_find_coded_fmt_desc(ctx, fsize->pixel_format);
if (!fmt)
return -EINVAL;
@@ -388,12 +391,13 @@ static int rkvdec_try_output_fmt(struct file *file, void *priv,
{
struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;
struct rkvdec_ctx *ctx = fh_to_rkvdec_ctx(priv);
+ struct rkvdec_config *cfg = ctx->dev->config;
const struct rkvdec_coded_fmt_desc *desc;
- desc = rkvdec_find_coded_fmt_desc(pix_mp->pixelformat);
+ desc = rkvdec_find_coded_fmt_desc(ctx, pix_mp->pixelformat);
if (!desc) {
- pix_mp->pixelformat = rkvdec_coded_fmts[0].fourcc;
- desc = &rkvdec_coded_fmts[0];
+ pix_mp->pixelformat = cfg->coded_fmts[0].fourcc;
+ desc = &cfg->coded_fmts[0];
}
v4l2_apply_frmsize_constraints(&pix_mp->width,
@@ -470,7 +474,7 @@ static int rkvdec_s_output_fmt(struct file *file, void *priv,
if (ret)
return ret;
- desc = rkvdec_find_coded_fmt_desc(f->fmt.pix_mp.pixelformat);
+ desc = rkvdec_find_coded_fmt_desc(ctx, f->fmt.pix_mp.pixelformat);
if (!desc)
return -EINVAL;
ctx->coded_fmt_desc = desc;
@@ -522,10 +526,13 @@ static int rkvdec_g_capture_fmt(struct file *file, void *priv,
static int rkvdec_enum_output_fmt(struct file *file, void *priv,
struct v4l2_fmtdesc *f)
{
- if (f->index >= ARRAY_SIZE(rkvdec_coded_fmts))
+ struct rkvdec_ctx *ctx = fh_to_rkvdec_ctx(priv);
+ struct rkvdec_config *cfg = ctx->dev->config;
+
+ if (f->index >= cfg->coded_fmts_num)
return -EINVAL;
- f->pixelformat = rkvdec_coded_fmts[f->index].fourcc;
+ f->pixelformat = cfg->coded_fmts[f->index].fourcc;
return 0;
}
@@ -895,16 +902,17 @@ static int rkvdec_add_ctrls(struct rkvdec_ctx *ctx,
static int rkvdec_init_ctrls(struct rkvdec_ctx *ctx)
{
+ struct rkvdec_config *cfg = ctx->dev->config;
unsigned int i, nctrls = 0;
int ret;
- for (i = 0; i < ARRAY_SIZE(rkvdec_coded_fmts); i++)
- nctrls += rkvdec_coded_fmts[i].ctrls->num_ctrls;
+ for (i = 0; i < cfg->coded_fmts_num; i++)
+ nctrls += cfg->coded_fmts[i].ctrls->num_ctrls;
v4l2_ctrl_handler_init(&ctx->ctrl_hdl, nctrls);
- for (i = 0; i < ARRAY_SIZE(rkvdec_coded_fmts); i++) {
- ret = rkvdec_add_ctrls(ctx, rkvdec_coded_fmts[i].ctrls);
+ for (i = 0; i < cfg->coded_fmts_num; i++) {
+ ret = rkvdec_add_ctrls(ctx, cfg->coded_fmts[i].ctrls);
if (ret)
goto err_free_handler;
}
@@ -1119,8 +1127,13 @@ static void rkvdec_watchdog_func(struct work_struct *work)
}
}
+const struct rkvdec_config config_rkvdec = {
+ .coded_fmts = (struct rkvdec_coded_fmt_desc *)rkvdec_coded_fmts,
+ .coded_fmts_num = ARRAY_SIZE(rkvdec_coded_fmts),
+};
+
static const struct of_device_id of_rkvdec_match[] = {
- { .compatible = "rockchip,rk3399-vdec" },
+ { .compatible = "rockchip,rk3399-vdec", .data = &config_rkvdec },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, of_rkvdec_match);
@@ -1144,6 +1157,9 @@ static int rkvdec_probe(struct platform_device *pdev)
mutex_init(&rkvdec->vdev_lock);
INIT_DELAYED_WORK(&rkvdec->watchdog_work, rkvdec_watchdog_func);
+ rkvdec->config =
+ (struct rkvdec_config *)of_device_get_match_data(rkvdec->dev);
+
rkvdec->clocks = devm_kcalloc(&pdev->dev, ARRAY_SIZE(rkvdec_clk_names),
sizeof(*rkvdec->clocks), GFP_KERNEL);
if (!rkvdec->clocks)
diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.h b/drivers/media/platform/rockchip/rkvdec/rkvdec.h
index 3451c4bf7cb75..14717c646c665 100644
--- a/drivers/media/platform/rockchip/rkvdec/rkvdec.h
+++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.h
@@ -100,6 +100,11 @@ struct rkvdec_coded_fmt_desc {
u32 subsystem_flags;
};
+struct rkvdec_config {
+ struct rkvdec_coded_fmt_desc *coded_fmts;
+ size_t coded_fmts_num;
+};
+
struct rkvdec_dev {
struct v4l2_device v4l2_dev;
struct media_device mdev;
@@ -111,6 +116,7 @@ struct rkvdec_dev {
struct mutex vdev_lock; /* serializes ioctls */
struct delayed_work watchdog_work;
struct iommu_domain *empty_domain;
+ struct rkvdec_config *config;
};
struct rkvdec_ctx {
--
2.50.0
Powered by blists - more mailing lists