From nobody Sun Oct 5 05:28:59 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 C2B21285CB7 for ; Sun, 10 Aug 2025 21:25:53 +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=1754861155; cv=none; b=jGKrbVflI0vK0qStBmYOt3g5TzQ13moV9ZWKWl61TctJvUozGAQMiIPIOuJ2wlik85vXKPh8Pn0nevmgQH7HyRDPlaYnA4qlUtEUPU395SCd2c66OJR18BTdYT9XKmjT5i9IEWMJRW3BnvdL9dJhDpokzCDxZ1r5w+6Yl/5nJSI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754861155; c=relaxed/simple; bh=9+HpTmz5tCPuKNJ18O03ZWzkzB0eG2Qc/0Iz0sWdEt0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cqAFDTLyBFs94WyLj1es/TVg2z2oFYCBGQoA5hj96YKg7cML8kfoWHTDvfQmDnXY7pheIDLdWoVoHkUSBBsYX1uXp0x56tzUxIbv71iKBd1x0eshwbcl6/Gid25D/etaft6RtEGoPu5QEbx0RvybjVdzweua0sGN8XrzYMw3vlM= 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=Vt3lSJX0; 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="Vt3lSJX0" 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=1754861153; bh=AffjwLL2Q730popPdM+cA5Jw1dmPFrUx6J2FHMVA81w=; b=Vt3lSJX02QQ4/t5z1MLKo2ynsMeniunTOkxYDOajYQMykb3Gyv1755KlwD+9u0hzFiAId2Hfj CQg8h6RLrxGnhHjBYhzYn2tUzMk155/vun8pi9+y5fct+N8wNlpGlax3KbKj60xQz1cTteb7XKu NeLjeksIUS3fYdHPJN62MJ5YghZeEpsG7i7Qy/R4ltZgOVKUciA6tFuPp5uEhafSQKoE3nFJCbk k0R3oG9s54MR6XMPYBNdjFVmHMUvPSqf0Fa7bVq23h6RebGZ4gmSWYE7uT5lc2zc43KOzUCE2WP rq6nPcCyMoIZBC/qQt3A8NsV0u6NoEKq98o8Joy9LM3Q== X-Forward-Email-ID: 68990e5e797ab89627792409 X-Forward-Email-Sender: rfc822; jonas@kwiboo.se, smtp.forwardemail.net, 149.28.215.223 X-Forward-Email-Version: 1.2.4 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 , Sebastian Fricke , 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 v2 2/7] media: rkvdec: Add variants support Date: Sun, 10 Aug 2025 21:24:32 +0000 Message-ID: <20250810212454.3237486-3-jonas@kwiboo.se> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250810212454.3237486-1-jonas@kwiboo.se> References: <20250810212454.3237486-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 Signed-off-by: Jonas Karlman Reviewed-by: Nicolas Dufresne --- 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/medi= a/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 #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 @@ -1187,8 +1191,17 @@ static void rkvdec_watchdog_func(struct work_struct = *work) } } =20 +static const struct rkvdec_variant rk3399_rkvdec_variant =3D { + .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); @@ -1199,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->capabilities =3D variant->capabilities; 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 c062c5c5bbb2..8e1f8548eae4 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,10 @@ vb2_to_rkvdec_decoded_buf(struct vb2_buffer *buf) base.vb.vb2_buf); } =20 +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; }; =20 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; }; =20 struct rkvdec_ctx { --=20 2.50.1