From nobody Wed Sep 10 11:02:35 2025 Received: from smtp.forwardemail.net (smtp.forwardemail.net [149.28.215.223]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 024EC306B0D for ; Fri, 5 Sep 2025 16:20:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=149.28.215.223 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757089214; cv=none; b=pG8ringPnW3kIQ8qnj7xT9OPrnClxrEJj43MyKVvD5LUtCSPeECOZUwermTPzCAu15Bn9hDU7bTfl98DCEPPdUXlWzyzhVv/X0iJhdNYuBsRLKreNkwXY+z1qTs2+LH88rK3HB6IFSw8bbVLArVGtnYMaXjGTrq0YcmbuZhbW00= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757089214; c=relaxed/simple; bh=Px68MF63onu3h6EYWomJSCvuIM2cOwAalnArcqoFEI4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZH9/GsX1gxDl7fgpQ3Qui1v6e2AI99idLGOJgM1Hk0erwg4gqOCIa1aIT3gCtWTZI1GMoCBawGl0LdjiCWnwYph9zVw7EhkZm4050lEf1CLz667v1YRmbF09OYxD7ybSMkbJsUlMYNZT9ZfG/1vf+CGZpFpDFZ9iYb4N8t9oBjE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=kwiboo.se; spf=pass smtp.mailfrom=fe-bounces.kwiboo.se; dkim=pass (2048-bit key) header.d=kwiboo.se header.i=@kwiboo.se header.b=Ub2+QTRt; arc=none smtp.client-ip=149.28.215.223 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=kwiboo.se Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fe-bounces.kwiboo.se Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kwiboo.se header.i=@kwiboo.se header.b="Ub2+QTRt" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=Content-Transfer-Encoding: MIME-Version: References: In-Reply-To: Message-ID: Date: Subject: Cc: To: From; q=dns/txt; s=fe-e1b5cab7be; t=1757089212; bh=jsQ9JGf1qPemLxXlWU5ctSTecIqZzqL5Gbd4uM4ZRNc=; b=Ub2+QTRthJjD0i0GpLALQeEhI2wofDXFqKyMyZUS6BX72MK+1dfucDIUOP9hn+wKMrG2QTdUm FbxawHx7YLex9cibNGQWtZXGjJrJsXrolZJ66Op+ir637sN6VnfTgnO+hySfX5UDaRcYFnntaYm xbN56MFgIkSalS/IM00GzpVdLucMuf3Q6Uc8wrlIrAooHNGsajCD33M3QsXZD/0cmY06bphxL2B 6FRZtoLttmg2NmETWp/Ou522KlNGqA6ddMj7o8TUo1hpY1AYgySFKuW5e/GzrrCV8HIWI9it8iR iuvX8B0ghcvdJrraqOwI0sPPIYHomxaFbTDm9wji3qDA== X-Forward-Email-ID: 68bb0db890d039a4fd84d604 X-Forward-Email-Sender: rfc822; jonas@kwiboo.se, smtp.forwardemail.net, 149.28.215.223 X-Forward-Email-Version: 1.2.13 X-Forward-Email-Website: https://forwardemail.net X-Complaints-To: abuse@forwardemail.net X-Report-Abuse: abuse@forwardemail.net X-Report-Abuse-To: abuse@forwardemail.net From: Jonas Karlman To: Ezequiel Garcia , Detlev Casanova , Mauro Carvalho Chehab , Heiko Stuebner Cc: Alex Bee , Nicolas Dufresne , linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Jonas Karlman Subject: [PATCH v3 3/7] media: rkvdec: Implement capability filtering Date: Fri, 5 Sep 2025 16:19:21 +0000 Message-ID: <20250905161942.3759717-4-jonas@kwiboo.se> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250905161942.3759717-1-jonas@kwiboo.se> References: <20250905161942.3759717-1-jonas@kwiboo.se> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add filtering of coded formats and controls depending on a variant capabilities. Signed-off-by: Alex Bee Reviewed-by: Nicolas Dufresne Signed-off-by: Jonas Karlman --- Changes in v3: - Change to use file_to_rkvdec_ctx() - Use capabilities from rkvdec_variant - Collect r-b tag Changes in v2: - Adjust code style in rkvdec_enum_coded_fmt_desc() --- .../media/platform/rockchip/rkvdec/rkvdec.c | 67 ++++++++++++++----- 1 file changed, 49 insertions(+), 18 deletions(-) diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.c b/drivers/medi= a/platform/rockchip/rkvdec/rkvdec.c index daf6d9ab2d1d..088ddfadf995 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c @@ -365,13 +365,36 @@ static const struct rkvdec_coded_fmt_desc rkvdec_code= d_fmts[] =3D { } }; =20 +static bool rkvdec_is_capable(struct rkvdec_ctx *ctx, unsigned int capabil= ity) +{ + return (ctx->dev->variant->capabilities & capability) =3D=3D capability; +} + static const struct rkvdec_coded_fmt_desc * -rkvdec_find_coded_fmt_desc(u32 fourcc) +rkvdec_enum_coded_fmt_desc(struct rkvdec_ctx *ctx, int index) { + int fmt_idx =3D -1; unsigned int i; =20 for (i =3D 0; i < ARRAY_SIZE(rkvdec_coded_fmts); i++) { - if (rkvdec_coded_fmts[i].fourcc =3D=3D fourcc) + if (!rkvdec_is_capable(ctx, rkvdec_coded_fmts[i].capability)) + continue; + fmt_idx++; + if (index =3D=3D fmt_idx) + return &rkvdec_coded_fmts[i]; + } + + return NULL; +} + +static const struct rkvdec_coded_fmt_desc * +rkvdec_find_coded_fmt_desc(struct rkvdec_ctx *ctx, u32 fourcc) +{ + unsigned int i; + + for (i =3D 0; i < ARRAY_SIZE(rkvdec_coded_fmts); i++) { + if (rkvdec_is_capable(ctx, rkvdec_coded_fmts[i].capability) && + rkvdec_coded_fmts[i].fourcc =3D=3D fourcc) return &rkvdec_coded_fmts[i]; } =20 @@ -382,7 +405,7 @@ static void rkvdec_reset_coded_fmt(struct rkvdec_ctx *c= tx) { struct v4l2_format *f =3D &ctx->coded_fmt; =20 - ctx->coded_fmt_desc =3D &rkvdec_coded_fmts[0]; + ctx->coded_fmt_desc =3D rkvdec_enum_coded_fmt_desc(ctx, 0); rkvdec_reset_fmt(ctx, f, ctx->coded_fmt_desc->fourcc); =20 f->type =3D V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE; @@ -396,21 +419,22 @@ static void rkvdec_reset_coded_fmt(struct rkvdec_ctx = *ctx) static int rkvdec_enum_framesizes(struct file *file, void *priv, struct v4l2_frmsizeenum *fsize) { - const struct rkvdec_coded_fmt_desc *fmt; + struct rkvdec_ctx *ctx =3D file_to_rkvdec_ctx(file); + const struct rkvdec_coded_fmt_desc *desc; =20 if (fsize->index !=3D 0) return -EINVAL; =20 - fmt =3D rkvdec_find_coded_fmt_desc(fsize->pixel_format); - if (!fmt) + desc =3D rkvdec_find_coded_fmt_desc(ctx, fsize->pixel_format); + if (!desc) return -EINVAL; =20 fsize->type =3D V4L2_FRMSIZE_TYPE_CONTINUOUS; fsize->stepwise.min_width =3D 1; - fsize->stepwise.max_width =3D fmt->frmsize.max_width; + fsize->stepwise.max_width =3D desc->frmsize.max_width; fsize->stepwise.step_width =3D 1; fsize->stepwise.min_height =3D 1; - fsize->stepwise.max_height =3D fmt->frmsize.max_height; + fsize->stepwise.max_height =3D desc->frmsize.max_height; fsize->stepwise.step_height =3D 1; =20 return 0; @@ -470,10 +494,10 @@ static int rkvdec_try_output_fmt(struct file *file, v= oid *priv, struct rkvdec_ctx *ctx =3D file_to_rkvdec_ctx(file); const struct rkvdec_coded_fmt_desc *desc; =20 - desc =3D rkvdec_find_coded_fmt_desc(pix_mp->pixelformat); + desc =3D rkvdec_find_coded_fmt_desc(ctx, pix_mp->pixelformat); if (!desc) { - pix_mp->pixelformat =3D rkvdec_coded_fmts[0].fourcc; - desc =3D &rkvdec_coded_fmts[0]; + desc =3D rkvdec_enum_coded_fmt_desc(ctx, 0); + pix_mp->pixelformat =3D desc->fourcc; } =20 v4l2_apply_frmsize_constraints(&pix_mp->width, @@ -550,7 +574,7 @@ static int rkvdec_s_output_fmt(struct file *file, void = *priv, if (ret) return ret; =20 - desc =3D rkvdec_find_coded_fmt_desc(f->fmt.pix_mp.pixelformat); + desc =3D rkvdec_find_coded_fmt_desc(ctx, f->fmt.pix_mp.pixelformat); if (!desc) return -EINVAL; ctx->coded_fmt_desc =3D desc; @@ -602,10 +626,14 @@ static int rkvdec_g_capture_fmt(struct file *file, vo= id *priv, static int rkvdec_enum_output_fmt(struct file *file, void *priv, struct v4l2_fmtdesc *f) { - if (f->index >=3D ARRAY_SIZE(rkvdec_coded_fmts)) + struct rkvdec_ctx *ctx =3D file_to_rkvdec_ctx(file); + const struct rkvdec_coded_fmt_desc *desc; + + desc =3D rkvdec_enum_coded_fmt_desc(ctx, f->index); + if (!desc) return -EINVAL; =20 - f->pixelformat =3D rkvdec_coded_fmts[f->index].fourcc; + f->pixelformat =3D desc->fourcc; return 0; } =20 @@ -970,14 +998,17 @@ static int rkvdec_init_ctrls(struct rkvdec_ctx *ctx) int ret; =20 for (i =3D 0; i < ARRAY_SIZE(rkvdec_coded_fmts); i++) - nctrls +=3D rkvdec_coded_fmts[i].ctrls->num_ctrls; + if (rkvdec_is_capable(ctx, rkvdec_coded_fmts[i].capability)) + nctrls +=3D rkvdec_coded_fmts[i].ctrls->num_ctrls; =20 v4l2_ctrl_handler_init(&ctx->ctrl_hdl, nctrls); =20 for (i =3D 0; i < ARRAY_SIZE(rkvdec_coded_fmts); i++) { - ret =3D rkvdec_add_ctrls(ctx, rkvdec_coded_fmts[i].ctrls); - if (ret) - goto err_free_handler; + if (rkvdec_is_capable(ctx, rkvdec_coded_fmts[i].capability)) { + ret =3D rkvdec_add_ctrls(ctx, rkvdec_coded_fmts[i].ctrls); + if (ret) + goto err_free_handler; + } } =20 ret =3D v4l2_ctrl_handler_setup(&ctx->ctrl_hdl); --=20 2.51.0