Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7aad8dee authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Make HDMI as primary interface for APQ8096"

parents 2dbe4cfb 0c77b062

arch/arm/boot/dts/qcom/apq8096-mediabox.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ 
};



&mdss_mdp {

	qcom,mdss-pref-prim-intf = "dsi";

	qcom,mdss-pref-prim-intf = "hdmi";

};



&mdss_dsi {

drivers/video/msm/mdss/mdss_mdp.c

+5 −2
Original line number Diff line number Diff line
@@ -2139,13 +2139,16 @@ static int mdss_mdp_get_pan_cfg(struct mdss_panel_cfg *pan_cfg) 
	char *t = NULL;

	char pan_intf_str[MDSS_MAX_PANEL_LEN];

	int rc, i, panel_len;

	char pan_name[MDSS_MAX_PANEL_LEN];

	char pan_name[MDSS_MAX_PANEL_LEN] = {'\0'};



	if (!pan_cfg)

		return -EINVAL;



	if (mdss_mdp_panel[0] == '0') {

		pr_debug("panel name is not set\n");

		pan_cfg->lk_cfg = false;

		pan_cfg->pan_intf = MDSS_PANEL_INTF_INVALID;

		return -EINVAL;

	} else if (mdss_mdp_panel[0] == '1') {

		pan_cfg->lk_cfg = true;

	} else {
@@ -2155,7 +2158,7 @@ static int mdss_mdp_get_pan_cfg(struct mdss_panel_cfg *pan_cfg) 
		return -EINVAL;

	}



	/* skip lk cfg and delimiter; ex: "0:" */

	/* skip lk cfg and delimiter; ex: "1:" */

	strlcpy(pan_name, &mdss_mdp_panel[2], MDSS_MAX_PANEL_LEN);

	t = strnstr(pan_name, ":", MDSS_MAX_PANEL_LEN);

	if (!t) {