drm/rockchip: lvds: Convert to drm bridge

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 <chaoyi.chen@rock-chips.com>
[on a not-upstream px30 board with lvds display]
Tested-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://lore.kernel.org/r/20250526015834.102-1-kernel@airkyi.com

diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/rockchip/rockchip_lvds.c
index a673779de3d2ebcc67eb9ee2d4ba98ebd537b8a4..2411260db51d73cbfe5c04f04061f08ecdabfd51 100644 (file)
--- 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;
 };
 
-static inline struct rockchip_lvds *connector_to_lvds(struct drm_connector *connector)
+static inline struct rockchip_lvds *brige_to_lvds(struct drm_bridge *bridge)
 {
-       return container_of(connector, struct rockchip_lvds, connector);
+       return (struct rockchip_lvds *)bridge->driver_private;
 }
 
 static inline struct rockchip_lvds *encoder_to_lvds(struct drm_encoder *encoder)
@@ -106,25 +105,21 @@ static inline int rockchip_lvds_name_to_output(const char *s)
        return -EINVAL;
 }
 
-static const struct drm_connector_funcs rockchip_lvds_connector_funcs = {
-       .fill_modes = drm_helper_probe_single_connector_modes,
-       .destroy = drm_connector_cleanup,
-       .reset = drm_atomic_helper_connector_reset,
-       .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
-       .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
-};
-
-static int rockchip_lvds_connector_get_modes(struct drm_connector *connector)
+static int
+rockchip_lvds_bridge_get_modes(struct drm_bridge *bridge, struct drm_connector *connector)
 {
-       struct rockchip_lvds *lvds = connector_to_lvds(connector);
+       struct rockchip_lvds *lvds = brige_to_lvds(bridge);
        struct drm_panel *panel = lvds->panel;
 
        return drm_panel_get_modes(panel, connector);
 }
 
 static const
-struct drm_connector_helper_funcs rockchip_lvds_connector_helper_funcs = {
-       .get_modes = rockchip_lvds_connector_get_modes,
+struct drm_bridge_funcs rockchip_lvds_bridge_funcs = {
+       .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,
+       .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state,
+       .atomic_reset = drm_atomic_helper_bridge_reset,
+       .get_modes = rockchip_lvds_bridge_get_modes,
 };
 
 static int
@@ -606,26 +601,23 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master,
        }
 
        drm_encoder_helper_add(encoder, lvds->soc_data->helper_funcs);
-       connector = &lvds->connector;
 
        if (lvds->panel) {
-               connector->dpms = DRM_MODE_DPMS_OFF;
-               ret = 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 = drm_panel_bridge_add_typed(lvds->panel, DRM_MODE_CONNECTOR_LVDS);
+               if (IS_ERR(lvds->bridge)) {
+                       ret = PTR_ERR(lvds->bridge);
                        goto err_free_encoder;
                }
+       }
 
-               drm_connector_helper_add(connector,
-                                        &rockchip_lvds_connector_helper_funcs);
-       } else {
-               ret = drm_bridge_attach(encoder, lvds->bridge, NULL,
-                                       DRM_BRIDGE_ATTACH_NO_CONNECTOR);
+       if (lvds->bridge) {
+               lvds->bridge->driver_private = lvds;
+               lvds->bridge->ops = DRM_BRIDGE_OP_MODES;
+               lvds->bridge->funcs = &rockchip_lvds_bridge_funcs;
+
+               ret = drm_bridge_attach(encoder, lvds->bridge, NULL, DRM_BRIDGE_ATTACH_NO_CONNECTOR);
                if (ret)
-                       goto err_free_encoder;
+                       goto err_free_bridge;
 
                connector = drm_bridge_connector_init(lvds->drm_dev, encoder);
                if (IS_ERR(connector)) {
@@ -633,14 +625,14 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master,
                                "failed to initialize bridge connector: %pe\n",
                                connector);
                        ret = PTR_ERR(connector);
-                       goto err_free_encoder;
+                       goto err_free_bridge;
                }
-       }
 
-       ret = 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 = drm_connector_attach_encoder(connector, encoder);
+               if (ret < 0) {
+                       drm_err(drm_dev, "failed to attach encoder: %d\n", ret);
+                       goto err_free_bridge;
+               }
        }
 
        pm_runtime_enable(dev);
@@ -649,8 +641,8 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master,
 
        return 0;
 
-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, struct device *master,
        encoder_funcs = 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);
 }
 
 static const struct component_ops rockchip_lvds_component_ops = {