Merge "msm: mdss: update layer mixer access for calibration tool" (866aae0d) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp_hwio.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -106,7 +106,8 @@ enum mdss_mdp_ctl_index {
		MDSS_MDP_MAX_CTL
		};

		#define MDSS_MDP_REG_CTL_LAYER(lm) ((lm) * 0x004)
		#define MDSS_MDP_REG_CTL_LAYER(lm) \
		((lm == 5) ? (0x024) : ((lm) * 0x004))
		#define MDSS_MDP_REG_CTL_TOP 0x014
		#define MDSS_MDP_REG_CTL_FLUSH 0x018
		#define MDSS_MDP_REG_CTL_START 0x01C

+4 −2

Original line number	Diff line number	Diff line
		@@ -4733,7 +4733,8 @@ static int is_valid_calib_ctrl_addr(char __iomem *ptr)
		break;
		}

		for (stage = 0; stage < mdss_res->nmixers_intf; stage++)
		for (stage = 0; stage < (mdss_res->nmixers_intf +
		mdss_res->nmixers_wb); stage++)
		if (ptr == base + MDSS_MDP_REG_CTL_LAYER(stage)) {
		ret = MDP_PP_OPS_READ \| MDP_PP_OPS_WRITE;
		goto End;
		@@ -4912,7 +4913,8 @@ static int is_valid_calib_mixer_addr(char __iomem *ptr)
		int stage = 0;
		struct mdss_mdp_mixer *mixer;

		for (counter = 0; counter < mdss_res->nmixers_intf; counter++) {
		for (counter = 0; counter < (mdss_res->nmixers_intf +
		mdss_res->nmixers_wb); counter++) {
		mixer = mdss_res->mixer_intf + counter;
		base = mixer->base;