Merge "msm: mdss: Fix the IGC read/write on DSPPs" (b7074b93) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp_pp.c

+16 −2

Original line number	Diff line number	Diff line
		@@ -2383,9 +2383,15 @@ static void pp_read_igc_lut(struct mdp_igc_lut_data *cfg,
		{
		int i;
		u32 data;
		struct mdss_data_type *mdata = mdss_mdp_get_mdata();
		int32_t mask = 0, n_mixers = mdata->nmixers_intf;

		while (n_mixers > 0) {
		mask = (mask << 1) + 1;
		n_mixers--;
		}
		/* INDEX_UPDATE & VALUE_UPDATEN */
		data = (3 << 24) \| (((~(1 << blk_idx)) & 0x7) << 28);
		data = (3 << 24) \| (((~(1 << blk_idx)) & mask) << 28);
		writel_relaxed(data, addr);

		for (i = 0; i < cfg->len; i++)
		@@ -2407,8 +2413,16 @@ static void pp_update_igc_lut(struct mdp_igc_lut_data *cfg,
		{
		int i;
		u32 data;
		struct mdss_data_type *mdata = mdss_mdp_get_mdata();
		int32_t mask = 0, n_mixers = mdata->nmixers_intf;

		while (n_mixers > 0) {
		mask = (mask << 1) + 1;
		n_mixers--;
		}

		/* INDEX_UPDATE */
		data = (1 << 25) \| (((~(1 << blk_idx)) & 0x7) << 28);
		data = (1 << 25) \| (((~(1 << blk_idx)) & mask) << 28);
		writel_relaxed((cfg->c0_c1_data[0] & 0xFFF) \| data, addr);

		/* disable index update */