drm/msm/mdp5: Make the intf connection in config module

Up until now, we assume that eDP is tight to intf_0 and HDMI to
intf_3. This information shall actually come from the mdp5_cfg
module since it can change from one chip to another.

v2: rename macro to mdp5_cfg_intf_is_virtual() [pointed by Archit]
v3: add sanity check before writing in INTF_TIMING_ENGINE_EN registers

Signed-off-by: Stephane Viau <sviau@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>

diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c
index 1eacea72c5eb02ac35fe0f33976ca7a345e334a2..baf4c95e7d921b11878039fec434079cc243f138 100644 (file)
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c
@@ -62,6 +62,10 @@ const struct mdp5_cfg_hw msm8x74_config = {
                .count = 4,
                .base = { 0x12500, 0x12700, 0x12900, 0x12b00 },
        },
+       .intfs = {
+               [0] = INTF_eDP,
+               [3] = INTF_HDMI,
+       },
        .max_clk = 200000000,
 };
 
@@ -111,6 +115,10 @@ const struct mdp5_cfg_hw apq8084_config = {
                .count = 5,
                .base = { 0x12500, 0x12700, 0x12900, 0x12b00, 0x12d00 },
        },
+       .intfs = {
+               [0] = INTF_eDP,
+               [3] = INTF_HDMI,
+       },
        .max_clk = 320000000,
 };
 

diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h
index 69e35aca80a7a3ce1ae24f56f84ba533cecd63eb..12224d777e7bcf567091de4ef59e73b9f6923698 100644 (file)
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h
@@ -56,6 +56,8 @@ struct mdp5_smp_block {
        int reserved[MAX_CLIENTS];      /* # of MMBs allocated per client */
 };
 
+#define MDP5_INTF_NUM_MAX      5
+
 struct mdp5_cfg_hw {
        char  *name;
 
@@ -69,6 +71,8 @@ struct mdp5_cfg_hw {
        struct mdp5_sub_block ad;
        struct mdp5_sub_block intf;
 
+       u32 intfs[MDP5_INTF_NUM_MAX]; /* array of enum mdp5_intf_type */
+
        uint32_t max_clk;
 };
 

diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
index 390d9d2b688274872437b16c6c2a54d912b6eb6b..7e03af56206a537390a1f64ca5f47fd749c473dd 100644 (file)
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
@@ -161,6 +161,44 @@ int mdp5_enable(struct mdp5_kms *mdp5_kms)
        return 0;
 }
 
+static int construct_encoder(struct mdp5_kms *mdp5_kms,
+               enum mdp5_intf_type intf_type, int intf_num)
+{
+       struct drm_device *dev = mdp5_kms->dev;
+       struct msm_drm_private *priv = dev->dev_private;
+       struct drm_encoder *encoder;
+       struct mdp5_interface intf = {
+                       .num    = intf_num,
+                       .type   = intf_type,
+                       .mode   = MDP5_INTF_MODE_NONE,
+       };
+       int ret = 0;
+
+       encoder = mdp5_encoder_init(dev, &intf);
+       if (IS_ERR(encoder)) {
+               ret = PTR_ERR(encoder);
+               dev_err(dev->dev, "failed to construct encoder: %d\n", ret);
+               return ret;
+       }
+
+       encoder->possible_crtcs = (1 << priv->num_crtcs) - 1;
+       priv->encoders[priv->num_encoders++] = encoder;
+
+       if (intf_type == INTF_HDMI) {
+               ret = hdmi_modeset_init(priv->hdmi, dev, encoder);
+               if (ret)
+                       dev_err(dev->dev, "failed to init HDMI: %d\n", ret);
+
+       } else if (intf_type == INTF_eDP) {
+               /* Construct bridge/connector for eDP: */
+               ret = msm_edp_modeset_init(priv->edp, dev, encoder);
+               if (ret)
+                       dev_err(dev->dev, "failed to init eDP: %d\n", ret);
+       }
+
+       return ret;
+}
+
 static int modeset_init(struct mdp5_kms *mdp5_kms)
 {
        static const enum mdp5_pipe crtcs[] = {
@@ -171,7 +209,6 @@ static int modeset_init(struct mdp5_kms *mdp5_kms)
        };
        struct drm_device *dev = mdp5_kms->dev;
        struct msm_drm_private *priv = dev->dev_private;
-       struct drm_encoder *encoder;
        const struct mdp5_cfg_hw *hw_cfg;
        int i, ret;
 
@@ -222,56 +259,29 @@ static int modeset_init(struct mdp5_kms *mdp5_kms)
                }
        }
 
-       if (priv->hdmi) {
-               struct mdp5_interface intf = {
-                               .num    = 3,
-                               .type   = INTF_HDMI,
-                               .mode   = MDP5_INTF_MODE_NONE,
-               };
-
-               /* Construct encoder for HDMI: */
-               encoder = mdp5_encoder_init(dev, &intf);
-               if (IS_ERR(encoder)) {
-                       dev_err(dev->dev, "failed to construct encoder\n");
-                       ret = PTR_ERR(encoder);
-                       goto fail;
-               }
-
-               encoder->possible_crtcs = (1 << priv->num_crtcs) - 1;;
-               priv->encoders[priv->num_encoders++] = encoder;
-
-               ret = hdmi_modeset_init(priv->hdmi, dev, encoder);
-               if (ret) {
-                       dev_err(dev->dev, "failed to initialize HDMI: %d\n", ret);
-                       goto fail;
-               }
-       }
-
-       if (priv->edp) {
-               struct mdp5_interface intf = {
-                               .num    = 0,
-                               .type   = INTF_eDP,
-                               .mode   = MDP5_INTF_MODE_NONE,
-               };
-
-               /* Construct encoder for eDP: */
-               encoder = mdp5_encoder_init(dev, &intf);
-               if (IS_ERR(encoder)) {
-                       dev_err(dev->dev, "failed to construct eDP encoder\n");
-                       ret = PTR_ERR(encoder);
-                       goto fail;
+       /* Construct external display interfaces' encoders: */
+       for (i = 0; i < ARRAY_SIZE(hw_cfg->intfs); i++) {
+               enum mdp5_intf_type intf_type = hw_cfg->intfs[i];
+
+               switch (intf_type) {
+               case INTF_DISABLED:
+                       break;
+               case INTF_eDP:
+                       if (priv->edp)
+                               ret = construct_encoder(mdp5_kms, INTF_eDP, i);
+                       break;
+               case INTF_HDMI:
+                       if (priv->hdmi)
+                               ret = construct_encoder(mdp5_kms, INTF_HDMI, i);
+                       break;
+               default:
+                       dev_err(dev->dev, "unknown intf: %d\n", intf_type);
+                       ret = -EINVAL;
+                       break;
                }
 
-               encoder->possible_crtcs = (1 << priv->num_crtcs) - 1;
-               priv->encoders[priv->num_encoders++] = encoder;
-
-               /* Construct bridge/connector for eDP: */
-               ret = msm_edp_modeset_init(priv->edp, dev, encoder);
-               if (ret) {
-                       dev_err(dev->dev, "failed to initialize eDP: %d\n",
-                                                                       ret);
+               if (ret)
                        goto fail;
-               }
        }
 
        return 0;
@@ -415,8 +425,12 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev)
         * we don't disable):
         */
        mdp5_enable(mdp5_kms);
-       for (i = 0; i < config->hw->intf.count; i++)
+       for (i = 0; i < MDP5_INTF_NUM_MAX; i++) {
+               if (!config->hw->intf.base[i] ||
+                               mdp5_cfg_intf_is_virtual(config->hw->intfs[i]))
+                       continue;
                mdp5_write(mdp5_kms, REG_MDP5_INTF_TIMING_ENGINE_EN(i), 0);
+       }
        mdp5_disable(mdp5_kms);
        mdelay(16);