Message ID | 20231211115547.1784587-1-andyshrk@163.com |
---|---|
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6988062vqy; Mon, 11 Dec 2023 03:57:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IFW4NKR7URcrtLgDfJztGNiFHin7fXFH70MB+vwL4Vo6k/YoSSVecDXEmJhQetXJtsoC7eE X-Received: by 2002:a05:6a00:14c3:b0:6ce:2757:7858 with SMTP id w3-20020a056a0014c300b006ce27577858mr6532534pfu.19.1702295832424; Mon, 11 Dec 2023 03:57:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702295832; cv=none; d=google.com; s=arc-20160816; b=X6864njSR1+EIwuagIkG2FwlI1jAfMtV54pFEnXXigqdzJqtFuaHQ2aaxpLvVTjxfy ykJoqjyaRqvn5aojqHwAGJ6Bbf3vOzHTpk2KkNasoZmstgtooqaHi343ya6Mt4EKNmWH U8ZfYDV69w3useeTQ9IWGLs4yFp+xcbKsTjhQfHvJeHDCnK0RC0B7SOUrHIXVmYXUvc2 60XTeh8z/hNnFDgRTnWQZbfKm0GuiyKjbFrQtkd6GbkMbzpUy6YFYDX40tuPqVaR+0js pyg5IGcOyIr3z6w4UXTJF+ICEquFxye2/NkI80baFMTJHF5mQq1oZ5hlKh6G04MFCeaM UWWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=WO61aesvdIrfOJiPmjc5HQbTct5uc8fehvU/uJHIHjc=; fh=UxFpKtBK5VEiehKMA7YEJ/g9njmupgYZNYvE1WeoN9M=; b=eqfNAjujAu55ThWkRBmdzY8zHQw+BkQALDGoRFyb4CPUTZ7vLkNmMtzDXWQZCVqWzu 5lGbPcKb/sF1fyXsASrkg0Opqyh2XQnSLUZOyYHOEDRNbkL8zFb8HNfqnFjqSeJ+/f8u 5aAL5VJV4msl0NQm2CVZih5/fDiIJ2gScePNypIRUmvZsgbrBUPNV4GyNIV8Aqnm1dqS 3XuTISFzc2T/+j0Lo65XvzA8twujdeNs98Dlr7wJfxsohd8NcH9R4Wn76ZZaH1s4mY2b jwueJ/u0+7POiCNrOl+SdG4ugVxIapCcAGUQoeRlUqKw19DZovf8hw6tO+lUNSRSF3uP AB6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=Kr7VqLe3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id u18-20020a656712000000b005c621de522csi6088117pgf.361.2023.12.11.03.57.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 03:57:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=Kr7VqLe3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 8B10F807E469; Mon, 11 Dec 2023 03:57:09 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234765AbjLKL4u (ORCPT <rfc822;dexuan.linux@gmail.com> + 99 others); Mon, 11 Dec 2023 06:56:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234467AbjLKL4s (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 11 Dec 2023 06:56:48 -0500 Received: from m15.mail.163.com (m15.mail.163.com [45.254.50.219]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id DB0E6120; Mon, 11 Dec 2023 03:56:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=WO61a esvdIrfOJiPmjc5HQbTct5uc8fehvU/uJHIHjc=; b=Kr7VqLe3hyI+7j4iOyjgj xWJH+0eU5dKwOuJcbbZI074PCOAWuhrSNgtHUhyr9I5cTSFpzjxOuTEk/nXi4+QQ caLHp3QO6wqTbFAi2v1Bfa4OGS7cnbrx9DroVBmBKRKy+sIYJqSyb8xfpTR2Noco /RCMujaZshtK3pAPJYNbi0= Received: from ProDesk.. (unknown [58.22.7.114]) by zwqz-smtp-mta-g1-3 (Coremail) with SMTP id _____wAXlwvH+HZlkOA4CQ--.21094S2; Mon, 11 Dec 2023 19:55:55 +0800 (CST) From: Andy Yan <andyshrk@163.com> To: heiko@sntech.de Cc: hjc@rock-chips.com, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org, devicetree@vger.kernel.org, sebastian.reichel@collabora.com, kever.yang@rock-chips.com, chris.obbard@collabora.com, Andy Yan <andy.yan@rock-chips.com> Subject: [PATCH v5 00/16] Add VOP2 support on rk3588 Date: Mon, 11 Dec 2023 19:55:47 +0800 Message-Id: <20231211115547.1784587-1-andyshrk@163.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: _____wAXlwvH+HZlkOA4CQ--.21094S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxCrW7tr4UAr4UXF43tF4xJFb_yoWrZF45p3 95Cry5XrWxCFW2qrs7tw18ArWft3ZrAay7Gws3G3ZxZ3Z3KF1UKwnI93Z5Zr9rWr1xZFy2 kF45J34jgr42vr7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jOXo7UUUUU= X-Originating-IP: [58.22.7.114] X-CM-SenderInfo: 5dqg52xkunqiywtou0bp/xtbBEAxDXmVOA42xGgAAsP X-Spam-Status: No, score=0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_SORBS_WEB, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Mon, 11 Dec 2023 03:57:09 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784986554514804771 X-GMAIL-MSGID: 1784986554514804771 |
Series |
Add VOP2 support on rk3588
|
|
Message
Andy Yan
Dec. 11, 2023, 11:55 a.m. UTC
From: Andy Yan <andy.yan@rock-chips.com>
This patch sets aims at enable the VOP2 support on rk3588.
Main feature of VOP2 on rk3588:
Four video ports:
VP0 Max 4096x2160
VP1 Max 4096x2160
VP2 Max 4096x2160
VP3 Max 2048x1080
4 4K Cluster windows with AFBC/line RGB and AFBC-only YUV support
4 4K Esmart windows with line RGB/YUV support
The current version support all the 8 windows with all the suppported
plane format.
And we don't have a upstreamed encoder/connector(HDMI/DP) for rk3588
yet, Cristian from collabora is working on adding upstream support for
HDMI on rk3588.
My current test(1080P/4KP60) is runing with a HDMI driver pick from
downstream bsp kernel.
A branch based on linux-6.7 rc4 containing all the series and
HDMI driver(not compatible with mainline rk3568 hdmi) picked
from downstream bsp kernel is available [0].
[0]https://github.com/andyshrk/linux/commits/rk3588-vop2-upstream-linux-6.7-rc4-2023-12-07
Changes in v5:
- remove unused dts property
- move blank line below the status=disabled in vop dt node
- split iommu dt binding patch from this series
Changes in v4:
- drop redundant description.
- use full stop at all the description's end.
- address Krzysztof's review in v3
- keep all VOP2_FEATURE_HAS_xxx macros increase in order.
- check NULL pointer at right place
- fix the index of fb->obj
- drop explicitly cast of void pointer
- make the register dump code as a common function.
Changes in v3:
- split from the vop2 driver patch
- put bool variable yuv_overlay next to other bool variable
- define macro for RK3568_OVL_CTRL__YUV_MODE
- just write RK3568_OVL_CTRL register once in function
vop2_setup_layer_mixer
- constrain properties in allOf:if:then
- some description updates
- change the subject as Krzysztof suggested, and add his ACK
- add braces for x in macro vop2_output_if_is_yyy(x)
- clear the bits of a mask before setting it in rk3588_set_intf_mux
- add more comments.
- put regs dump info in vop2_data
Changes in v2:
- fix errors when running 'make DT_CHECKER_FLAGS=-m dt_binding_check'
- split form vop driver patch
- add rk3588_ prefix for functions which are rk3588 only
- make some calculation as fixed value and keep calculation formula as
comment
- check return value for some cru calculation functions.
- check return value for syscon_regmap_lookup_by_phandle
- add NV20/NV30 for esmart plane
Andy Yan (16):
drm/rockchip: move output interface related definition to
rockchip_drm_drv.h
Revert "drm/rockchip: vop2: Use regcache_sync() to fix suspend/resume"
drm/rockchip: vop2: set half_block_en bit in all mode
drm/rockchip: vop2: clear afbc en and transform bit for cluster window
at linear mode
drm/rockchip: vop2: Add write mask for VP config done
drm/rockchip: vop2: Set YUV/RGB overlay mode
drm/rockchip: vop2: set bg dly and prescan dly at vop2_post_config
drm/rockchip: vop2: rename grf to sys_grf
dt-bindings: soc: rockchip: add rk3588 vop/vo syscon
dt-bindings: display: vop2: Add rk3588 support
dt-bindings: rockchip,vop2: Add more endpoint definition
drm/rockchip: vop2: Add support for rk3588
drm/rockchip: vop2: rename VOP_FEATURE_OUTPUT_10BIT to
VOP2_VP_FEATURE_OUTPUT_10BIT
drm/rockchip: vop2: Add debugfs support
arm64: dts: rockchip: Add vop on rk3588
MAINTAINERS: Add myself as a reviewer for rockchip drm
.../display/rockchip/rockchip-vop2.yaml | 100 ++-
.../devicetree/bindings/soc/rockchip/grf.yaml | 2 +
MAINTAINERS | 1 +
arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 83 ++
.../gpu/drm/rockchip/analogix_dp-rockchip.c | 1 -
drivers/gpu/drm/rockchip/cdn-dp-core.c | 1 -
.../gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 1 -
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 1 -
drivers/gpu/drm/rockchip/inno_hdmi.c | 1 -
drivers/gpu/drm/rockchip/rk3066_hdmi.c | 1 -
drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 18 +
drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 12 +-
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 761 +++++++++++++++++-
drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 111 ++-
drivers/gpu/drm/rockchip/rockchip_lvds.c | 1 -
drivers/gpu/drm/rockchip/rockchip_rgb.c | 1 -
drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 414 +++++++++-
include/dt-bindings/soc/rockchip,vop2.h | 4 +
18 files changed, 1420 insertions(+), 94 deletions(-)
Comments
On Mon, 11 Dec 2023 19:55:47 +0800, Andy Yan wrote: > From: Andy Yan <andy.yan@rock-chips.com> > > This patch sets aims at enable the VOP2 support on rk3588. > > Main feature of VOP2 on rk3588: > Four video ports: > VP0 Max 4096x2160 > VP1 Max 4096x2160 > VP2 Max 4096x2160 > VP3 Max 2048x1080 > > [...] Applied, thanks! [09/16] dt-bindings: soc: rockchip: add rk3588 vop/vo syscon commit: 1a648f8b7994dca4c323911607cf28d1eb44c198 Best regards,
On Mon, 11 Dec 2023 19:55:47 +0800, Andy Yan wrote: > From: Andy Yan <andy.yan@rock-chips.com> > > This patch sets aims at enable the VOP2 support on rk3588. > > Main feature of VOP2 on rk3588: > Four video ports: > VP0 Max 4096x2160 > VP1 Max 4096x2160 > VP2 Max 4096x2160 > VP3 Max 2048x1080 > > [...] Applied, thanks! [01/16] drm/rockchip: move output interface related definition to rockchip_drm_drv.h commit: 8c8546546f256f834e9c7cab48e5946df340d1a8 [02/16] Revert "drm/rockchip: vop2: Use regcache_sync() to fix suspend/resume" commit: 81a06f1d02e588cfa14c5e5953d9dc50b1d404be [03/16] drm/rockchip: vop2: set half_block_en bit in all mode commit: bebad6bd4fbdc448ad3b337ad281b813e68f6f53 [04/16] drm/rockchip: vop2: clear afbc en and transform bit for cluster window at linear mode commit: 20529a68307feed00dd3d431d3fff0572616b0f2 [05/16] drm/rockchip: vop2: Add write mask for VP config done commit: d1f8face0fc1298c88ef4a0479c3027b46ca2c77 [06/16] drm/rockchip: vop2: Set YUV/RGB overlay mode commit: dd49ee4614cfb0b1f627c4353b60cecfe998a374 [07/16] drm/rockchip: vop2: set bg dly and prescan dly at vop2_post_config commit: 075a5b3969becb1ebc2f1d4fa1a1fe9163679273 [08/16] drm/rockchip: vop2: rename grf to sys_grf commit: c408af1afc4b74ea6df69e0313be97f1f83e981a Best regards,
On Mon, 11 Dec 2023 19:55:47 +0800, Andy Yan wrote: > From: Andy Yan <andy.yan@rock-chips.com> > > This patch sets aims at enable the VOP2 support on rk3588. > > Main feature of VOP2 on rk3588: > Four video ports: > VP0 Max 4096x2160 > VP1 Max 4096x2160 > VP2 Max 4096x2160 > VP3 Max 2048x1080 > > [...] Applied, thanks! [10/16] dt-bindings: display: vop2: Add rk3588 support commit: 4ccdc92c1fea732fac8f3438d6288719055fa141 [11/16] dt-bindings: rockchip,vop2: Add more endpoint definition commit: dc7226acacc6502291446f9e33cf96246ec49a30 [12/16] drm/rockchip: vop2: Add support for rk3588 commit: 5a028e8f062fc862f051f8e62a0d5a1abac91955 [13/16] drm/rockchip: vop2: rename VOP_FEATURE_OUTPUT_10BIT to VOP2_VP_FEATURE_OUTPUT_10BIT commit: 9d7fe7704d534c2d043aff2987f10671a8b4373d [16/16] MAINTAINERS: Add myself as a reviewer for rockchip drm commit: 6c3ab21f37a97a868193ccbeb8a492e51210ff31 I skipped the debugfs patch for now, as I need to look at that separately and of course the dts patch as that needs to wait for iommu maintainers to pick up the binding addition. Best regards,
Hi Heiko: On 12/13/23 22:46, Heiko Stuebner wrote: > On Mon, 11 Dec 2023 19:55:47 +0800, Andy Yan wrote: >> From: Andy Yan <andy.yan@rock-chips.com> >> >> This patch sets aims at enable the VOP2 support on rk3588. >> >> Main feature of VOP2 on rk3588: >> Four video ports: >> VP0 Max 4096x2160 >> VP1 Max 4096x2160 >> VP2 Max 4096x2160 >> VP3 Max 2048x1080 >> >> [...] > > Applied, thanks! > > [10/16] dt-bindings: display: vop2: Add rk3588 support > commit: 4ccdc92c1fea732fac8f3438d6288719055fa141 > [11/16] dt-bindings: rockchip,vop2: Add more endpoint definition > commit: dc7226acacc6502291446f9e33cf96246ec49a30 > [12/16] drm/rockchip: vop2: Add support for rk3588 > commit: 5a028e8f062fc862f051f8e62a0d5a1abac91955 > [13/16] drm/rockchip: vop2: rename VOP_FEATURE_OUTPUT_10BIT to VOP2_VP_FEATURE_OUTPUT_10BIT > commit: 9d7fe7704d534c2d043aff2987f10671a8b4373d > [16/16] MAINTAINERS: Add myself as a reviewer for rockchip drm > commit: 6c3ab21f37a97a868193ccbeb8a492e51210ff31 > > > I skipped the debugfs patch for now, as I need to look at that separately > and of course the dts patch as that needs to wait for iommu maintainers > to pick up the binding addition. That's fine. Thanks for picking these series. > > > Best regards,
On Mon, 11 Dec 2023 19:55:47 +0800, Andy Yan wrote: > From: Andy Yan <andy.yan@rock-chips.com> > > This patch sets aims at enable the VOP2 support on rk3588. > > Main feature of VOP2 on rk3588: > Four video ports: > VP0 Max 4096x2160 > VP1 Max 4096x2160 > VP2 Max 4096x2160 > VP3 Max 2048x1080 > > [...] Applied, thanks! [15/16] arm64: dts: rockchip: Add vop on rk3588 commit: d895dbef3f3a31ab50491bb48552e798cf555987 Best regards,