evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: camera: isp: use NOMINAL clock for CX iPeak"

Browse source
This commit is contained in:
Linux Build Service Account 2017-03-21 05:00:25 -07:00 • committed by Gerrit - the friendly Code Review server
commit d839862f49
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/media/platform/msm/camera_v2/isp/msm_isp47.c
View file

@ -2576,10 +2576,10 @@ int msm_vfe47_set_clk_rate(struct vfe_device *vfe_dev, long *rate)
*/ */
if ((vfe_dev->vfe_cx_ipeak) && if ((vfe_dev->vfe_cx_ipeak) &&
(vfe_dev->msm_isp_vfe_clk_rate >= (vfe_dev->msm_isp_vfe_clk_rate >=
vfe_dev->vfe_clk_rates[MSM_VFE_CLK_RATE_TURBO] vfe_dev->vfe_clk_rates[MSM_VFE_CLK_RATE_NOMINAL]
[vfe_dev->hw_info->vfe_clk_idx]) && [vfe_dev->hw_info->vfe_clk_idx]) &&
prev_clk_rate < prev_clk_rate <
vfe_dev->vfe_clk_rates[MSM_VFE_CLK_RATE_TURBO] vfe_dev->vfe_clk_rates[MSM_VFE_CLK_RATE_NOMINAL]
[vfe_dev->hw_info->vfe_clk_idx]) { [vfe_dev->hw_info->vfe_clk_idx]) {
ret = cx_ipeak_update(vfe_dev->vfe_cx_ipeak, true); ret = cx_ipeak_update(vfe_dev->vfe_cx_ipeak, true);
if (ret) { if (ret) {
@ -2599,10 +2599,10 @@ int msm_vfe47_set_clk_rate(struct vfe_device *vfe_dev, long *rate)
*/ */
if ((vfe_dev->vfe_cx_ipeak) && if ((vfe_dev->vfe_cx_ipeak) &&
(vfe_dev->msm_isp_vfe_clk_rate < (vfe_dev->msm_isp_vfe_clk_rate <
vfe_dev->vfe_clk_rates[MSM_VFE_CLK_RATE_TURBO] vfe_dev->vfe_clk_rates[MSM_VFE_CLK_RATE_NOMINAL]
[vfe_dev->hw_info->vfe_clk_idx]) && [vfe_dev->hw_info->vfe_clk_idx]) &&
prev_clk_rate >= prev_clk_rate >=
vfe_dev->vfe_clk_rates[MSM_VFE_CLK_RATE_TURBO] vfe_dev->vfe_clk_rates[MSM_VFE_CLK_RATE_NOMINAL]
[vfe_dev->hw_info->vfe_clk_idx]) { [vfe_dev->hw_info->vfe_clk_idx]) {
ret = cx_ipeak_update(vfe_dev->vfe_cx_ipeak, false); ret = cx_ipeak_update(vfe_dev->vfe_cx_ipeak, false);
if (ret) { if (ret) {