diff options
| author | Clarence Ip <cip@codeaurora.org> | 2016-10-20 14:59:54 -0400 |
|---|---|---|
| committer | Clarence Ip <cip@codeaurora.org> | 2016-10-24 11:06:17 -0400 |
| commit | 90dbd643da89ba72c6b059d47f3a242bc32f86df (patch) | |
| tree | 54678216cd9d3aca02483384a5e7f06070fb0043 | |
| parent | d5302c14f83dab26f81b7eede9263e4ded431cd3 (diff) | |
drm/msm/sde: update mixer op mode config bit fields correctly
Avoid corrupting other bit fields in mixer op mode during
updates.
Change-Id: I46521908dfceef833a4b7dfff60c63fb8067017a
Signed-off-by: Clarence Ip <cip@codeaurora.org>
| -rw-r--r-- | drivers/gpu/drm/msm/sde/sde_hw_lm.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/gpu/drm/msm/sde/sde_hw_lm.c b/drivers/gpu/drm/msm/sde/sde_hw_lm.c index 995eaf43085d..365b9b17715d 100644 --- a/drivers/gpu/drm/msm/sde/sde_hw_lm.c +++ b/drivers/gpu/drm/msm/sde/sde_hw_lm.c @@ -72,16 +72,19 @@ static void sde_hw_lm_setup_out(struct sde_hw_mixer *ctx, { struct sde_hw_blk_reg_map *c = &ctx->hw; u32 outsize; - u32 opmode; + u32 op_mode; - opmode = SDE_REG_READ(c, LM_OP_MODE); + op_mode = SDE_REG_READ(c, LM_OP_MODE); outsize = mixer->out_height << 16 | mixer->out_width; SDE_REG_WRITE(c, LM_OUT_SIZE, outsize); /* SPLIT_LEFT_RIGHT */ - opmode = (opmode & ~(1 << 31)) | ((mixer->right_mixer) ? (1 << 31) : 0); - SDE_REG_WRITE(c, LM_OP_MODE, opmode); + if (mixer->right_mixer) + op_mode |= BIT(31); + else + op_mode &= ~BIT(31); + SDE_REG_WRITE(c, LM_OP_MODE, op_mode); } static void sde_hw_lm_setup_border_color(struct sde_hw_mixer *ctx, @@ -146,7 +149,7 @@ static void sde_hw_lm_setup_color3(struct sde_hw_mixer *ctx, /* read the existing op_mode configuration */ op_mode = SDE_REG_READ(c, LM_OP_MODE); - op_mode |= mixer_op_mode; + op_mode = (op_mode & (BIT(31) | BIT(30))) | mixer_op_mode; SDE_REG_WRITE(c, LM_OP_MODE, op_mode); } |