Merge "msm: mdss: fix programming of scaler lut_ctrl register"

This commit is contained in:
Linux Build Service Account 2017-01-05 02:09:00 -08:00 committed by Gerrit - the friendly Code Review server
commit 53a6c09ff4

View file

@ -1655,10 +1655,6 @@ int mdss_mdp_scaler_lut_cfg(struct mdp_scale_data_v2 *scaler,
}
}
if (scaler->lut_flag & SCALER_LUT_SWAP)
writel_relaxed(BIT(0), MDSS_MDP_REG_SCALER_COEF_LUT_CTRL +
offset);
return 0;
}
@ -1795,6 +1791,10 @@ int mdss_mdp_qseed3_setup(struct mdp_scale_data_v2 *scaler,
__func__);
return -EINVAL;
}
if (scaler->lut_flag & SCALER_LUT_SWAP)
writel_relaxed(BIT(0),
MDSS_MDP_REG_SCALER_COEF_LUT_CTRL +
offset);
}
writel_relaxed(phase_init,