Commit 48a8ef72 authored by Jeykumar Sankaran's avatar Jeykumar Sankaran Committed by Rob Clark

drm/msm/dpu: remove unwanted encoder type mapping

This change gets rid of unwanted connector-encoder type
mapping used for dsi-staging driver. Now that DPU will
be using upstream DSI driver, remove the stale code.
Signed-off-by: default avatarJeykumar Sankaran <jsanka@codeaurora.org>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent a2b4ae29
...@@ -2200,8 +2200,7 @@ static const struct dpu_encoder_virt_ops dpu_encoder_parent_ops = { ...@@ -2200,8 +2200,7 @@ static const struct dpu_encoder_virt_ops dpu_encoder_parent_ops = {
static int dpu_encoder_setup_display(struct dpu_encoder_virt *dpu_enc, static int dpu_encoder_setup_display(struct dpu_encoder_virt *dpu_enc,
struct dpu_kms *dpu_kms, struct dpu_kms *dpu_kms,
struct msm_display_info *disp_info, struct msm_display_info *disp_info)
int *drm_enc_mode)
{ {
int ret = 0; int ret = 0;
int i = 0; int i = 0;
...@@ -2222,16 +2221,11 @@ static int dpu_encoder_setup_display(struct dpu_encoder_virt *dpu_enc, ...@@ -2222,16 +2221,11 @@ static int dpu_encoder_setup_display(struct dpu_encoder_virt *dpu_enc,
DPU_DEBUG("\n"); DPU_DEBUG("\n");
if (disp_info->intf_type == DRM_MODE_CONNECTOR_DSI) { switch (disp_info->intf_type) {
*drm_enc_mode = DRM_MODE_ENCODER_DSI; case DRM_MODE_CONNECTOR_DSI:
intf_type = INTF_DSI; intf_type = INTF_DSI;
} else if (disp_info->intf_type == DRM_MODE_CONNECTOR_HDMIA) { break;
*drm_enc_mode = DRM_MODE_ENCODER_TMDS; default:
intf_type = INTF_HDMI;
} else if (disp_info->intf_type == DRM_MODE_CONNECTOR_DisplayPort) {
*drm_enc_mode = DRM_MODE_ENCODER_TMDS;
intf_type = INTF_DP;
} else {
DPU_ERROR_ENC(dpu_enc, "unsupported display interface type\n"); DPU_ERROR_ENC(dpu_enc, "unsupported display interface type\n");
return -EINVAL; return -EINVAL;
} }
...@@ -2352,14 +2346,12 @@ int dpu_encoder_setup(struct drm_device *dev, struct drm_encoder *enc, ...@@ -2352,14 +2346,12 @@ int dpu_encoder_setup(struct drm_device *dev, struct drm_encoder *enc,
struct dpu_kms *dpu_kms = to_dpu_kms(priv->kms); struct dpu_kms *dpu_kms = to_dpu_kms(priv->kms);
struct drm_encoder *drm_enc = NULL; struct drm_encoder *drm_enc = NULL;
struct dpu_encoder_virt *dpu_enc = NULL; struct dpu_encoder_virt *dpu_enc = NULL;
int drm_enc_mode = DRM_MODE_ENCODER_NONE;
int ret = 0; int ret = 0;
dpu_enc = to_dpu_encoder_virt(enc); dpu_enc = to_dpu_encoder_virt(enc);
mutex_init(&dpu_enc->enc_lock); mutex_init(&dpu_enc->enc_lock);
ret = dpu_encoder_setup_display(dpu_enc, dpu_kms, disp_info, ret = dpu_encoder_setup_display(dpu_enc, dpu_kms, disp_info);
&drm_enc_mode);
if (ret) if (ret)
goto fail; goto fail;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment