This change will enable dpu encoder support for the native eDP interface on next generation snapdragon platforms.
Signed-off-by: Sankeerth Billakanti sbillaka@codeaurora.org --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 7 +++++- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 33 +++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c index 8d94205..9f5185bb 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -2075,7 +2075,12 @@ static int dpu_encoder_setup_display(struct dpu_encoder_virt *dpu_enc, intf_type = INTF_DSI; break; case DRM_MODE_ENCODER_TMDS: - intf_type = INTF_DP; + if (disp_info->capabilities & MSM_DISPLAY_CAP_CMD_MODE) { + intf_type = INTF_EDP; + /* PSR CMD mode not supported */ + disp_info->capabilities = MSM_DISPLAY_CAP_VID_MODE; + } else + intf_type = INTF_DP; break; }
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index 88e9cc3..ecd7dc8 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -499,6 +499,33 @@ static int _dpu_kms_initialize_dsi(struct drm_device *dev, return rc; }
+static int _dpu_kms_initialize_edp(struct drm_device *dev, + struct msm_drm_private *priv, + struct dpu_kms *dpu_kms) +{ + struct drm_encoder *encoder = NULL; + int rc = 0; + + if (!priv->edp) + return rc; + + encoder = dpu_encoder_init(dev, DRM_MODE_ENCODER_TMDS); + if (IS_ERR(encoder)) { + DPU_ERROR("encoder init failed for eDP display\n"); + return PTR_ERR(encoder); + } + + rc = msm_edp_modeset_init(priv->edp, dev, encoder); + if (rc) { + DPU_ERROR("modeset_init failed for eDP, rc = %d\n", rc); + drm_encoder_cleanup(encoder); + return rc; + } + + priv->encoders[priv->num_encoders++] = encoder; + return rc; +} + static int _dpu_kms_initialize_displayport(struct drm_device *dev, struct msm_drm_private *priv, struct dpu_kms *dpu_kms) @@ -546,6 +573,12 @@ static int _dpu_kms_setup_displays(struct drm_device *dev, return rc; }
+ rc = _dpu_kms_initialize_edp(dev, priv, dpu_kms); + if (rc) { + DPU_ERROR("initialize_eDP failed, rc = %d\n", rc); + return rc; + } + rc = _dpu_kms_initialize_displayport(dev, priv, dpu_kms); if (rc) { DPU_ERROR("initialize_DP failed, rc = %d\n", rc);