From nobody Sat Feb 7 05:44:08 2026 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AAE493EFD05; Tue, 20 Jan 2026 22:21:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768947667; cv=none; b=l9Nuoae96EVQKyA/x14IWnyIJqTtNlA5BpB5JK0QSNdMTpl+B1D7NZ2AfdrnK9s0WaC69VhiSC+QRyOLKD4UzHHYi+NN7ss7jdMo3bn7lHK2ovbqVUug2oSQMj+ibJEOe1wrtVfqKBR9atAKiQl6p1hvXL3rv11/R9kgGYfpJ8s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768947667; c=relaxed/simple; bh=WBGVUOqJUXT8swZrrQS5TCWpl1mwfEZtqmHfh7//hHw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=if1ZMXzbt6EeNv48EjlvNtnc42W2leodm89fe5Mdv8QHGK2EDFsdNAG8WCEOjbPHfkD9QB2Hlyh1M0ImlBjOA4IV2r7NpxXB/tGt3FV4sZOUKxCB+2DIM6TT3uvy9WrPCE7P41O4dfSYn6H5KgBUpgW/L8ROcX2O1pembrQ47YM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=d4N2+WuY; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="d4N2+WuY" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1768947657; bh=WBGVUOqJUXT8swZrrQS5TCWpl1mwfEZtqmHfh7//hHw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d4N2+WuYqfuCMivAN8CZgU1jZHdu+QHoWTkW7GhNCkED6FuDhcbe3dJQNW9UI5UzV FhsTtfqDPYZBfgpPTqNp5BKJF9xMCC+sGo4LQSxH9ZNm4E+4Zmtdruc+BXiawsRFEW QzBQ3eE4LSHUrTd1dJChr24lhNHQZ125Elr70ETfSYc71KAs8ef6CZDOOQhU+pR5Cx H0JWtwNCzlCi4Gcm1/5N+0jqkO3ihb7If3xhfMVxG5hmuMK7HH2UWQ5ENC/VemeJ4M N98oV4/R/deSiu3jCHJKArXLM1mn+6UpdWjv1NintsV0h87EHB9x2kXe4wp5c/a4+Z pWFvFgDIuKPtg== Received: from earth.mtl.collabora.ca (mtl.collabora.ca [66.171.169.34]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: detlev) by bali.collaboradmins.com (Postfix) with ESMTPSA id 3629517E0DB7; Tue, 20 Jan 2026 23:20:54 +0100 (CET) From: Detlev Casanova To: linux-kernel@vger.kernel.org Cc: Mauro Carvalho Chehab , Detlev Casanova , Ezequiel Garcia , Heiko Stuebner , Daniel Almeida , Jonathan Corbet , Ricardo Ribalda , Hans Verkuil , Yunke Cao , Hans de Goede , Laurent Pinchart , Nicolas Dufresne , Pavan Bobba , Sakari Ailus , James Cowgill , linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, kernel@collabora.com, Jonas Karlman , Diederik de Haas Subject: [PATCH v9 09/17] media: rkvdec: Add variant specific coded formats list Date: Tue, 20 Jan 2026 17:20:09 -0500 Message-ID: <20260120222018.404741-10-detlev.casanova@collabora.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260120222018.404741-1-detlev.casanova@collabora.com> References: <20260120222018.404741-1-detlev.casanova@collabora.com> 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" Prepare for adding new variants of the decoder and support specific formats and format ops per variant. This removes the need of capability flags for variants, so remove them. Tested-by: Diederik de Haas # Rock 5B Reviewed-by: Nicolas Dufresne Signed-off-by: Detlev Casanova --- .../media/platform/rockchip/rkvdec/rkvdec.c | 68 ++++++++++--------- .../media/platform/rockchip/rkvdec/rkvdec.h | 8 +-- 2 files changed, 39 insertions(+), 37 deletions(-) diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.c b/drivers/medi= a/platform/rockchip/rkvdec/rkvdec.c index 776149f871b09..92b1c7b62bd20 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c @@ -328,7 +328,6 @@ static const struct rkvdec_coded_fmt_desc rkvdec_coded_= fmts[] =3D { .ops =3D &rkvdec_hevc_fmt_ops, .num_decoded_fmts =3D ARRAY_SIZE(rkvdec_hevc_decoded_fmts), .decoded_fmts =3D rkvdec_hevc_decoded_fmts, - .capability =3D RKVDEC_CAPABILITY_HEVC, }, { .fourcc =3D V4L2_PIX_FMT_H264_SLICE, @@ -345,7 +344,6 @@ static const struct rkvdec_coded_fmt_desc rkvdec_coded_= fmts[] =3D { .num_decoded_fmts =3D ARRAY_SIZE(rkvdec_h264_decoded_fmts), .decoded_fmts =3D rkvdec_h264_decoded_fmts, .subsystem_flags =3D VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF, - .capability =3D RKVDEC_CAPABILITY_H264, }, { .fourcc =3D V4L2_PIX_FMT_VP9_FRAME, @@ -361,27 +359,38 @@ static const struct rkvdec_coded_fmt_desc rkvdec_code= d_fmts[] =3D { .ops =3D &rkvdec_vp9_fmt_ops, .num_decoded_fmts =3D ARRAY_SIZE(rkvdec_vp9_decoded_fmts), .decoded_fmts =3D rkvdec_vp9_decoded_fmts, - .capability =3D RKVDEC_CAPABILITY_VP9, } }; =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 rk3288_coded_fmts[] =3D { + { + .fourcc =3D V4L2_PIX_FMT_HEVC_SLICE, + .frmsize =3D { + .min_width =3D 64, + .max_width =3D 4096, + .step_width =3D 64, + .min_height =3D 64, + .max_height =3D 2304, + .step_height =3D 16, + }, + .ctrls =3D &rkvdec_hevc_ctrls, + .ops =3D &rkvdec_hevc_fmt_ops, + .num_decoded_fmts =3D ARRAY_SIZE(rkvdec_hevc_decoded_fmts), + .decoded_fmts =3D rkvdec_hevc_decoded_fmts, + } +}; =20 static const struct rkvdec_coded_fmt_desc * rkvdec_enum_coded_fmt_desc(struct rkvdec_ctx *ctx, int index) { + const struct rkvdec_variant *variant =3D ctx->dev->variant; int fmt_idx =3D -1; unsigned int i; =20 - for (i =3D 0; i < ARRAY_SIZE(rkvdec_coded_fmts); i++) { - if (!rkvdec_is_capable(ctx, rkvdec_coded_fmts[i].capability)) - continue; + for (i =3D 0; i < variant->num_coded_fmts; i++) { fmt_idx++; if (index =3D=3D fmt_idx) - return &rkvdec_coded_fmts[i]; + return &variant->coded_fmts[i]; } =20 return NULL; @@ -390,12 +399,12 @@ rkvdec_enum_coded_fmt_desc(struct rkvdec_ctx *ctx, in= t index) static const struct rkvdec_coded_fmt_desc * rkvdec_find_coded_fmt_desc(struct rkvdec_ctx *ctx, u32 fourcc) { + const struct rkvdec_variant *variant =3D ctx->dev->variant; unsigned int i; =20 - 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]; + for (i =3D 0; i < variant->num_coded_fmts; i++) { + if (variant->coded_fmts[i].fourcc =3D=3D fourcc) + return &variant->coded_fmts[i]; } =20 return NULL; @@ -1014,21 +1023,19 @@ static int rkvdec_add_ctrls(struct rkvdec_ctx *ctx, =20 static int rkvdec_init_ctrls(struct rkvdec_ctx *ctx) { + const struct rkvdec_variant *variant =3D ctx->dev->variant; unsigned int i, nctrls =3D 0; int ret; =20 - for (i =3D 0; i < ARRAY_SIZE(rkvdec_coded_fmts); i++) - if (rkvdec_is_capable(ctx, rkvdec_coded_fmts[i].capability)) - nctrls +=3D rkvdec_coded_fmts[i].ctrls->num_ctrls; + for (i =3D 0; i < variant->num_coded_fmts; i++) + nctrls +=3D variant->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++) { - 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; - } + for (i =3D 0; i < variant->num_coded_fmts; i++) { + ret =3D rkvdec_add_ctrls(ctx, variant->coded_fmts[i].ctrls); + if (ret) + goto err_free_handler; } =20 ret =3D v4l2_ctrl_handler_setup(&ctx->ctrl_hdl); @@ -1242,22 +1249,21 @@ static void rkvdec_watchdog_func(struct work_struct= *work) =20 static const struct rkvdec_variant rk3288_rkvdec_variant =3D { .num_regs =3D 68, - .capabilities =3D RKVDEC_CAPABILITY_HEVC, + .coded_fmts =3D rk3288_coded_fmts, + .num_coded_fmts =3D ARRAY_SIZE(rk3288_coded_fmts), }; =20 static const struct rkvdec_variant rk3328_rkvdec_variant =3D { .num_regs =3D 109, - .capabilities =3D RKVDEC_CAPABILITY_HEVC | - RKVDEC_CAPABILITY_H264 | - RKVDEC_CAPABILITY_VP9, + .coded_fmts =3D rkvdec_coded_fmts, + .num_coded_fmts =3D ARRAY_SIZE(rkvdec_coded_fmts), .quirks =3D RKVDEC_QUIRK_DISABLE_QOS, }; =20 static const struct rkvdec_variant rk3399_rkvdec_variant =3D { .num_regs =3D 78, - .capabilities =3D RKVDEC_CAPABILITY_HEVC | - RKVDEC_CAPABILITY_H264 | - RKVDEC_CAPABILITY_VP9, + .coded_fmts =3D rkvdec_coded_fmts, + .num_coded_fmts =3D ARRAY_SIZE(rkvdec_coded_fmts), }; =20 static const struct of_device_id of_rkvdec_match[] =3D { diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.h b/drivers/medi= a/platform/rockchip/rkvdec/rkvdec.h index f35f6e80ea2e3..8c4f96ba5cdea 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.h +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.h @@ -22,10 +22,6 @@ #include #include =20 -#define RKVDEC_CAPABILITY_HEVC BIT(0) -#define RKVDEC_CAPABILITY_H264 BIT(1) -#define RKVDEC_CAPABILITY_VP9 BIT(2) - #define RKVDEC_QUIRK_DISABLE_QOS BIT(0) =20 struct rkvdec_ctx; @@ -71,7 +67,8 @@ vb2_to_rkvdec_decoded_buf(struct vb2_buffer *buf) =20 struct rkvdec_variant { unsigned int num_regs; - unsigned int capabilities; + const struct rkvdec_coded_fmt_desc *coded_fmts; + size_t num_coded_fmts; unsigned int quirks; }; =20 @@ -110,7 +107,6 @@ struct rkvdec_coded_fmt_desc { unsigned int num_decoded_fmts; const struct rkvdec_decoded_fmt_desc *decoded_fmts; u32 subsystem_flags; - unsigned int capability; }; =20 struct rkvdec_dev { --=20 2.52.0