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

Commit a7844b99 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "disp: msm: sde: disable CWB crop after cwb session is ended"

parents c0783f52 c667c77f

msm/sde/sde_encoder_phys_wb.c

+3 −0
Original line number Diff line number Diff line
@@ -1727,6 +1727,9 @@ static void sde_encoder_phys_wb_disable(struct sde_encoder_phys *phys_enc) 
	}



	if (phys_enc->in_clone_mode) {

		if (hw_wb->ops.setup_crop)

			hw_wb->ops.setup_crop(hw_wb, NULL, false);



		_sde_encoder_phys_wb_setup_cwb(phys_enc, false);

		_sde_encoder_phys_wb_update_cwb_flush(phys_enc, false);

		phys_enc->enable_state = SDE_ENC_DISABLING;

msm/sde/sde_hw_wb.c

+1 −2
Original line number Diff line number Diff line
@@ -215,9 +215,8 @@ static void sde_hw_wb_crop(struct sde_hw_wb *ctx, struct sde_hw_wb_cfg *wb, bool 
	struct sde_hw_blk_reg_map *c = &ctx->hw;

	u32 crop_xy;



	crop_xy = (wb->crop.y << 16) | wb->crop.x;



	if (crop) {

		crop_xy = (wb->crop.y << 16) | wb->crop.x;

		SDE_REG_WRITE(c, WB_CROP_CTRL, 0x1);

		SDE_REG_WRITE(c, WB_CROP_OFFSET, crop_xy);

	} else {