Merge "msm: mdss: Fix dual-DSI mixer swap"

	struct mdss_data_type *mdata;

	struct mdss_panel_info *pinfo;

	struct mdss_mdp_video_ctx *ctx;

	struct mdss_mdp_mixer *mixer;

	struct intf_timing_params itp = {0};

	u32 dst_bpp;

	int i;

	mdata = ctl->mdata;

	pinfo = &ctl->panel_data->panel_info;

	mixer = mdss_mdp_mixer_get(ctl, MDSS_MDP_MIXER_MUX_LEFT);

	if (!mixer) {

		pr_err("mixer not setup correctly\n");

		return -ENODEV;

	}

	i = ctl->intf_num - MDSS_MDP_INTF0;

	if (i < mdata->nintf) {