From nobody Wed Dec 17 03:28:13 2025 Received: from smtpbgbr2.qq.com (smtpbgbr2.qq.com [54.207.22.56]) (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 BFD26323D for ; Mon, 26 May 2025 02:00:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=54.207.22.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748224851; cv=none; b=e/r+jD0iUBFi5YH3/IDYaAFGML7S0izbcB+OPy2bMhrO81yvX00j9on3NKEaQEa173PyRxHr0s1CebdqpOumG5xf1tw57VOCDd8oCXvEg6XZPbVYqAhhEUjtX2ckgVuUrYgBd4cDmo+hlpXkJEJj6XtJwP+9pMWYJA8+lTh5XYU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748224851; c=relaxed/simple; bh=YLlvQENeDiv2i4fpl5NY8uA/5+q6WwMma5ub+G3xzV8=; h=From:To:Cc:Subject:Date:Message-Id; b=VlzmsnvpcDs3REduEkeeSnMNPGTsKUsL+qq6t9BoXSPFI7wz4+u8xeGOwwkbHvRwyo6SvJdjNtwpH6m2NAv4+JaPMG57D+pNc8NptzrlRRVTfXsfWi9g4UwsDVHKIZgrckIuOR2iILwbjg8NrH5olgT7B0/dw11RbgFkksw98mk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=airkyi.com; spf=pass smtp.mailfrom=airkyi.com; dkim=pass (1024-bit key) header.d=airkyi.com header.i=@airkyi.com header.b=l8LPU9oh; arc=none smtp.client-ip=54.207.22.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=airkyi.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=airkyi.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=airkyi.com header.i=@airkyi.com header.b="l8LPU9oh" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=airkyi.com; s=altu2504; t=1748224757; bh=sChjnz3feZFvWyNyBBV/ChTfvU6U/f+UOVHotNV47zs=; h=From:To:Subject:Date:Message-Id; b=l8LPU9ohrxUzo8CKMWaIQgwopRxBybEcjvVcV+zysweakpU8F3DZpStRBRbi/Y/fq ugnD4NO/fvIJNDObPxWWz/m2ntSTzyA1Q7Xa5rex5S0SkzoM6/hplbV0Afw8D93NRz Mj4V2N2yT1Ihm8pIX4dM/6t54vq6l6PQjlD+BeR0= X-QQ-mid: esmtpgz11t1748224755t5a444bdf X-QQ-Originating-IP: YmnDtwGOyJXaeiI+4J0/OlWIfmc02uUidzVxFPmFi9k= Received: from DESKTOP-8BT1A2O.localdomain ( [58.22.7.114]) by bizesmtp.qq.com (ESMTP) with id ; Mon, 26 May 2025 09:59:12 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 11916620477028258212 From: Chaoyi Chen To: Sandy Huang , Heiko Stuebner , Andy Yan , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Cc: dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Chaoyi Chen Subject: [PATCH] drm/rockchip: lvds: Convert to drm bridge Date: Mon, 26 May 2025 09:58:34 +0800 Message-Id: <20250526015834.102-1-kernel@airkyi.com> X-Mailer: git-send-email 2.17.1 X-QQ-SENDSIZE: 520 Feedback-ID: esmtpgz:airkyi.com:qybglogicsvrsz:qybglogicsvrsz4a-0 X-QQ-XMAILINFO: Nec0PqG26E9wcPYeyCpdNquLWbVB0QBfauc3uPvmSzxI3H4iGsgp/ohz TiSe+dCf6mo8kP0xCv5HY4me0+y9I79oBj1G5Xq6Dd4+YE0hHuHeMmRPhx0gVmcPJnR9qLt 9fEwSyd1dnY1hyZcynkTYUUTAwRcbnyBv2f5YsfW2p7ecJSlSa4KzMdQ71cY/4b3E9BLfSm LoTJFw7xrxjzFImtsB+3Pvmydc+VL+jzTlw00I6Oa+L7fAdRj0nhir8lCbXMwXZEKUkVZ+x LSwxoV6I5gPgCEfFQoj3mzAhjY7PlIg1lwkZpLNGD6Z7i2Gi+vgvaqd074clFTRHb4POOy7 SfzXHrLshDQq3t4vZjmvuXi4ZShGWCFUSj3pbOP2dM0hX3qYZC9y8jkPySPpi/gQFQWG3Wj 6Z21u6ZLd9z8Gd09/0pw5SDFJPNOOZu2qvo7He3hQRIStX1/A9I6yvWsjTqgQ2doUqpLJFC g+zWjiEnSTHlzreLun0jxSZ68eL9SYk9tI/xZY7MCBMdKJufeGvMw16veVgX2C1OKRI/iyQ +e07CzASwLx/c/6M2xHbF3pIpZ5D92Dl2xgSICrZmkVGPoqS2iWDVn4VDxqAo8fqfF4m5Ae b+lLcHnybzloPMlqvBykpCZXzQ8uDZo/AzvnP9ohjvwctjtrb7tOOxhy4t/ce6IsPdfOSNo OTVWm22aU7v3S+3voQH61UqcKsxE6jZkHbjtAoqRVo46xNUTbrjUW2PEO8Ed/zpXzttgBtX cEiY+LqRp6c8IPVkJIcUm+vJmUTuF6WUgZ4VWIxCFMRcy36L7fg7Y6ZOWcXXQ/kcllX2A0v D+XuM53BPd9xN4Pl4YUP0KxBgDqTAYLfV7ZuTzYcOkm9eVT+jh/PqCmpJf/f31CELDVGUeb VOtPD2PXr8n0yAXEhiDd0/OPIk7FAM4w3fkj6W/qx0Yk11wTsU40NxGle0VG650CIqNdV8D +r/FL7FR3rfEIzg== X-QQ-XMRINFO: MSVp+SPm3vtS1Vd6Y4Mggwc= X-QQ-RECHKSPAM: 0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Chaoyi Chen Convert it to drm bridge driver, it will be convenient for us to migrate the connector part to the display driver later. Signed-off-by: Chaoyi Chen --- drivers/gpu/drm/rockchip/rockchip_lvds.c | 68 ++++++++++-------------- 1 file changed, 29 insertions(+), 39 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/roc= kchip/rockchip_lvds.c index a673779de3d2..2411260db51d 100644 --- a/drivers/gpu/drm/rockchip/rockchip_lvds.c +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c @@ -56,14 +56,13 @@ struct rockchip_lvds { struct drm_device *drm_dev; struct drm_panel *panel; struct drm_bridge *bridge; - struct drm_connector connector; struct rockchip_encoder encoder; struct dev_pin_info *pins; }; =20 -static inline struct rockchip_lvds *connector_to_lvds(struct drm_connector= *connector) +static inline struct rockchip_lvds *brige_to_lvds(struct drm_bridge *bridg= e) { - return container_of(connector, struct rockchip_lvds, connector); + return (struct rockchip_lvds *)bridge->driver_private; } =20 static inline struct rockchip_lvds *encoder_to_lvds(struct drm_encoder *en= coder) @@ -106,25 +105,21 @@ static inline int rockchip_lvds_name_to_output(const = char *s) return -EINVAL; } =20 -static const struct drm_connector_funcs rockchip_lvds_connector_funcs =3D { - .fill_modes =3D drm_helper_probe_single_connector_modes, - .destroy =3D drm_connector_cleanup, - .reset =3D drm_atomic_helper_connector_reset, - .atomic_duplicate_state =3D drm_atomic_helper_connector_duplicate_state, - .atomic_destroy_state =3D drm_atomic_helper_connector_destroy_state, -}; - -static int rockchip_lvds_connector_get_modes(struct drm_connector *connect= or) +static int +rockchip_lvds_bridge_get_modes(struct drm_bridge *bridge, struct drm_conne= ctor *connector) { - struct rockchip_lvds *lvds =3D connector_to_lvds(connector); + struct rockchip_lvds *lvds =3D brige_to_lvds(bridge); struct drm_panel *panel =3D lvds->panel; =20 return drm_panel_get_modes(panel, connector); } =20 static const -struct drm_connector_helper_funcs rockchip_lvds_connector_helper_funcs =3D= { - .get_modes =3D rockchip_lvds_connector_get_modes, +struct drm_bridge_funcs rockchip_lvds_bridge_funcs =3D { + .atomic_duplicate_state =3D drm_atomic_helper_bridge_duplicate_state, + .atomic_destroy_state =3D drm_atomic_helper_bridge_destroy_state, + .atomic_reset =3D drm_atomic_helper_bridge_reset, + .get_modes =3D rockchip_lvds_bridge_get_modes, }; =20 static int @@ -606,26 +601,23 @@ static int rockchip_lvds_bind(struct device *dev, str= uct device *master, } =20 drm_encoder_helper_add(encoder, lvds->soc_data->helper_funcs); - connector =3D &lvds->connector; =20 if (lvds->panel) { - connector->dpms =3D DRM_MODE_DPMS_OFF; - ret =3D drm_connector_init(drm_dev, connector, - &rockchip_lvds_connector_funcs, - DRM_MODE_CONNECTOR_LVDS); - if (ret < 0) { - drm_err(drm_dev, - "failed to initialize connector: %d\n", ret); + lvds->bridge =3D drm_panel_bridge_add_typed(lvds->panel, DRM_MODE_CONNEC= TOR_LVDS); + if (IS_ERR(lvds->bridge)) { + ret =3D PTR_ERR(lvds->bridge); goto err_free_encoder; } + } =20 - drm_connector_helper_add(connector, - &rockchip_lvds_connector_helper_funcs); - } else { - ret =3D drm_bridge_attach(encoder, lvds->bridge, NULL, - DRM_BRIDGE_ATTACH_NO_CONNECTOR); + if (lvds->bridge) { + lvds->bridge->driver_private =3D lvds; + lvds->bridge->ops =3D DRM_BRIDGE_OP_MODES; + lvds->bridge->funcs =3D &rockchip_lvds_bridge_funcs; + + ret =3D drm_bridge_attach(encoder, lvds->bridge, NULL, DRM_BRIDGE_ATTACH= _NO_CONNECTOR); if (ret) - goto err_free_encoder; + goto err_free_bridge; =20 connector =3D drm_bridge_connector_init(lvds->drm_dev, encoder); if (IS_ERR(connector)) { @@ -633,14 +625,14 @@ static int rockchip_lvds_bind(struct device *dev, str= uct device *master, "failed to initialize bridge connector: %pe\n", connector); ret =3D PTR_ERR(connector); - goto err_free_encoder; + goto err_free_bridge; } - } =20 - ret =3D drm_connector_attach_encoder(connector, encoder); - if (ret < 0) { - drm_err(drm_dev, "failed to attach encoder: %d\n", ret); - goto err_free_connector; + ret =3D drm_connector_attach_encoder(connector, encoder); + if (ret < 0) { + drm_err(drm_dev, "failed to attach encoder: %d\n", ret); + goto err_free_bridge; + } } =20 pm_runtime_enable(dev); @@ -649,8 +641,8 @@ static int rockchip_lvds_bind(struct device *dev, struc= t device *master, =20 return 0; =20 -err_free_connector: - drm_connector_cleanup(connector); +err_free_bridge: + drm_panel_bridge_remove(lvds->bridge); err_free_encoder: drm_encoder_cleanup(encoder); err_put_remote: @@ -670,8 +662,6 @@ static void rockchip_lvds_unbind(struct device *dev, st= ruct device *master, encoder_funcs =3D lvds->soc_data->helper_funcs; encoder_funcs->disable(&lvds->encoder.encoder); pm_runtime_disable(dev); - drm_connector_cleanup(&lvds->connector); - drm_encoder_cleanup(&lvds->encoder.encoder); } =20 static const struct component_ops rockchip_lvds_component_ops =3D { --=20 2.49.0