drm/bridge: tc358767: add link disable function
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Tue, 28 May 2019 08:27:33 +0000 (11:27 +0300)
committerAndrzej Hajda <a.hajda@samsung.com>
Fri, 31 May 2019 13:41:22 +0000 (15:41 +0200)
Currently we have tc_main_link_setup(), which configures and enabled the
link, but we have no counter-part for disabling the link.

Add tc_main_link_disable, and rename tc_main_link_setup to
tc_main_link_enable.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190528082747.3631-11-tomi.valkeinen@ti.com
drivers/gpu/drm/bridge/tc358767.c

index 4697567..2323a22 100644 (file)
@@ -822,7 +822,7 @@ err:
        return ret;
 }
 
-static int tc_main_link_setup(struct tc_data *tc)
+static int tc_main_link_enable(struct tc_data *tc)
 {
        struct drm_dp_aux *aux = &tc->aux;
        struct device *dev = tc->dev;
@@ -837,6 +837,8 @@ static int tc_main_link_setup(struct tc_data *tc)
        if (!tc->mode)
                return -EINVAL;
 
+       dev_dbg(tc->dev, "link enable\n");
+
        tc_write(DP0_SRCCTRL, tc_srcctrl(tc));
        /* SSCG and BW27 on DP1 must be set to the same as on DP0 */
        tc_write(DP1_SRCCTRL,
@@ -1006,6 +1008,20 @@ err:
        return ret;
 }
 
+static int tc_main_link_disable(struct tc_data *tc)
+{
+       int ret;
+
+       dev_dbg(tc->dev, "link disable\n");
+
+       tc_write(DP0_SRCCTRL, 0);
+       tc_write(DP0CTL, 0);
+
+       return 0;
+err:
+       return ret;
+}
+
 static int tc_stream_enable(struct tc_data *tc)
 {
        int ret;
@@ -1084,15 +1100,16 @@ static void tc_bridge_enable(struct drm_bridge *bridge)
        struct tc_data *tc = bridge_to_tc(bridge);
        int ret;
 
-       ret = tc_main_link_setup(tc);
+       ret = tc_main_link_enable(tc);
        if (ret < 0) {
-               dev_err(tc->dev, "main link setup error: %d\n", ret);
+               dev_err(tc->dev, "main link enable error: %d\n", ret);
                return;
        }
 
        ret = tc_stream_enable(tc);
        if (ret < 0) {
                dev_err(tc->dev, "main link stream start error: %d\n", ret);
+               tc_main_link_disable(tc);
                return;
        }
 
@@ -1109,6 +1126,10 @@ static void tc_bridge_disable(struct drm_bridge *bridge)
        ret = tc_stream_disable(tc);
        if (ret < 0)
                dev_err(tc->dev, "main link stream stop error: %d\n", ret);
+
+       ret = tc_main_link_disable(tc);
+       if (ret < 0)
+               dev_err(tc->dev, "main link disable error: %d\n", ret);
 }
 
 static void tc_bridge_post_disable(struct drm_bridge *bridge)