drm/bridge/ti-sn65dsi86: (Un)register aux device on bridge attach/detach

Since we're about to add a back-pointer to drm_dev in drm_dp_aux, let's
move the AUX adapter registration to the first point where we know which
DRM device we'll be working with - when the drm_bridge is attached.
Likewise, we unregister the AUX adapter on bridge detachment by adding a
ti_sn_bridge_detach() callback.

Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210219215326.2227596-7-lyude@redhat.com

diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c
index f27306c51e4d919dfc8b9a1dba5c10bd4c743009..88df4dd0f39d2dd04ddab55d2013645c982d7d2f 100644 (file)
--- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c
+++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c
@@ -362,12 +362,18 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge,
                return -EINVAL;
        }
 
+       ret = drm_dp_aux_register(&pdata->aux);
+       if (ret < 0) {
+               drm_err(bridge->dev, "Failed to register DP AUX channel: %d\n", ret);
+               return ret;
+       }
+
        ret = drm_connector_init(bridge->dev, &pdata->connector,
                                 &ti_sn_bridge_connector_funcs,
                                 DRM_MODE_CONNECTOR_eDP);
        if (ret) {
                DRM_ERROR("Failed to initialize connector with drm\n");
-               return ret;
+               goto err_conn_init;
        }
 
        drm_connector_helper_add(&pdata->connector,
@@ -424,9 +430,16 @@ err_dsi_attach:
        mipi_dsi_device_unregister(dsi);
 err_dsi_host:
        drm_connector_cleanup(&pdata->connector);
+err_conn_init:
+       drm_dp_aux_unregister(&pdata->aux);
        return ret;
 }
 
+static void ti_sn_bridge_detach(struct drm_bridge *bridge)
+{
+       drm_dp_aux_unregister(&bridge_to_ti_sn_bridge(bridge)->aux);
+}
+
 static void ti_sn_bridge_disable(struct drm_bridge *bridge)
 {
        struct ti_sn_bridge *pdata = bridge_to_ti_sn_bridge(bridge);
@@ -863,6 +876,7 @@ static void ti_sn_bridge_post_disable(struct drm_bridge *bridge)
 
 static const struct drm_bridge_funcs ti_sn_bridge_funcs = {
        .attach = ti_sn_bridge_attach,
+       .detach = ti_sn_bridge_detach,
        .pre_enable = ti_sn_bridge_pre_enable,
        .enable = ti_sn_bridge_enable,
        .disable = ti_sn_bridge_disable,
@@ -1287,7 +1301,7 @@ static int ti_sn_bridge_probe(struct i2c_client *client,
        pdata->aux.name = "ti-sn65dsi86-aux";
        pdata->aux.dev = pdata->dev;
        pdata->aux.transfer = ti_sn_aux_transfer;
-       drm_dp_aux_register(&pdata->aux);
+       drm_dp_aux_init(&pdata->aux);
 
        pdata->bridge.funcs = &ti_sn_bridge_funcs;
        pdata->bridge.of_node = client->dev.of_node;