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

Commit 542c660e authored by Zohaib Alam's avatar Zohaib Alam Committed by Ken Zhang
Browse files

msm: mdss: mdp revision initialization 



Make sure mdp revision is initialized when user space
application retrieves it.

Change-Id: Ib09767ac5db3af3958a82c83ed553e8bd69637e0
Signed-off-by: default avatarZohaib Alam <zalam@codeaurora.org>
Signed-off-by: default avatarKen Zhang <kenz@codeaurora.org>
parent 94c52e4c

drivers/video/msm/mdss/mdss_mdp.c

+13 −3
Original line number Diff line number Diff line
@@ -1015,6 +1015,16 @@ static int mdss_mdp_debug_init(struct mdss_data_type *mdata) 
	return 0;

}



static void mdss_hw_rev_init(struct mdss_data_type *mdata)

{

	if (mdata->mdp_rev)

		return;

	mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON, false);

	mdata->mdp_rev = readl_relaxed(mdata->mdss_base + MDSS_REG_HW_VERSION);

	pr_info_once("MDP Rev=%x\n", mdata->mdp_rev);

	mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF, false);

}



int mdss_hw_init(struct mdss_data_type *mdata)

{

	int i, j;
@@ -1022,9 +1032,7 @@ int mdss_hw_init(struct mdss_data_type *mdata) 
	struct mdss_mdp_pipe *vig;



	mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON, false);

	mdata->mdp_rev = readl_relaxed(mdata->mdss_base + MDSS_REG_HW_VERSION);



	pr_info_once("MDP Rev=%x\n", mdata->mdp_rev);

	mdss_hw_rev_init(mdata);



	/* disable hw underrun recovery */

	writel_relaxed(0x0, mdata->mdp_base +
@@ -1138,6 +1146,8 @@ static ssize_t mdss_mdp_show_capabilities(struct device *dev, 
#define SPRINT(fmt, ...) \

		(cnt += scnprintf(buf + cnt, len - cnt, fmt, ##__VA_ARGS__))



	mdss_hw_rev_init(mdata);



	SPRINT("mdp_version=5\n");

	SPRINT("hw_rev=%d\n", mdata->mdp_rev);

	SPRINT("rgb_pipes=%d\n", mdata->nrgb_pipes);