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 6FF232F7AC0 for ; Fri, 5 Sep 2025 16:20:08 +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=1757089210; cv=none; b=Wf+heRRrtc72605V91yIhzzYYVg+zA9Gs1Q6cv/dgYg6Ft0wPErVIqgY+/DCvbav70Y3+/byR0P97jQ91Gb/xKiDURLN1fPdN23s8LXD9On10BbdfEveyE2w4CLVjLDbcrgc9mbA+W/8tb/ip27UWV1r9Cs6xvbCSYYqLjwY1iI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757089210; c=relaxed/simple; bh=+w9fVg7yv5hYA2f+77njqJJwApYBuQwP439V9crm8tc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XZlDItZG8XhEYmKuJl8SfNGWdgjh5JbQlDjbfBaZunNKSMWms5RlJC81j2caBPyVJoXINuyR9Dbk/wmUi6AiqXQiOCLpQCo0BfzXpZboz27QqXfvDJ5PDsbCjgylwJgXvLgbQ1L5blOK0FMmn9w4nx1MEzG3FATtCFDxksinfr4= 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=YAY7+wap; 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="YAY7+wap" 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=1757089207; bh=Lm5hPdL8AkGTQal0R2BRZdcHNqMN4Z7U/7PKQLRiGMg=; b=YAY7+wapGayxAB098pVqJ8nNrNTaE7OYZ0jGjfv6+B4cnTwJ814EKlvO2LHVRvgWz+t3H+KEv h9By8R48mQKDQRnmpl50g6wgVbIEZbEwo6bddR1D3iq8OFEYsPqDAIXqdESrQmrIr/ytPSZyaIE CMJTRxInKSvaivL/EBU1ysB3xM3fHaOLd3lfbmQravWqe/d+pPfdHvkNJMMaCYsfFC+Tsypgxg3 cqb+oYB43JtnzFOtgQzcOEAKgWuSRpNjXTaQpfREcL44yWnFGkpEAMHRgMkuZvQDKFGDi8Rl4AF Hy96KvksJy1YpOcAFb+OM/uGegzOaAj0iLLjezHmZxFw== X-Forward-Email-ID: 68bb0db490d039a4fd84d5ca 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 2/7] media: rkvdec: Add variants support Date: Fri, 5 Sep 2025 16:19:20 +0000 Message-ID: <20250905161942.3759717-3-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" From: Alex Bee 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 Reviewed-by: Nicolas Dufresne Signed-off-by: Jonas Karlman --- Changes in v3: - Use a reference to rkvdec_variant - Add num_regs field - Collect r-b tag Changes in v2: - No change --- .../media/platform/rockchip/rkvdec/rkvdec.c | 22 ++++++++++++++++++- .../media/platform/rockchip/rkvdec/rkvdec.h | 11 ++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.c b/drivers/medi= a/platform/rockchip/rkvdec/rkvdec.c index c15fc238d6af..daf6d9ab2d1d 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -327,6 +328,7 @@ 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, @@ -343,6 +345,7 @@ 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, @@ -358,6 +361,7 @@ static const struct rkvdec_coded_fmt_desc rkvdec_coded_= 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 @@ -1186,8 +1190,18 @@ static void rkvdec_watchdog_func(struct work_struct = *work) } } =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, +}; + static const struct of_device_id of_rkvdec_match[] =3D { - { .compatible =3D "rockchip,rk3399-vdec" }, + { + .compatible =3D "rockchip,rk3399-vdec", + .data =3D &rk3399_rkvdec_variant, + }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, of_rkvdec_match); @@ -1198,16 +1212,22 @@ static const char * const rkvdec_clk_names[] =3D { =20 static int rkvdec_probe(struct platform_device *pdev) { + const struct rkvdec_variant *variant; struct rkvdec_dev *rkvdec; unsigned int i; int ret, irq; =20 + variant =3D of_device_get_match_data(&pdev->dev); + if (!variant) + return -EINVAL; + rkvdec =3D devm_kzalloc(&pdev->dev, sizeof(*rkvdec), GFP_KERNEL); if (!rkvdec) return -ENOMEM; =20 platform_set_drvdata(pdev, rkvdec); rkvdec->dev =3D &pdev->dev; + rkvdec->variant =3D variant; mutex_init(&rkvdec->vdev_lock); INIT_DELAYED_WORK(&rkvdec->watchdog_work, rkvdec_watchdog_func); =20 diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.h b/drivers/medi= a/platform/rockchip/rkvdec/rkvdec.h index 209dd79ce9bd..c47457c954e5 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.h +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.h @@ -22,6 +22,10 @@ #include #include =20 +#define RKVDEC_CAPABILITY_HEVC BIT(0) +#define RKVDEC_CAPABILITY_H264 BIT(1) +#define RKVDEC_CAPABILITY_VP9 BIT(2) + struct rkvdec_ctx; =20 struct rkvdec_ctrl_desc { @@ -63,6 +67,11 @@ vb2_to_rkvdec_decoded_buf(struct vb2_buffer *buf) base.vb.vb2_buf); } =20 +struct rkvdec_variant { + unsigned int num_regs; + unsigned int capabilities; +}; + struct rkvdec_coded_fmt_ops { int (*adjust_fmt)(struct rkvdec_ctx *ctx, struct v4l2_format *f); @@ -98,6 +107,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; }; =20 struct rkvdec_dev { @@ -111,6 +121,7 @@ struct rkvdec_dev { struct mutex vdev_lock; /* serializes ioctls */ struct delayed_work watchdog_work; struct iommu_domain *empty_domain; + const struct rkvdec_variant *variant; }; =20 struct rkvdec_ctx { --=20 2.51.0