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

Commit f57b13ff authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Make ISP and camera driver not interruptible"

parents 7ef987a9 4e75845a

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

+1 −1
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ static long msm_vfe32_reset_hardware(struct vfe_device *vfe_dev) 
{

	init_completion(&vfe_dev->reset_complete);

	msm_camera_io_w_mb(0x3FF, vfe_dev->vfe_base + 0x4);

	return wait_for_completion_interruptible_timeout(

	return wait_for_completion_timeout(

	   &vfe_dev->reset_complete, msecs_to_jiffies(50));

}

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

+1 −1
Original line number Diff line number Diff line
@@ -590,7 +590,7 @@ static long msm_vfe40_reset_hardware(struct vfe_device *vfe_dev) 
{

	init_completion(&vfe_dev->reset_complete);

	msm_camera_io_w_mb(0x1FF, vfe_dev->vfe_base + 0xC);

	return wait_for_completion_interruptible_timeout(

	return wait_for_completion_timeout(

		&vfe_dev->reset_complete, msecs_to_jiffies(50));

}

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

+1 −1
Original line number Diff line number Diff line
@@ -1082,7 +1082,7 @@ static int msm_isp_axi_wait_for_cfg_done(struct vfe_device *vfe_dev, 
	vfe_dev->axi_data.pipeline_update = camif_update;

	vfe_dev->axi_data.stream_update = 2;

	spin_unlock_irqrestore(&vfe_dev->shared_data_lock, flags);

	rc = wait_for_completion_interruptible_timeout(

	rc = wait_for_completion_timeout(

		&vfe_dev->stream_config_complete,

		msecs_to_jiffies(VFE_MAX_CFG_TIMEOUT));

	if (rc == 0) {

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

+1 −1
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ static int msm_isp_stats_wait_for_cfg_done(struct vfe_device *vfe_dev) 
	int rc;

	init_completion(&vfe_dev->stats_config_complete);

	atomic_set(&vfe_dev->stats_data.stats_update, 2);

	rc = wait_for_completion_interruptible_timeout(

	rc = wait_for_completion_timeout(

		&vfe_dev->stats_config_complete,

		msecs_to_jiffies(VFE_MAX_CFG_TIMEOUT));

	if (rc == 0) {

drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static int msm_ispif_reset_hw(struct ispif_device *ispif) 
		msm_camera_io_w(ISPIF_RST_CMD_1_MASK,

					ispif->base + ISPIF_RST_CMD_1_ADDR);



	timeout = wait_for_completion_interruptible_timeout(

	timeout = wait_for_completion_timeout(

			&ispif->reset_complete[VFE0], msecs_to_jiffies(500));

	CDBG("%s: VFE0 done\n", __func__);

	if (timeout <= 0) {