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

Commit c8d6b834 authored by Package Warehouse Build User's avatar Package Warehouse Build User Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/sde: fix exclusion rect control programming" into dev/msm-4.14-display

parents 69796373 549eae58

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

+6 −2
Original line number Diff line number Diff line
@@ -692,7 +692,8 @@ static void _sde_hw_sspp_setup_excl_rect(struct sde_hw_pipe *ctx, 
	u32 size, xy;

	u32 idx;

	u32 reg_xy, reg_size;

	u32 excl_ctrl, enable_bit;

	u32 excl_ctrl = BIT(0);

	u32 enable_bit;



	if (_sspp_subblk_offset(ctx, SDE_SSPP_SRC, &idx) || !excl_rect)

		return;
@@ -712,7 +713,10 @@ static void _sde_hw_sspp_setup_excl_rect(struct sde_hw_pipe *ctx, 
	xy = (excl_rect->y << 16) | (excl_rect->x);

	size = (excl_rect->h << 16) | (excl_rect->w);



	/* Set if multi-rect disabled, read+modify only if multi-rect enabled */

	if (rect_index != SDE_SSPP_RECT_SOLO)

		excl_ctrl = SDE_REG_READ(c, SSPP_EXCL_REC_CTL + idx);



	if (!size) {

		SDE_REG_WRITE(c, SSPP_EXCL_REC_CTL + idx,

				excl_ctrl & ~enable_bit);