From nobody Wed Dec 17 19:55:22 2025 Received: from mail-m8234.xmail.ntesmail.com (mail-m8234.xmail.ntesmail.com [156.224.82.34]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 06AEF322B; Mon, 16 Dec 2024 03:18:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=156.224.82.34 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734319094; cv=none; b=EheQjXkJJnWGds8bH50y+J31NaavTSVIzUnfBTRIFKqqsV/AdIQptGdGAVTZfCFs8Y9P4EDKxmh+5dgBrb99emOPkR5HivtK39g/3jaEEZsX0GPTMVPJSbMkeqJtM+Gr+kpUUFwHXmVOhDZZHRKVl34x5pRJzB51ZsqITFhf4Uk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734319094; c=relaxed/simple; bh=asLonBVovNBq3n5Dk3J8cOo14qpfLLBbw562biWmf6Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SY7NuMhpvWW/BkGqeqdu0k4KQhPz999HZ2Wtbz/moEKkBOG8Yg/UeY8IH0x7tXnPojzse8IXBnWlezsHni07MY7vATsWoysntlV/rYz05KwR+k5oYm1CrVGDF+yhNVUCBJm2GSLXFpBu599roqjNI+PBwBsX6dm851RBG1lrVI4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rock-chips.com; spf=pass smtp.mailfrom=rock-chips.com; dkim=pass (1024-bit key) header.d=rock-chips.com header.i=@rock-chips.com header.b=ZKoNAhLd; arc=none smtp.client-ip=156.224.82.34 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rock-chips.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rock-chips.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=rock-chips.com header.i=@rock-chips.com header.b="ZKoNAhLd" Received: from zyb-HP-ProDesk-680-G2-MT.. (unknown [58.22.7.114]) by smtp.qiye.163.com (Hmail) with ESMTP id 5cf798fc; Mon, 16 Dec 2024 11:12:54 +0800 (GMT+08:00) From: Damon Ding To: heiko@sntech.de Cc: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, rfoss@kernel.org, vkoul@kernel.org, sebastian.reichel@collabora.com, cristian.ciocaltea@collabora.com, l.stach@pengutronix.de, andy.yan@rock-chips.com, hjc@rock-chips.com, algea.cao@rock-chips.com, kever.yang@rock-chips.com, dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, linux-phy@lists.infradead.org, Damon Ding Subject: [PATCH v2 03/11] drm/rockchip: analogix_dp: Add support for RK3588 Date: Mon, 16 Dec 2024 11:12:17 +0800 Message-Id: <20241216031225.3746-4-damon.ding@rock-chips.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241216031225.3746-1-damon.ding@rock-chips.com> References: <20241216031225.3746-1-damon.ding@rock-chips.com> 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 X-HM-Spam-Status: e1kfGhgUHx5ZQUpXWQgPGg8OCBgUHx5ZQUlOS1dZFg8aDwILHllBWSg2Ly tZV1koWUFDSUNOT01LS0k3V1ktWUFJV1kPCRoVCBIfWUFZGkJOSlZMGBkYS04YSR4ZTE1WFRQJFh oXVRMBExYaEhckFA4PWVdZGBILWUFZTkNVSUlVTFVKSk9ZV1kWGg8SFR0UWUFZT0tIVUpLSUhCSE NVSktLVUpCS0tZBg++ X-HM-Tid: 0a93cd7458fa03a3kunm5cf798fc X-HM-MType: 1 X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6PAg6CCo*DzIJGCE#FEg1QhIQ FykwCTpVSlVKTEhPSEpDTExNSEhCVTMWGhIXVR8aFhQVVR8SFRw7CRQYEFYYExILCFUYFBZFWVdZ EgtZQVlOQ1VJSVVMVUpKT1lXWQgBWUFNSEJDNwY+ DKIM-Signature: a=rsa-sha256; b=ZKoNAhLdkHl2CSZsNUu3n4O7Q08JejjhxBvNFIXgqkOBBOZFUn1gjJk49mLN1w2FS1NOcNbP65ptS2YZ3BstYi4TMkESDDG88jSV4p3sl9AinJj2saTB4urh2NtisqUJdDcCC8cEymnjDQ9SrqXloM0B3/KNdFbzw82kANYX8uQ=; s=default; c=relaxed/relaxed; d=rock-chips.com; v=1; bh=nYxKkptFc3dxYTzG576Dx0zpzQ8tmzoa9Ku9IxlkFwc=; h=date:mime-version:subject:message-id:from; Content-Type: text/plain; charset="utf-8" RK3588 integrates the analogix eDP 1.3 TX controller IP and the HDMI/eDP TX Combo PHY based on a Samsung IP block, and there are also two independent eDP display interface on RK3588 Soc. Add just the basic support for now, i.e. RGB output up to 4K@60Hz, without the tests of audio, PSR and other eDP 1.3 specific features. Signed-off-by: Damon Ding --- Changes in v2: - Add support for the other eDP output edp1 --- .../gpu/drm/rockchip/analogix_dp-rockchip.c | 82 ++++++++++++++++--- include/drm/bridge/analogix_dp.h | 3 +- 2 files changed, 74 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/= drm/rockchip/analogix_dp-rockchip.c index 871606a31ef1..4c9a55776ada 100644 --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c @@ -51,10 +51,12 @@ struct rockchip_grf_reg_field { /** * struct rockchip_dp_chip_data - splite the grf setting of kind of chips * @lcdc_sel: grf register field of lcdc_sel + * @edp_mode: grf register field of edp_mode * @chip_type: specific chip type */ struct rockchip_dp_chip_data { const struct rockchip_grf_reg_field lcdc_sel; + const struct rockchip_grf_reg_field edp_mode; u32 chip_type; }; =20 @@ -134,12 +136,21 @@ static int rockchip_dp_poweron(struct analogix_dp_pla= t_data *plat_data) return ret; } =20 + ret =3D rockchip_grf_field_write(dp->grf, &dp->data->edp_mode, 1); + if (ret !=3D 0) + DRM_DEV_ERROR(dp->dev, "failed to set edp mode %d\n", ret); + return ret; } =20 static int rockchip_dp_powerdown(struct analogix_dp_plat_data *plat_data) { struct rockchip_dp_device *dp =3D pdata_encoder_to_dp(plat_data); + int ret; + + ret =3D rockchip_grf_field_write(dp->grf, &dp->data->edp_mode, 0); + if (ret !=3D 0) + DRM_DEV_ERROR(dp->dev, "failed to set edp mode %d\n", ret); =20 clk_disable_unprepare(dp->pclk); =20 @@ -203,6 +214,10 @@ static void rockchip_dp_drm_encoder_enable(struct drm_= encoder *encoder, struct rockchip_dp_device *dp =3D encoder_to_dp(encoder); struct drm_crtc *crtc; struct drm_crtc_state *old_crtc_state; + struct of_endpoint endpoint; + struct device_node *remote_port, *remote_port_parent; + char name[32]; + u32 port_id; int ret; =20 crtc =3D rockchip_dp_drm_get_new_crtc(encoder, state); @@ -220,13 +235,27 @@ static void rockchip_dp_drm_encoder_enable(struct drm= _encoder *encoder, return; } =20 - ret =3D drm_of_encoder_active_endpoint_id(dp->dev->of_node, encoder); + ret =3D drm_of_encoder_active_endpoint(dp->dev->of_node, encoder, &endpoi= nt); if (ret < 0) return; =20 - DRM_DEV_DEBUG(dp->dev, "vop %s output to dp\n", (ret) ? "LIT" : "BIG"); + remote_port_parent =3D of_graph_get_remote_port_parent(endpoint.local_nod= e); + if (remote_port_parent) { + if (of_get_child_by_name(remote_port_parent, "ports")) { + remote_port =3D of_graph_get_remote_port(endpoint.local_node); + of_property_read_u32(remote_port, "reg", &port_id); + of_node_put(remote_port); + sprintf(name, "%s vp%d", remote_port_parent->full_name, port_id); + } else { + sprintf(name, "%s %s", + remote_port_parent->full_name, endpoint.id ? "vopl" : "vopb"); + } + of_node_put(remote_port_parent); + + DRM_DEV_DEBUG(dp->dev, "%s output to edp\n", name); + } =20 - ret =3D rockchip_grf_field_write(dp->grf, &dp->data->lcdc_sel, ret); + ret =3D rockchip_grf_field_write(dp->grf, &dp->data->lcdc_sel, endpoint.i= d); if (ret !=3D 0) DRM_DEV_ERROR(dp->dev, "Could not write to GRF: %d\n", ret); =20 @@ -396,6 +425,7 @@ static int rockchip_dp_probe(struct platform_device *pd= ev) const struct rockchip_dp_chip_data *dp_data; struct drm_panel *panel =3D NULL; struct rockchip_dp_device *dp; + int id, i; int ret; =20 dp_data =3D of_device_get_match_data(dev); @@ -410,9 +440,22 @@ static int rockchip_dp_probe(struct platform_device *p= dev) if (!dp) return -ENOMEM; =20 + id =3D of_alias_get_id(dev->of_node, "edp"); + if (id < 0) + id =3D 0; + + i =3D 0; + while (is_rockchip(dp_data[i].chip_type)) + i++; + + if (id >=3D i) { + DRM_DEV_ERROR(dev, "invalid edp id: %d\n", id); + return -ENODEV; + } + dp->dev =3D dev; dp->adp =3D ERR_PTR(-ENODEV); - dp->data =3D dp_data; + dp->data =3D &dp_data[id]; dp->plat_data.panel =3D panel; dp->plat_data.dev_type =3D dp->data->chip_type; dp->plat_data.power_on =3D rockchip_dp_poweron; @@ -464,19 +507,38 @@ static int rockchip_dp_resume(struct device *dev) static DEFINE_RUNTIME_DEV_PM_OPS(rockchip_dp_pm_ops, rockchip_dp_suspend, rockchip_dp_resume, NULL); =20 -static const struct rockchip_dp_chip_data rk3399_edp =3D { - .lcdc_sel =3D GRF_REG_FIELD(0x6250, 5, 5), - .chip_type =3D RK3399_EDP, +static const struct rockchip_dp_chip_data rk3399_edp[] =3D { + { + .lcdc_sel =3D GRF_REG_FIELD(0x6250, 5, 5), + .chip_type =3D RK3399_EDP, + }, + { /* sentinel */ } +}; + +static const struct rockchip_dp_chip_data rk3288_dp[] =3D { + { + .lcdc_sel =3D GRF_REG_FIELD(0x025c, 5, 5), + .chip_type =3D RK3288_DP, + }, + { /* sentinel */ } }; =20 -static const struct rockchip_dp_chip_data rk3288_dp =3D { - .lcdc_sel =3D GRF_REG_FIELD(0x025c, 5, 5), - .chip_type =3D RK3288_DP, +static const struct rockchip_dp_chip_data rk3588_edp[] =3D { + { + .edp_mode =3D GRF_REG_FIELD(0x0000, 0, 0), + .chip_type =3D RK3588_EDP, + }, + { + .edp_mode =3D GRF_REG_FIELD(0x0004, 0, 0), + .chip_type =3D RK3588_EDP, + }, + { /* sentinel */ } }; =20 static const struct of_device_id rockchip_dp_dt_ids[] =3D { {.compatible =3D "rockchip,rk3288-dp", .data =3D &rk3288_dp }, {.compatible =3D "rockchip,rk3399-edp", .data =3D &rk3399_edp }, + {.compatible =3D "rockchip,rk3588-edp", .data =3D &rk3588_edp }, {} }; MODULE_DEVICE_TABLE(of, rockchip_dp_dt_ids); diff --git a/include/drm/bridge/analogix_dp.h b/include/drm/bridge/analogix= _dp.h index 6002c5666031..54086cb2d97d 100644 --- a/include/drm/bridge/analogix_dp.h +++ b/include/drm/bridge/analogix_dp.h @@ -15,11 +15,12 @@ enum analogix_dp_devtype { EXYNOS_DP, RK3288_DP, RK3399_EDP, + RK3588_EDP, }; =20 static inline bool is_rockchip(enum analogix_dp_devtype type) { - return type =3D=3D RK3288_DP || type =3D=3D RK3399_EDP; + return type =3D=3D RK3288_DP || type =3D=3D RK3399_EDP || type =3D=3D RK3= 588_EDP; } =20 struct analogix_dp_plat_data { --=20 2.34.1