Merge "mdss: pp: fix incorrect base addr len in csc setup" (0002ae89) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp_pp.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -495,7 +495,7 @@ int mdss_mdp_csc_setup_data(u32 block, u32 blk_idx, u32 tbl_idx,
		if (i & 0x1) {
		val \|= data->csc_mv[i] << 16;
		writel_relaxed(val, addr);
		addr += sizeof(u32 *);
		addr += sizeof(u32);
		} else {
		val = data->csc_mv[i];
		}
		@@ -506,7 +506,7 @@ int mdss_mdp_csc_setup_data(u32 block, u32 blk_idx, u32 tbl_idx,
		for (i = 0; i < 3; i++) {
		writel_relaxed(data->csc_pre_bv[i], addr);
		writel_relaxed(data->csc_post_bv[i], addr + CSC_POST_OFF);
		addr += sizeof(u32 *);
		addr += sizeof(u32);
		}

		addr = base + CSC_LV_OFF;
		@@ -516,7 +516,7 @@ int mdss_mdp_csc_setup_data(u32 block, u32 blk_idx, u32 tbl_idx,

		val = (data->csc_post_lv[i] << 8) \| data->csc_post_lv[i+1];
		writel_relaxed(val, addr + CSC_POST_OFF);
		addr += sizeof(u32 *);
		addr += sizeof(u32);
		}

		return ret;