Merge "video: msm: Allow PCC/GC to be disabled/select bins" into msm-3.0
diff --git a/drivers/video/msm/mdp4_util.c b/drivers/video/msm/mdp4_util.c
index 1f5904b..e9a1b5d 100644
--- a/drivers/video/msm/mdp4_util.c
+++ b/drivers/video/msm/mdp4_util.c
@@ -2845,10 +2845,12 @@
if (0x8 & cfg_ptr->ops)
outpdw(mdp_dma_op_mode,
- (inpdw(mdp_dma_op_mode)|((0x8&cfg_ptr->ops)<<10)));
+ ((inpdw(mdp_dma_op_mode) & ~(0x1<<10)) |
+ ((0x8 & cfg_ptr->ops)<<10)));
outpdw(mdp_cfg_offset,
- (inpdw(mdp_cfg_offset)|((cfg_ptr->ops&0x1)<<29)));
+ ((inpdw(mdp_cfg_offset) & ~(0x1<<29)) |
+ ((cfg_ptr->ops & 0x1)<<29)));
mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_OFF, FALSE);
@@ -3034,8 +3036,9 @@
if (!ret) {
mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
- outpdw(pgc_enable_offset, (inpdw(pgc_enable_offset) |
- ((0x1 & pgc_ptr->flags) << lshift_bits)));
+ outpdw(pgc_enable_offset, (inpdw(pgc_enable_offset) &
+ ~(0x1<<lshift_bits)) |
+ ((0x1 & pgc_ptr->flags) << lshift_bits));
mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_OFF,
FALSE);
}