summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-02-15 17:01:35 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-02-15 17:01:35 -0800
commitc8617c203ff8d3d6c6ec37a0666a5bed8c631431 (patch)
tree36918171f051ed4d77d27bde0af1cae716536d62
parent726f66a1d1d9fb72d67577ab7b3c34444cb19e46 (diff)
parent2064032096ca89ea85a61c724cdc8ecdb2978216 (diff)
Merge "msm: sde: Disable client driven prefetch for rotator"
-rw-r--r--drivers/media/platform/msm/sde/rotator/sde_rotator_r3.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/platform/msm/sde/rotator/sde_rotator_r3.c b/drivers/media/platform/msm/sde/rotator/sde_rotator_r3.c
index 7ea36c85738f..89fde987d4c1 100644
--- a/drivers/media/platform/msm/sde/rotator/sde_rotator_r3.c
+++ b/drivers/media/platform/msm/sde/rotator/sde_rotator_r3.c
@@ -1752,6 +1752,12 @@ static int sde_hw_rotator_config(struct sde_rot_hw_resource *hw,
SDE_ROTREG_WRITE(rot->mdss_base, ROT_SSPP_CREQ_LUT, qos_lut);
}
+ /* Set CDP control registers to 0 if CDP is disabled */
+ if (!test_bit(SDE_QOS_CDP, mdata->sde_qos_map)) {
+ SDE_ROTREG_WRITE(rot->mdss_base, ROT_SSPP_CDP_CNTL, 0x0);
+ SDE_ROTREG_WRITE(rot->mdss_base, ROT_WB_CDP_CNTL, 0x0);
+ }
+
if (mdata->npriority_lvl > 0) {
u32 mask, reg_val, i, j, vbif_qos, reg_val_lvl, reg_high;