summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbhijit Kulkarni <kabhijit@codeaurora.org>2016-05-05 11:45:43 -0700
committerJeevan Shriram <jshriram@codeaurora.org>2016-05-11 17:44:33 -0700
commite4e3af55ed4d96a4c521dc9c73b9df9b6e572371 (patch)
tree08ca91b546c6819bf94d66ebf6ebd63b4c8aced6
parent15c6d4720491128f085887550d73cf82d4c77c2c (diff)
msm: mdss: fix qseed3 op_mode register programming
Initialize the op_mode register and program the direction_enable field in this register correctly CRs-Fixed: 1008505 Change-Id: I2dbcb8eb1ef5c6e0ebcbfb9f298a14344fbe7ce3 Signed-off-by: Abhijit Kulkarni <kabhijit@codeaurora.org>
-rw-r--r--drivers/video/fbdev/msm/mdss_mdp_pp.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_pp.c b/drivers/video/fbdev/msm/mdss_mdp_pp.c
index f1247b3d0c58..68ab530f3583 100644
--- a/drivers/video/fbdev/msm/mdss_mdp_pp.c
+++ b/drivers/video/fbdev/msm/mdss_mdp_pp.c
@@ -1597,7 +1597,7 @@ int mdss_mdp_qseed3_setup(struct mdss_mdp_pipe *pipe,
struct mdss_data_type *mdata;
char __iomem *offset, *lut_offset;
struct mdss_mdp_format_params *fmt;
- uint32_t op_mode;
+ uint32_t op_mode = 0;
uint32_t phase_init, preload, src_y_rgb, src_uv, dst;
mdata = mdss_mdp_get_mdata();
@@ -1632,8 +1632,6 @@ int mdss_mdp_qseed3_setup(struct mdss_mdp_pipe *pipe,
}
pr_debug("scaler->enable=%d", scaler->enable);
- op_mode = readl_relaxed(MDSS_MDP_REG_SCALER_OP_MODE +
- offset);
if (scaler->enable) {
op_mode |= SCALER_EN;
@@ -1661,7 +1659,7 @@ int mdss_mdp_qseed3_setup(struct mdss_mdp_pipe *pipe,
SCALER_BLEND_CFG;
op_mode |= (scaler->enable & ENABLE_DIRECTION_DETECTION) ?
- (1 << SCALER_DIR_EN) : 0;
+ SCALER_DIR_EN : 0;
phase_init =
((scaler->init_phase_x[0] & PHASE_BITS)
<< Y_PHASE_INIT_H) |