Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb4d23d6 authored by Shubhraprakash Das's avatar Shubhraprakash Das
Browse files

msm: camera: isp: Vote ahb clock to nominal. 



Vote for ahb clock to nominal if the vfe clock is nominal
or higher.

Change-Id: I3f154dffefb5b834a166e4dca520d5fc53ad7133
CRs-Fixed: 1066421
Signed-off-by: default avatarShubhraprakash Das <sadas@codeaurora.org>
parent 8401b47c

drivers/media/platform/msm/camera_v2/isp/msm_isp47.c

+23 −2
Original line number Diff line number Diff line
@@ -248,13 +248,31 @@ static enum cam_ahb_clk_vote msm_isp47_get_cam_clk_vote( 
	return 0;

}



static int msm_isp47_ahb_clk_cfg(struct vfe_device *vfe_dev,

int msm_isp47_ahb_clk_cfg(struct vfe_device *vfe_dev,

			struct msm_isp_ahb_clk_cfg *ahb_cfg)

{

	int rc = 0;

	enum cam_ahb_clk_vote vote;

	enum cam_ahb_clk_vote src_clk_vote;

	struct msm_isp_clk_rates clk_rates;



	if (ahb_cfg)

		vote = msm_isp47_get_cam_clk_vote(ahb_cfg->vote);

	else

		vote = CAM_AHB_SVS_VOTE;



	vfe_dev->hw_info->vfe_ops.platform_ops.get_clk_rates(vfe_dev,

							&clk_rates);

	if (vfe_dev->msm_isp_vfe_clk_rate <= clk_rates.svs_rate)

		src_clk_vote = CAM_AHB_SVS_VOTE;

	else if (vfe_dev->msm_isp_vfe_clk_rate <= clk_rates.nominal_rate)

		src_clk_vote = CAM_AHB_NOMINAL_VOTE;

	else

		src_clk_vote = CAM_AHB_TURBO_VOTE;



	/* vote for higher of the user requested or src clock matched vote */

	if (vote < src_clk_vote)

		vote = src_clk_vote;



	if (vote && vfe_dev->ahb_vote != vote) {

		rc = cam_config_ahb_clk(NULL, 0,
@@ -2339,6 +2357,9 @@ int msm_vfe47_set_clk_rate(struct vfe_device *vfe_dev, long *rate) 
		return rc;

	*rate = clk_round_rate(vfe_dev->vfe_clk[clk_idx], *rate);

	vfe_dev->msm_isp_vfe_clk_rate = *rate;



	if (vfe_dev->hw_info->vfe_ops.core_ops.ahb_clk_cfg)

		vfe_dev->hw_info->vfe_ops.core_ops.ahb_clk_cfg(vfe_dev, NULL);

	return 0;

}

drivers/media/platform/msm/camera_v2/isp/msm_isp47.h

+2 −0
Original line number Diff line number Diff line
@@ -193,4 +193,6 @@ int msm_vfe47_update_bandwidth( 
void msm_vfe47_config_irq(struct vfe_device *vfe_dev,

		uint32_t irq0_mask, uint32_t irq1_mask,

		enum msm_isp_irq_operation oper);

int msm_isp47_ahb_clk_cfg(struct vfe_device *vfe_dev,

			struct msm_isp_ahb_clk_cfg *ahb_cfg);

#endif /* __MSM_ISP47_H__ */

drivers/media/platform/msm/camera_v2/isp/msm_isp48.c

+1 −0
Original line number Diff line number Diff line
@@ -308,6 +308,7 @@ struct msm_vfe_hardware_info vfe48_hw_info = { 
			.process_error_status = msm_vfe47_process_error_status,

			.is_module_cfg_lock_needed =

				msm_vfe47_is_module_cfg_lock_needed,

			.ahb_clk_cfg = msm_isp47_ahb_clk_cfg,

		},

		.stats_ops = {

			.get_stats_idx = msm_vfe47_get_stats_idx,