drm/bridge/synopsys: dsi: add dual-dsi support

Allow to also drive a slave dw-mipi-dsi controller in a dual-dsi
setup. This will require additional implementation-specific
code to look up the slave instance and do specific setup.
Also will probably need code in the specific crtcs as dual-dsi
does not equal two separate dsi outputs.

To activate, the implementation-specific code should set the slave
using dw_mipi_dsi_set_slave() before calling __dw_mipi_dsi_bind().

v2:
- expect real interface number of lanes
- keep links to both master and slave
v3:
- remove unneeded separate variables
- remove unneeded second slave settings
- disable slave before master
- lane-sum calculation comments

Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Tested-by: Philippe Cornu <philippe.cornu@st.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/20181001123845.11818-7-heiko@sntech.de

diff --git a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c
index 3962e5d84e1e78145d1e8c43f977f0891b36ed7f..2f4b145b73af23d7db14845a111c5fc9d4f27736 100644 (file)
--- a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c
@@ -230,9 +230,20 @@ struct dw_mipi_dsi {
        u32 format;
        unsigned long mode_flags;
 
+       struct dw_mipi_dsi *master; /* dual-dsi master ptr */
+       struct dw_mipi_dsi *slave; /* dual-dsi slave ptr */
+
        const struct dw_mipi_dsi_plat_data *plat_data;
 };
 
+/*
+ * Check if either a link to a master or slave is present
+ */
+static inline bool dw_mipi_is_dual_mode(struct dw_mipi_dsi *dsi)
+{
+       return dsi->slave || dsi->master;
+}
+
 /*
  * The controller should generate 2 frames before
  * preparing the peripheral.
@@ -456,10 +467,17 @@ static ssize_t dw_mipi_dsi_host_transfer(struct mipi_dsi_host *host,
        }
 
        dw_mipi_message_config(dsi, msg);
+       if (dsi->slave)
+               dw_mipi_message_config(dsi->slave, msg);
 
        ret = dw_mipi_dsi_write(dsi, &packet);
        if (ret)
                return ret;
+       if (dsi->slave) {
+               ret = dw_mipi_dsi_write(dsi->slave, &packet);
+               if (ret)
+                       return ret;
+       }
 
        if (msg->rx_buf && msg->rx_len) {
                ret = dw_mipi_dsi_read(dsi, msg);
@@ -598,7 +616,11 @@ static void dw_mipi_dsi_video_packet_config(struct dw_mipi_dsi *dsi,
         * DSI_VNPCR.NPSIZE... especially because this driver supports
         * non-burst video modes, see dw_mipi_dsi_video_mode_config()...
         */
-       dsi_write(dsi, DSI_VID_PKT_SIZE, VID_PKT_SIZE(mode->hdisplay));
+
+       dsi_write(dsi, DSI_VID_PKT_SIZE,
+                      dw_mipi_is_dual_mode(dsi) ?
+                               VID_PKT_SIZE(mode->hdisplay / 2) :
+                               VID_PKT_SIZE(mode->hdisplay));
 }
 
 static void dw_mipi_dsi_command_mode_config(struct dw_mipi_dsi *dsi)
@@ -770,24 +792,43 @@ static void dw_mipi_dsi_bridge_post_disable(struct drm_bridge *bridge)
         */
        dsi->panel_bridge->funcs->post_disable(dsi->panel_bridge);
 
+       if (dsi->slave) {
+               dw_mipi_dsi_disable(dsi->slave);
+               clk_disable_unprepare(dsi->slave->pclk);
+               pm_runtime_put(dsi->slave->dev);
+       }
        dw_mipi_dsi_disable(dsi);
+
        clk_disable_unprepare(dsi->pclk);
        pm_runtime_put(dsi->dev);
 }
 
-static void dw_mipi_dsi_bridge_mode_set(struct drm_bridge *bridge,
-                                       struct drm_display_mode *mode,
-                                       struct drm_display_mode *adjusted_mode)
+static unsigned int dw_mipi_dsi_get_lanes(struct dw_mipi_dsi *dsi)
+{
+       /* this instance is the slave, so add the master's lanes */
+       if (dsi->master)
+               return dsi->master->lanes + dsi->lanes;
+
+       /* this instance is the master, so add the slave's lanes */
+       if (dsi->slave)
+               return dsi->lanes + dsi->slave->lanes;
+
+       /* single-dsi, so no other instance to consider */
+       return dsi->lanes;
+}
+
+static void dw_mipi_dsi_mode_set(struct dw_mipi_dsi *dsi,
+                               struct drm_display_mode *adjusted_mode)
 {
-       struct dw_mipi_dsi *dsi = bridge_to_dsi(bridge);
        const struct dw_mipi_dsi_phy_ops *phy_ops = dsi->plat_data->phy_ops;
        void *priv_data = dsi->plat_data->priv_data;
        int ret;
+       u32 lanes = dw_mipi_dsi_get_lanes(dsi);
 
        clk_prepare_enable(dsi->pclk);
 
        ret = phy_ops->get_lane_mbps(priv_data, adjusted_mode, dsi->mode_flags,
-                                    dsi->lanes, dsi->format, &dsi->lane_mbps);
+                                    lanes, dsi->format, &dsi->lane_mbps);
        if (ret)
                DRM_DEBUG_DRIVER("Phy get_lane_mbps() failed\n");
 
@@ -819,12 +860,25 @@ static void dw_mipi_dsi_bridge_mode_set(struct drm_bridge *bridge,
        dw_mipi_dsi_set_mode(dsi, 0);
 }
 
+static void dw_mipi_dsi_bridge_mode_set(struct drm_bridge *bridge,
+                                       struct drm_display_mode *mode,
+                                       struct drm_display_mode *adjusted_mode)
+{
+       struct dw_mipi_dsi *dsi = bridge_to_dsi(bridge);
+
+       dw_mipi_dsi_mode_set(dsi, adjusted_mode);
+       if (dsi->slave)
+               dw_mipi_dsi_mode_set(dsi->slave, adjusted_mode);
+}
+
 static void dw_mipi_dsi_bridge_enable(struct drm_bridge *bridge)
 {
        struct dw_mipi_dsi *dsi = bridge_to_dsi(bridge);
 
        /* Switch to video mode for panel-bridge enable & panel enable */
        dw_mipi_dsi_set_mode(dsi, MIPI_DSI_MODE_VIDEO);
+       if (dsi->slave)
+               dw_mipi_dsi_set_mode(dsi->slave, MIPI_DSI_MODE_VIDEO);
 }
 
 static enum drm_mode_status
@@ -961,6 +1015,20 @@ static void __dw_mipi_dsi_remove(struct dw_mipi_dsi *dsi)
        pm_runtime_disable(dsi->dev);
 }
 
+void dw_mipi_dsi_set_slave(struct dw_mipi_dsi *dsi, struct dw_mipi_dsi *slave)
+{
+       /* introduce controllers to each other */
+       dsi->slave = slave;
+       dsi->slave->master = dsi;
+
+       /* migrate settings for already attached displays */
+       dsi->slave->lanes = dsi->lanes;
+       dsi->slave->channel = dsi->channel;
+       dsi->slave->format = dsi->format;
+       dsi->slave->mode_flags = dsi->mode_flags;
+}
+EXPORT_SYMBOL_GPL(dw_mipi_dsi_set_slave);
+
 /*
  * Probe/remove API, used from platforms based on the DRM bridge API.
  */

diff --git a/include/drm/bridge/dw_mipi_dsi.h b/include/drm/bridge/dw_mipi_dsi.h
index a9c03099cf3ea97a16f3f4be4e1c86c779a325b4..48a671e782cafd6ec3ef405f615802c187733ff5 100644 (file)
--- a/include/drm/bridge/dw_mipi_dsi.h
+++ b/include/drm/bridge/dw_mipi_dsi.h
@@ -45,5 +45,6 @@ struct dw_mipi_dsi *dw_mipi_dsi_probe(struct platform_device *pdev,
 void dw_mipi_dsi_remove(struct dw_mipi_dsi *dsi);
 int dw_mipi_dsi_bind(struct dw_mipi_dsi *dsi, struct drm_encoder *encoder);
 void dw_mipi_dsi_unbind(struct dw_mipi_dsi *dsi);
+void dw_mipi_dsi_set_slave(struct dw_mipi_dsi *dsi, struct dw_mipi_dsi *slave);
 
 #endif /* __DW_MIPI_DSI__ */