From patchwork Thu Apr 18 14:15:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Link Mauve X-Patchwork-Id: 13634841 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 845D9C4345F for ; Thu, 18 Apr 2024 14:15:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=cc7qkh9jjO2DGSp/Jpjhuxh2b+BKmssZz/0FTR5y/4o=; b=OmHYjKkqAAJWil OJhnfvjBWyJd6svAPeHWcPgfkj5APNWug9XZUPRp7YRiLMVW7AbfjvgVkfo28vP7Woa6WWDcowwaI sYjHIivRw5aEtH6CZUdpGLtflLBodAl//NC0t1NdyjPi2wO/atUl9WHX4/bvlXwDjN+rL/qmBCmK1 KlVOzbXUK7WyDIqxcsiXM8lgSrL+vX6nMt3FHrld/hGggnxkvLkYHKjATlGuV6yhpZOiFcvb6MWCd mBC168losbRz67OHfox/cfk9O0SEApzYgN98EZLnfup2AlxGGdA3aLdEKRqSEwHUv7RgmQGGol/nH OUBlNbi1+KuAqHoIqekw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxSY6-00000002XmB-44kP; Thu, 18 Apr 2024 14:15:38 +0000 Received: from [2a01:e0a:828:c7c0:e2d5:5eff:fe2d:8e8] (helo=luna.linkmauve.fr) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxSXy-00000002XiC-41Mf; Thu, 18 Apr 2024 14:15:37 +0000 Received: by luna.linkmauve.fr (Postfix, from userid 1000) id 5DEBD10D1B05; Thu, 18 Apr 2024 16:15:14 +0200 (CEST) From: Emmanuel Gil Peyrot To: linux-kernel@vger.kernel.org Cc: Emmanuel Gil Peyrot , Ezequiel Garcia , Philipp Zabel , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Joerg Roedel , Will Deacon , Robin Murphy , Sebastian Reichel , Cristian Ciocaltea , Dragan Simic , Shreeya Patel , Chris Morgan , Andy Yan , Nicolas Frattaroli , linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, Conor Dooley Subject: [PATCH v4 1/2] =?utf-8?q?media=3A_dt-binding=3A_Document_rk3588?= =?utf-8?q?=E2=80=99s_VEPU121?= Date: Thu, 18 Apr 2024 16:15:05 +0200 Message-ID: <20240418141509.2485053-2-linkmauve@linkmauve.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240418141509.2485053-1-linkmauve@linkmauve.fr> References: <20240418141509.2485053-1-linkmauve@linkmauve.fr> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240418_071531_242673_2AE943D7 X-CRM114-Status: GOOD ( 10.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This encoder-only device is present four times on this SoC, and should support everything the rk3568 vepu supports (so JPEG, H.264 and VP8 encoding). According to the TRM[1], there is also the VEPU580 encoder which supports H.264 and H.265, and various VDPU* decoders, of which only the VDPU981 is currently supported. This patch describes only the VEPU121. [1] https://github.com/FanX-Tek/rk3588-TRM-and-Datasheet Signed-off-by: Emmanuel Gil Peyrot Reviewed-by: Sebastian Reichel Acked-by: Conor Dooley --- .../devicetree/bindings/media/rockchip,rk3568-vepu.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/media/rockchip,rk3568-vepu.yaml b/Documentation/devicetree/bindings/media/rockchip,rk3568-vepu.yaml index 9d90d8d0565a..4c6cb21da041 100644 --- a/Documentation/devicetree/bindings/media/rockchip,rk3568-vepu.yaml +++ b/Documentation/devicetree/bindings/media/rockchip,rk3568-vepu.yaml @@ -15,8 +15,12 @@ description: properties: compatible: - enum: - - rockchip,rk3568-vepu + oneOf: + - const: rockchip,rk3568-vepu + - items: + - enum: + - rockchip,rk3588-vepu121 + - const: rockchip,rk3568-vepu reg: maxItems: 1 From patchwork Thu Apr 18 14:15:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Link Mauve X-Patchwork-Id: 13634842 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BA2CAC04FF8 for ; Thu, 18 Apr 2024 14:15:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=iJNSgelr3q3AX1xsG36gbWsf/FyTgDSvZMmxAllyNac=; b=RqzgMxc9Zdf5b/ cVcABakgtX0VnpIwNrkiEunswN0GLO13nNHQ32Js/vfiuIjPdsnOfDJBSmowmgK2ZJPE2u1Y8cLIl urJmzM3GaiObkhkWzuBopFHLLPW51eGo69ub+y6QZvlCsuXAKL7uh3yqDEZP02m2XASuWxbt88fQ+ YZh8WepmT7p1yWbmZQ6/lQdsTfkUwKg5fGrAGkYkki2oGbGMgg41yUNDOrTsa6jZoJT8e/9DEoDQc ikQi7vDbX6uXNTxHaXdspMamPds5HHAO7vZpfMaA2oCh9ygQB6mbLnDV69v3Ow1aZlAefomdaMlV+ 3ye2UjgtUYU4839tQpsw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxSY7-00000002XmW-2Wny; Thu, 18 Apr 2024 14:15:39 +0000 Received: from [2a01:e0a:828:c7c0:e2d5:5eff:fe2d:8e8] (helo=luna.linkmauve.fr) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxSXy-00000002XiB-45ny; Thu, 18 Apr 2024 14:15:37 +0000 Received: by luna.linkmauve.fr (Postfix, from userid 1000) id 6A17C10D1B07; Thu, 18 Apr 2024 16:15:14 +0200 (CEST) From: Emmanuel Gil Peyrot To: linux-kernel@vger.kernel.org Cc: Emmanuel Gil Peyrot , Ezequiel Garcia , Philipp Zabel , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Joerg Roedel , Will Deacon , Robin Murphy , Sebastian Reichel , Cristian Ciocaltea , Dragan Simic , Shreeya Patel , Chris Morgan , Andy Yan , Nicolas Frattaroli , linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev Subject: [PATCH v4 2/2] arm64: dts: rockchip: Add one VEPU121 to rk3588 Date: Thu, 18 Apr 2024 16:15:06 +0200 Message-ID: <20240418141509.2485053-3-linkmauve@linkmauve.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240418141509.2485053-1-linkmauve@linkmauve.fr> References: <20240418141509.2485053-1-linkmauve@linkmauve.fr> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240418_071531_246887_5EF3D7F5 X-CRM114-Status: GOOD ( 11.57 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The TRM (version 1.0 page 385) lists five VEPU121 cores, but only four interrupts are listed (on page 24), and the driver would expose them all as different video nodes so only one of them is exposed for now. Signed-off-by: Emmanuel Gil Peyrot Formerly-Reviewed-by: Sebastian Reichel --- arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 29 +++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi index 87b83c87bd55..5c6cc4cd81df 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi @@ -2488,6 +2488,35 @@ gpio4: gpio@fec50000 { }; }; + /* + * Currently only one of the four JPEG encoders is exposed, this + * reduces the optimal throughput by four. + * + * Once the driver is made to expose all four devices as a single video + * node, the rest can be enabled again, see the full patch here: + * https://lore.kernel.org/linux-media/20240327134115.424846-1-linkmauve@linkmauve.fr/T/#m3a6df0ba15e4af40b998b0ff2a02b0dd0d730c8e + */ + + jpeg_enc0: video-codec@fdba0000 { + compatible = "rockchip,rk3588-vepu121", "rockchip,rk3568-vepu"; + reg = <0x0 0xfdba0000 0x0 0x800>; + interrupts = ; + clocks = <&cru ACLK_JPEG_ENCODER0>, <&cru HCLK_JPEG_ENCODER0>; + clock-names = "aclk", "hclk"; + iommus = <&jpeg_enc0_mmu>; + power-domains = <&power RK3588_PD_VDPU>; + }; + + jpeg_enc0_mmu: iommu@fdba0800 { + compatible = "rockchip,rk3588-iommu", "rockchip,rk3568-iommu"; + reg = <0x0 0xfdba0800 0x0 0x40>; + interrupts = ; + clocks = <&cru ACLK_JPEG_ENCODER0>, <&cru HCLK_JPEG_ENCODER0>; + clock-names = "aclk", "iface"; + power-domains = <&power RK3588_PD_VDPU>; + #iommu-cells = <0>; + }; + av1d: video-codec@fdc70000 { compatible = "rockchip,rk3588-av1-vpu"; reg = <0x0 0xfdc70000 0x0 0x800>;