Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-09-21 03:43:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge "msm: mdss: fix software reset logic hw programming"

Browse source
This commit is contained in:
Linux Build Service Account 2014-11-29 23:36:00 -08:00 committed by Gerrit - the friendly Code Review server
parent 1f5702f55c 86af4baf37
commit f4778ff7b8
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/video/msm/mdss/mdss_mdp_pipe.c
View file

@ -1197,11 +1197,9 @@ int mdss_mdp_pipe_fetch_halt(struct mdss_mdp_pipe *pipe)
reg_val | BIT(pipe->xin_id), is_nrt_vbif);
if (sw_reset_avail) {
reg_val = MDSS_VBIF_READ(mdata, sw_reset_off,
is_nrt_vbif);
MDSS_VBIF_WRITE(mdata, sw_reset_off,
reg_val | BIT(pipe->sw_reset.bit_off),
is_nrt_vbif);
reg_val = readl_relaxed(mdata->mdp_base + sw_reset_off);
writel_relaxed(reg_val | BIT(pipe->sw_reset.bit_off),
mdata->mdp_base + sw_reset_off);
wmb();
}
mutex_unlock(&mdata->reg_lock);
@ -1224,16 +1222,16 @@ int mdss_mdp_pipe_fetch_halt(struct mdss_mdp_pipe *pipe)
reg_val & ~BIT(pipe->xin_id), is_nrt_vbif);
if (sw_reset_avail) {
MDSS_VBIF_WRITE(mdata, sw_reset_off, reg_val &
~BIT(pipe->sw_reset.bit_off), is_nrt_vbif);
reg_val = readl_relaxed(mdata->mdp_base + sw_reset_off);
writel_relaxed(reg_val & ~BIT(pipe->sw_reset.bit_off),
mdata->mdp_base + sw_reset_off);
wmb();
reg_val = MDSS_VBIF_READ(mdata, clk_ctrl_off,
is_nrt_vbif);
reg_val = readl_relaxed(mdata->mdp_base + clk_ctrl_off);
reg_val |= BIT(pipe->clk_ctrl.bit_off +
CLK_FORCE_OFF_OFFSET);
MDSS_VBIF_WRITE(mdata, clk_ctrl_off, reg_val,
is_nrt_vbif);
writel_relaxed(reg_val,
mdata->mdp_base + clk_ctrl_off);
}
mutex_unlock(&mdata->reg_lock);
mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF);