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

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

Merge "drm/msm/sde: correct VIG GAMUT/IGC opmode address for read" into dev/msm-4.14-display

parents b9430458 3299df99

drivers/gpu/drm/msm/sde/sde_hw_reg_dma_v1_color_proc.c

+2 −2
Original line number Diff line number Diff line
@@ -1725,7 +1725,7 @@ void reg_dmav1_setup_vig_gamutv5(struct sde_hw_pipe *ctx, void *cfg) 
				hw_cfg->len, sizeof(struct drm_msm_3d_gamut));

		return;

	}

	op_mode = SDE_REG_READ(&ctx->hw, gamut_base);

	op_mode = SDE_REG_READ(&ctx->hw, ctx->cap->sblk->gamut_blk.base);

	payload = hw_cfg->payload;

	rc = sde_gamut_get_mode_info(SSPP, payload, &tbl_len, &tbl_off,

			&op_mode, &scale_off);
@@ -1896,7 +1896,7 @@ void reg_dmav1_setup_vig_igcv5(struct sde_hw_pipe *ctx, void *cfg) 
	if (!data)

		return;



	reg = SDE_REG_READ(&ctx->hw, igc_base);

	reg = SDE_REG_READ(&ctx->hw, ctx->cap->sblk->igc_blk[0].base);

	lut_enable = (reg >> 8) & BIT(0);

	lut_sel = (reg >> 9) & BIT(0);

	/* select LUT table (0 or 1) when 1D LUT is in active mode */