Merge "msm: mdss: Fix the DSI lane swap programming logic"

This commit is contained in:
Linux Build Service Account 2017-08-03 20:51:24 -07:00 committed by Gerrit - the friendly Code Review server
commit 647fc98bc8

View file

@ -3266,21 +3266,6 @@ end:
return rc;
}
static void mdss_dsi_ctrl_validate_lane_swap_config(
struct mdss_dsi_ctrl_pdata *ctrl)
{
struct mipi_panel_info *mipi = &ctrl->panel_data.panel_info.mipi;
if (!mipi->data_lane0)
ctrl->lane_map[DSI_LOGICAL_LANE_0] = DSI_PHYSICAL_LANE_INVALID;
if (!mipi->data_lane1)
ctrl->lane_map[DSI_LOGICAL_LANE_1] = DSI_PHYSICAL_LANE_INVALID;
if (!mipi->data_lane2)
ctrl->lane_map[DSI_LOGICAL_LANE_2] = DSI_PHYSICAL_LANE_INVALID;
if (!mipi->data_lane3)
ctrl->lane_map[DSI_LOGICAL_LANE_3] = DSI_PHYSICAL_LANE_INVALID;
}
static int mdss_dsi_ctrl_validate_config(struct mdss_dsi_ctrl_pdata *ctrl)
{
int rc = 0;
@ -3290,8 +3275,6 @@ static int mdss_dsi_ctrl_validate_config(struct mdss_dsi_ctrl_pdata *ctrl)
goto error;
}
mdss_dsi_ctrl_validate_lane_swap_config(ctrl);
/*
* check to make sure that the byte interface clock is specified for
* DSI ctrl version 2 and above.