Received: by 2002:a05:7412:40d:b0:e2:908c:2ebd with SMTP id 13csp1063527rdf; Wed, 22 Nov 2023 04:54:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IHyXNrMC1prIQTXhx4HbqdjVzcs6gHhldxgDYmUmoFZh38pYIEslUJpD94e8bahDM+CiZ9M X-Received: by 2002:a05:6e02:118c:b0:34f:efde:ec7c with SMTP id y12-20020a056e02118c00b0034fefdeec7cmr2030373ili.28.1700657672594; Wed, 22 Nov 2023 04:54:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700657672; cv=none; d=google.com; s=arc-20160816; b=nuuJfePGFtyhpyLcTze5UVB9HNyeohsKzlIpVfr/AyNsaWRSDWskwIJksXI4rDNfpT 8zo9216gOP3shcXABULqpkSOFJpdctxJIee/ZGGkbmF9BFePM7n4hryh+wSwVLuP27Up iDPIO1JSqkSTwbpXeMxp5b/nuhEsYR7G3pe1zMMyjltbimPHT8BbW/HuVnMz0P/qPqw8 vHvyjitI6V95oQIxS1jM2HxLQ58gAlpBC+pdZ/fOMFNVA1ak56wlaAujWHxHAco6jvZa NAVr+7YTIohndWlbIjzUhvAxeJnBe575qNqLbQWZxT/2PScA5B5RC88jTK2y1UN8x5/4 mcrg== 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=ilNby/QAqRj73jJ/nJZxXwIxgE03/s4paCuCwX+Dnos=; fh=cjsv5ohN1TaMP82Yqeh0WKQ1fJXsn/LNnakMe8VYEy4=; b=bH3SEUjYEAdKNg9m1VL6k0sXzpvw/zqytDhxACoDQCgp3N+3UINVVl+CTqSiC5XJex ZqmM6vYgu7ssiSPpzdxuHCXDjJMAbPteT9Ktgdrzsf92k8e/fPD89CWkwd+MLuUXGJQl nkWWBQY5+fHWYjrUA56Hiqzf6GPl0JuM5SNx0JKHbF+T87nk6ozM6Oy8MI6XYF6SAH9I PjbU+L15USPxsuw+VcnRZsfrBU06Zjysi14jdElST50GovoLx5MiT2iFDlLmhvzONPul 5uTgJkSp1fJ7nOYZluQaE3qEOHDKRNIcP2izQQLDh8hFTXUUwqoW1mu3000HGVZFb1CU eUYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=LTLhlE9R; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Return-Path: Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id k17-20020a056a00135100b006cb6cc08e3fsi8809396pfu.387.2023.11.22.04.54.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Nov 2023 04:54:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=LTLhlE9R; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (Postfix) with ESMTP id EFDE5820D5CB; Wed, 22 Nov 2023 04:54:29 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343864AbjKVMyW (ORCPT + 99 others); Wed, 22 Nov 2023 07:54:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343654AbjKVMyV (ORCPT ); Wed, 22 Nov 2023 07:54:21 -0500 Received: from m12.mail.163.com (m12.mail.163.com [220.181.12.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 93C6D97; Wed, 22 Nov 2023 04:54:16 -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=ilNby /QAqRj73jJ/nJZxXwIxgE03/s4paCuCwX+Dnos=; b=LTLhlE9ReggCMZFRPUHJu V194d46IlMwgwtO3gaDGksxSAQb2E1+uVdNa1Hj6voML6fE+BDI2pRRx/3AHyjls X3tzBZv2YZQkgcCLd3aRqYYpj0I0QNXEU21odHVhdQ9PQOra/6KDuAXI1Hzbskgd s5IncOYQ1SW8ec0GNHndM0= Received: from ProDesk.. (unknown [58.22.7.114]) by zwqz-smtp-mta-g5-0 (Coremail) with SMTP id _____wDXXym9+V1lS1OxCA--.53034S2; Wed, 22 Nov 2023 20:53:23 +0800 (CST) From: Andy Yan 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, s.hauer@pengutronix.de, Andy Yan Subject: [PATCH v2 00/12] Add VOP2 support on rk3588 Date: Wed, 22 Nov 2023 20:53:16 +0800 Message-Id: <20231122125316.3454268-1-andyshrk@163.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: _____wDXXym9+V1lS1OxCA--.53034S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxCrW7tr4UArW3uryDCrWxJFb_yoW5CrWkpw s5Cry5ZrWxCFW2qrn3twn5CrWft3ZrAayfKws3GasIv3WfKF1UKwnxW3Z5Z3sxWw17ZFy2 kr4UJ347Gr42vr7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jrcTPUUUUU= X-Originating-IP: [58.22.7.114] X-CM-SenderInfo: 5dqg52xkunqiywtou0bp/1tbiEAYwXl8YMqat1gAAsQ 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 lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Wed, 22 Nov 2023 04:54:30 -0800 (PST) From: Andy Yan 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 is runing with a HDMI driver pick from downstream bsp kernel. A branch based on linux-6.7 rc2 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/tree/rk3588-vop2-upstream-linux-6.7-rc2-2023-11-22 Changes in v2: - fix errors when running 'make DT_CHECKER_FLAGS=-m dt_binding_check' - split dt-bindings 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 (12): 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: Set YUV/RGB overlay mode 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: soc: vop2: Add more endpoint definition drm/rockchip: vop2: Add support for rk3588 drm/rockchip: vop2: Add debugfs support arm64: dts: rockchip: Add vop on rk3588 .../display/rockchip/rockchip-vop2.yaml | 27 + .../devicetree/bindings/soc/rockchip/grf.yaml | 2 + arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 96 ++ .../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 | 845 +++++++++++++++++- drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 82 +- drivers/gpu/drm/rockchip/rockchip_lvds.c | 1 - drivers/gpu/drm/rockchip/rockchip_rgb.c | 1 - drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 221 +++++ include/dt-bindings/soc/rockchip,vop2.h | 4 + 17 files changed, 1257 insertions(+), 58 deletions(-) -- 2.34.1