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

Commit 669d81d4 authored by Peter Liu's avatar Peter Liu
Browse files

msm: camera: isp: set clk properly if no PIX intf existed 



If there is no pix interface, still set the clock based on
user RDI request.

Change-Id: Iee1221329ae20b3b427003f316a25f305d3ffc66
Signed-off-by: default avatarPeter Liu <pingchie@codeaurora.org>
parent 783bbd7d

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

+11 −8
Original line number Diff line number Diff line
@@ -608,7 +608,7 @@ void msm_isp_fetch_engine_done_notify(struct vfe_device *vfe_dev, 
	msm_isp_send_event(vfe_dev, ISP_EVENT_FE_READ_DONE, &fe_rd_done_event);

}



int msm_isp_cfg_pix(struct vfe_device *vfe_dev,

static int msm_isp_cfg_pix(struct vfe_device *vfe_dev,

	struct msm_vfe_input_cfg *input_cfg)

{

	int rc = 0;
@@ -632,12 +632,6 @@ int msm_isp_cfg_pix(struct vfe_device *vfe_dev, 
	vfe_dev->axi_data.src_info[VFE_PIX_0].input_format =

		input_cfg->d.pix_cfg.input_format;

	vfe_dev->axi_data.src_info[VFE_PIX_0].sof_counter_step = 1;

	rc = msm_isp_set_clk_rate(vfe_dev,

		&vfe_dev->axi_data.src_info[VFE_PIX_0].pixel_clock);

	if (rc < 0) {

		pr_err("%s: clock set rate failed\n", __func__);

		return rc;

	}



	/*

	 * Fill pixel_clock into input_pix_clk so that user space
@@ -670,7 +664,7 @@ int msm_isp_cfg_pix(struct vfe_device *vfe_dev, 
	return rc;

}



int msm_isp_cfg_rdi(struct vfe_device *vfe_dev,

static int msm_isp_cfg_rdi(struct vfe_device *vfe_dev,

	struct msm_vfe_input_cfg *input_cfg)

{

	int rc = 0;
@@ -691,6 +685,7 @@ int msm_isp_cfg_input(struct vfe_device *vfe_dev, void *arg) 
{

	int rc = 0;

	struct msm_vfe_input_cfg *input_cfg = arg;

	long pixel_clock = 0;



	switch (input_cfg->input_src) {

	case VFE_PIX_0:
@@ -705,6 +700,14 @@ int msm_isp_cfg_input(struct vfe_device *vfe_dev, void *arg) 
		pr_err("%s: Invalid input source\n", __func__);

		rc = -EINVAL;

	}



	pixel_clock = input_cfg->input_pix_clk;

	rc = msm_isp_set_clk_rate(vfe_dev,

		&pixel_clock);

	if (rc < 0) {

		pr_err("%s: clock set rate failed\n", __func__);

		return rc;

	}

	return rc;

}