disp: msm: snapshot of msm and sde driver
This snapshot ports changes from 4.14 to 4.19 into the msm and sde layer. Snapshot was taken as of commit 0f8fb25421ff ("cnss2: Add device version to SOC info structure"). Change-Id: I59b799a78319c2db6930a2a10bc38976f8c09898 Signed-off-by: Samantha Tran <samtran@codeaurora.org>
This commit is contained in:
@@ -360,6 +360,11 @@ static void sde_hw_sspp_setup_format(struct sde_hw_pipe *ctx,
|
||||
if (IS_UBWC_40_SUPPORTED(ctx->catalog->ubwc_version)) {
|
||||
SDE_REG_WRITE(c, SSPP_UBWC_STATIC_CTRL,
|
||||
SDE_FORMAT_IS_YUV(fmt) ? 0 : BIT(30));
|
||||
} else if (IS_UBWC_10_SUPPORTED(ctx->catalog->ubwc_version)) {
|
||||
alpha_en_mask = const_alpha_en ? BIT(31) : 0;
|
||||
SDE_REG_WRITE(c, SSPP_UBWC_STATIC_CTRL,
|
||||
alpha_en_mask | (ctx->mdp->ubwc_swizzle & 0x1) |
|
||||
BIT(8) | (ctx->mdp->highest_bank_bit << 4));
|
||||
} else if (IS_UBWC_20_SUPPORTED(ctx->catalog->ubwc_version)) {
|
||||
alpha_en_mask = const_alpha_en ? BIT(31) : 0;
|
||||
SDE_REG_WRITE(c, SSPP_UBWC_STATIC_CTRL,
|
||||
@@ -686,7 +691,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;
|
||||
@@ -706,7 +712,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);
|
||||
|
||||
excl_ctrl = SDE_REG_READ(c, SSPP_EXCL_REC_CTL + idx);
|
||||
/* 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);
|
||||
|
Reference in New Issue
Block a user