mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-09 05:39:54 -04:00
Merge "disp: msm: sde: disable CWB crop after cwb session is ended"
This commit is contained in:
commit
a7844b99e6
2 changed files with 4 additions and 2 deletions
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
Loading…
Reference in a new issue