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

Merge "msm: camera: isp: Store the user ahb vote"

Browse source
This commit is contained in:
Linux Build Service Account 2017-07-18 11:51:39 -07:00 • committed by Gerrit - the friendly Code Review server
commit 32c410413b
2 changed files with 7 additions and 3 deletions
drivers/media/platform/msm/camera_v2/isp
msm_isp.hmsm_isp47.c

1
drivers/media/platform/msm/camera_v2/isp/msm_isp.h
View file

@ -786,6 +786,7 @@ struct vfe_device {
size_t num_norm_clk;
bool hvx_clk_state;
enum cam_ahb_clk_vote ahb_vote;
enum cam_ahb_clk_vote user_requested_ahb_vote;
struct cx_ipeak_client *vfe_cx_ipeak;
/* Sync variables*/

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

@ -274,10 +274,12 @@ int msm_isp47_ahb_clk_cfg(struct vfe_device *vfe_dev,
enum cam_ahb_clk_vote src_clk_vote;
struct msm_isp_clk_rates clk_rates;
if (ahb_cfg)
if (ahb_cfg) {
vote = msm_isp47_get_cam_clk_vote(ahb_cfg->vote);
else
vote = CAM_AHB_SVS_VOTE;
vfe_dev->user_requested_ahb_vote = vote;
} else {
vote = vfe_dev->user_requested_ahb_vote;
}
vfe_dev->hw_info->vfe_ops.platform_ops.get_clk_rates(vfe_dev,
&clk_rates);
@ -327,6 +329,7 @@ int msm_vfe47_init_hardware(struct vfe_device *vfe_dev)
if (rc)
goto clk_enable_failed;
vfe_dev->user_requested_ahb_vote = CAM_AHB_SVS_VOTE;
rc = cam_config_ahb_clk(NULL, 0, id, CAM_AHB_SVS_VOTE);
if (rc < 0) {
pr_err("%s: failed to vote for AHB\n", __func__);