1 files changed, 6 insertions, 12 deletions

diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c
index ec572f8389ed..311c1c1e7d6c 100644
--- a/drivers/gpu/drm/msm/dsi/dsi.c
+++ b/drivers/gpu/drm/msm/dsi/dsi.c
@@ -18,9 +18,7 @@ struct drm_encoder *msm_dsi_get_encoder(struct msm_dsi *msm_dsi)
         if (!msm_dsi || !msm_dsi_device_connected(msm_dsi))
                 return NULL;
 
-        return (msm_dsi->device_flags & MIPI_DSI_MODE_VIDEO) ?
-                msm_dsi->encoders[MSM_DSI_VIDEO_ENCODER_ID] :
-                msm_dsi->encoders[MSM_DSI_CMD_ENCODER_ID];
+        return msm_dsi->encoder;
 }
 
 static int dsi_get_phy(struct msm_dsi *msm_dsi)
@@ -187,14 +185,13 @@ void __exit msm_dsi_unregister(void)
 }
 
 int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev,
-                struct drm_encoder *encoders[MSM_DSI_ENCODER_NUM])
+                         struct drm_encoder *encoder)
 {
         struct msm_drm_private *priv = dev->dev_private;
         struct drm_bridge *ext_bridge;
-        int ret, i;
+        int ret;
 
-        if (WARN_ON(!encoders[MSM_DSI_VIDEO_ENCODER_ID] ||
-                !encoders[MSM_DSI_CMD_ENCODER_ID]))
+        if (WARN_ON(!encoder))
                 return -EINVAL;
 
         msm_dsi->dev = dev;
@@ -205,6 +202,8 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev,
                 goto fail;
         }
 
+        msm_dsi->encoder = encoder;
+
         msm_dsi->bridge = msm_dsi_manager_bridge_init(msm_dsi->id);
         if (IS_ERR(msm_dsi->bridge)) {
                 ret = PTR_ERR(msm_dsi->bridge);
@@ -213,11 +212,6 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev,
                 goto fail;
         }
 
-        for (i = 0; i < MSM_DSI_ENCODER_NUM; i++) {
-                encoders[i]->bridge = msm_dsi->bridge;
-                msm_dsi->encoders[i] = encoders[i];
-        }
-
         /*
          * check if the dsi encoder output is connected to a panel or an
          * external bridge. We create a connector only if we're connected to a