From patchwork Sat Apr 13 06:46:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jianfeng Liu X-Patchwork-Id: 13628649 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (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 1B4921C6A0; Sat, 13 Apr 2024 06:46:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712990806; cv=none; b=oelr4vLSzswGtUsHU3Ef63sQLtJvowiCSNLWUzhsPU2LVOBqKIBCMLDYhM4qOzpHh2p0BratRkE/SKGWqNAcFOHPYUc4QsrzXKPgpYePr6V7zmGSXsw2xjB0vetJsFzsP0KU8F4MA6WFOx7TsSJ8MtZLvAeZCf7F4G0bP6Qdztw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712990806; c=relaxed/simple; bh=XbtrCJeH1sLdoyCCqia+/5GzGrwZABwnokufR4xmlxY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=I296/CJkqwz9xn0/0RxkB+noXRDaOzW4hUXmrT/6L24todAC8tdQAMFFMav5A6LLau1plA4wp8HSCDDTrlzib3T52UCS3EA0evNaxyKG3Zo5ii2qIb4thjRD5ePZB1uQnMS1XAebpOyecwJi5UbMHC/rs+hGqJoX7haTnoTGPKE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=b4vPFtaZ; arc=none smtp.client-ip=209.85.214.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="b4vPFtaZ" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1e411e339b8so12654155ad.3; Fri, 12 Apr 2024 23:46:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712990804; x=1713595604; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IX8+yKbNfiVsthYW7XKH1eWLYDaubrEtnopoFEYRG3Q=; b=b4vPFtaZvLvbBWMZJr7kS4qcw6Mu7W1iVVRHJmuDZTkYHb0o2T/l32f6wOX6J3qnk6 hAyH2bvzblZDrXPJxd24ixLjpfzb3KYuvmNxUbfSgkVhr9U4h2Xh6dK1cGiqR7i35/e1 l3J0gJ1Hwg6jDbr/1dquZmciT57hAGGjF75JcF2aYfo7mJH19BGgeBCk0nLsun5EDKIH BlmwBYkJqqxDN/rN9HQOkszB5W2l9G+yXyzgXeBy3CnLOKHItrTUMfnYnt6eumQ4v8Tz TD69kpsZrYvRrEvLZpFzqnpWBgs9/Bleg1zecVyGU4693Y5E5qC6VjOVEDeDaM5v25V7 q7kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712990804; x=1713595604; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IX8+yKbNfiVsthYW7XKH1eWLYDaubrEtnopoFEYRG3Q=; b=FOI8bGS2IAxQJok4t2FJgzZehlQKZqACJ4qftdzaEo7k9IKwsc/pMC2xG4KleavbdQ ZBxwQzs1/dlcix/nVdaAiKDFoUKKQ4ByWG91dSsHUBS3uCfvgOIVIP7KFptxUJtCiORW hkOm2+ABhfnMnHHAVVhbCYmQDhsN6AhfmJv6MpYmHK3uoMmXDzfhOp1GJIhMPaCDQbYu 73fWCmvdMUptyIMDwwLZgEJ4P9gLYx1ZNvnIfKeUxcoraIedoI3cQWmamDAI6XUIxIXE eAabnzx/LG5onTa/9CnWq3uDAv7VsY+1ExDEqwqsMFypFIGGhBxhthqwVIfNzJzc8tK1 ARAQ== X-Forwarded-Encrypted: i=1; AJvYcCX51cv1yfEOY3akNPBFJpvlDWIBCTpKYcpS4LYeVXtXs12n1/yQ8VVR3y20c+Mbnx8zub0c8gP5NdnEcPuadlYeb53N+iaw/sDzrWHM+BYE3F7/bksswV2yKGuUmCSgujr0kBdYaKFcwVA= X-Gm-Message-State: AOJu0YyuDMVeYDjzZ1INuj9Q6A5cPqCbS1vymlumkqUYoZVbZBRVULd+ 8X/VQajoMrg6Cm6Ttkba2ogJ+zgrz64Jim68zt+LsCVzI/axlgqyB6u1JAw+nvQ= X-Google-Smtp-Source: AGHT+IG2v1voZ4jUtk3gwJ5t0BpkvC2xmQ/vb0BVsmZQK2jxHhHV6XnEiC/lD631JMGbseAEcE8mfw== X-Received: by 2002:a17:902:a98a:b0:1e3:de79:35d1 with SMTP id bh10-20020a170902a98a00b001e3de7935d1mr4309333plb.23.1712990803645; Fri, 12 Apr 2024 23:46:43 -0700 (PDT) Received: from localhost.localdomain ([221.220.133.103]) by smtp.gmail.com with ESMTPSA id p6-20020a170902780600b001e2a7e90321sm4096693pll.224.2024.04.12.23.46.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 23:46:42 -0700 (PDT) From: Jianfeng Liu To: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Cc: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, heiko@sntech.de, ezequiel@vanguardiasur.com.ar, p.zabel@pengutronix.de, mchehab@kernel.org, sfr@canb.auug.org.au, liujianfeng1994@gmail.com Subject: [PATCH v5 1/2] arm64: dts: rockchip: Add Hantro G1 VPU support for RK3588 Date: Sat, 13 Apr 2024 14:46:07 +0800 Message-Id: <20240413064608.788561-2-liujianfeng1994@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413064608.788561-1-liujianfeng1994@gmail.com> References: <20240413064608.788561-1-liujianfeng1994@gmail.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Enable Hantro G1 video decoder in RK3588's devicetree. Tested with FFmpeg v4l2_request code taken from [1] with MPEG2, H.264 and VP8 samples. [1] https://github.com/LibreELEC/LibreELEC.tv/blob/master/packages/multimedia/ffmpeg/patches/v4l2-request/ffmpeg-001-v4l2-request.patch Signed-off-by: Jianfeng Liu Reviewed-by: Sebastian Reichel --- arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi index ac5bd630f..de823f461 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi @@ -1072,6 +1072,27 @@ power-domain@RK3588_PD_SDMMC { }; }; + vpu: video-codec@fdb50000 { + compatible = "rockchip,rk3588-vdpu121", "rockchip,rk3568-vpu"; + reg = <0x0 0xfdb50000 0x0 0x800>; + interrupts = ; + interrupt-names = "vdpu"; + clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>; + clock-names = "aclk", "hclk"; + iommus = <&vdpu_mmu>; + power-domains = <&power RK3588_PD_VDPU>; + }; + + vdpu_mmu: iommu@fdb50800 { + compatible = "rockchip,rk3588-iommu", "rockchip,rk3568-iommu"; + reg = <0x0 0xfdb50800 0x0 0x40>; + interrupts = ; + clock-names = "aclk", "iface"; + clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>; + power-domains = <&power RK3588_PD_VDPU>; + #iommu-cells = <0>; + }; + av1d: video-codec@fdc70000 { compatible = "rockchip,rk3588-av1-vpu"; reg = <0x0 0xfdc70000 0x0 0x800>; From patchwork Sat Apr 13 06:46:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jianfeng Liu X-Patchwork-Id: 13628650 Received: from mail-oi1-f172.google.com (mail-oi1-f172.google.com [209.85.167.172]) (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 A77C32C6B3; Sat, 13 Apr 2024 06:46:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712990812; cv=none; b=H5OtAqrbJLP6wtQlQSvtjU4g21/gqEHCBHrAdGStAZ1U4XNR/P9nvn3NGhtynfyDHuhvvOUXADwg0lr3bq//Ltd1fmFyq3xiKk/mtfe5+2uIwO+MZYmtcJ401WTXNVtQx3OL5r7Yc0NnaRr7SCXfeavsAM3YluSEtOm6AdA/ElY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712990812; c=relaxed/simple; bh=TbV8p/Uva02TlZLiHlOrzb+Smt3ZT8NektIy6PK2auE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=AkQQ+61PXBOznjqK+4Vvu+JxTFHLuJZZHpOMpr8evvwkH/qoDCK7zAIQC13cPGHMRa1Z0NMcRhXdFr6qvA1cUg7KZkipHLMcQ8YoIdNo5QSSBXBxPLg7YYdHBWC7Xbq/VxNjj/6BCGWYhiiRDSeBnFKES864gQ9evVASEwthhJ4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=K0EuayUA; arc=none smtp.client-ip=209.85.167.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="K0EuayUA" Received: by mail-oi1-f172.google.com with SMTP id 5614622812f47-3c611c787c1so292600b6e.3; Fri, 12 Apr 2024 23:46:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712990809; x=1713595609; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xbRqb26QfAthS3CJVq90TpB3Bg3AO5IdQEZJltedfdA=; b=K0EuayUAarcO/PRjqHJZgiLe2gHt/heOn03XWA6VYPxwqmjP9kyJWBtJ3emmbkDT1O MQY/iLTOEYkxHAsgLKWWY8cprblj/qUwtexjM0WJb2SCi4b96Ub3xgKsuWL/ncuhmu14 enk+C4nn3CND6BWote4Df7eeDXp6mrph/72aJLDZ3kE82HqfCGsT01CmpumhtlQK3fyf kPwy9AHnaHEGxAdCMFKtKxl6NXxkuebrg0dZoAYYGd8ZUHL1wZh5iT+cyvdU4Z49zY+Q PPMBKvcODJmD3lSNhUltZ8lESRTVqR4Vv6W2Vp9pprchlskvrlDeKbBzHez5zfFN4caG dFNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712990809; x=1713595609; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xbRqb26QfAthS3CJVq90TpB3Bg3AO5IdQEZJltedfdA=; b=RsBSqRFSFyHrYNzFGCaALJ1jPW66D1UbF96YHqgv6w4EIphLzJEHBHNjbYFqSMHGVx IREESZh5qjDzVPXAEANlPDy1i02VY1iQw2CGk2uYzckGgzQHOiJRi3OQzUAay+uwBQ/7 Wa+P83ns2R9ihHljYl5q9HZ7c/G4fhS8YMeQNF8e+mU0ZBecUonbZnd5NUz60u8xuV+N gnB3+3Y5DlIwidbyBUsty9K2j7e0lTXv4BzWBEMEE3UT83QETzGrRoH4ZkK4Qw0x0B9K riImmod3x01GHe6YdSYK9JvdSuiTyGu7pdtbbHNSWld8JAcSEFE6+gygG+EPq3JaURdG PD8A== X-Forwarded-Encrypted: i=1; AJvYcCXP+DQxGdsg449Y6qwxWPjvLOBm0IF6DvqlUIxLUMpqvsXA9n2S4zjSs9+HJYCX/1CP63Hg4ejaGinRy1wRYUVdlqPZwLrq6FjI0FFnRe7/D4IBPZVh0P/Izg9yyE5KteDy9VZ7OBQDnCc= X-Gm-Message-State: AOJu0YyNzGmx+tEN8/rIsxwIzVRYZia0LvVCiGPh30vPSZ6wr0qWJrEf 3dWG3gRVOg1q2Xc1sbs6Y759F+8yY/6U7XMQ4PB+dAvhwWLwPp5njp65S2taFsc= X-Google-Smtp-Source: AGHT+IErS4TJR2V/CrbkM0Eg5mpkObIhcMcSXT4YWodzpv5E2aaVxsMHBZjnG/n/21SFsqBLpCqNMQ== X-Received: by 2002:a05:6808:1a82:b0:3c6:f5ca:86f8 with SMTP id bm2-20020a0568081a8200b003c6f5ca86f8mr3908304oib.27.1712990809391; Fri, 12 Apr 2024 23:46:49 -0700 (PDT) Received: from localhost.localdomain ([221.220.133.103]) by smtp.gmail.com with ESMTPSA id p6-20020a170902780600b001e2a7e90321sm4096693pll.224.2024.04.12.23.46.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 23:46:48 -0700 (PDT) From: Jianfeng Liu To: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Cc: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, heiko@sntech.de, ezequiel@vanguardiasur.com.ar, p.zabel@pengutronix.de, mchehab@kernel.org, sfr@canb.auug.org.au, liujianfeng1994@gmail.com Subject: [PATCH v5 2/2] dt-bindings: media: rockchip-vpu: Add rk3588 vdpu121 compatible string Date: Sat, 13 Apr 2024 14:46:08 +0800 Message-Id: <20240413064608.788561-3-liujianfeng1994@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413064608.788561-1-liujianfeng1994@gmail.com> References: <20240413064608.788561-1-liujianfeng1994@gmail.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add Hantro G1 VPU compatible string for RK3588. RK3588 has the same Hantro G1 ip as RK3568, which are both known as VDPU121 in TRM of RK3568 and RK3588. Signed-off-by: Jianfeng Liu Acked-by: Conor Dooley Reviewed-by: Sebastian Reichel --- Documentation/devicetree/bindings/media/rockchip-vpu.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/media/rockchip-vpu.yaml b/Documentation/devicetree/bindings/media/rockchip-vpu.yaml index c57e1f488..4f667db91 100644 --- a/Documentation/devicetree/bindings/media/rockchip-vpu.yaml +++ b/Documentation/devicetree/bindings/media/rockchip-vpu.yaml @@ -31,6 +31,9 @@ properties: - items: - const: rockchip,rk3228-vpu - const: rockchip,rk3399-vpu + - items: + - const: rockchip,rk3588-vdpu121 + - const: rockchip,rk3568-vpu reg: maxItems: 1