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

Commit 065e0455 authored by Gjorgji Rosikopulos's avatar Gjorgji Rosikopulos Committed by Gerrit - the friendly Code Review server
Browse files

msm: camera: face detect: fix stream off sync issue 



Stream off will block until the active buffer
in processing queue is completed. There was small
time window where the active buffer was removed from device
queue but still was not completed.

Change-Id: Icb90053761de200a63ec7c72a2b3446582a240d7
Signed-off-by: default avatarGjorgji Rosikopulos <grosik@codeaurora.org>
parent 7ec67867

drivers/media/platform/msm/camera_v2/fd/msm_fd_hw.c

+26 −3
Original line number Diff line number Diff line
@@ -1266,6 +1266,25 @@ static int msm_fd_hw_try_enable(struct msm_fd_device *fd, 
	return enabled;

}



/*

 * msm_fd_hw_remove_active_buffer - Remove active buffer from processing queue.

 * @fd: Fd device.

 */

static int msm_fd_hw_remove_active_buffer(struct msm_fd_device *fd)

{

	struct msm_fd_buffer *buffer;

	int active_removed = 0;



	if (!list_empty(&fd->buf_queue)) {

		buffer = list_first_entry(&fd->buf_queue,

			struct msm_fd_buffer, list);

		list_del(&buffer->list);

		active_removed = 1;

	}



	return active_removed;

}



/*

 * msm_fd_hw_next_buffer - Get next buffer from fd device processing queue.

 * @fd: Fd device.
@@ -1331,8 +1350,6 @@ void msm_fd_hw_remove_buffers_from_queue(struct msm_fd_device *fd, 
		time = wait_for_completion_timeout(&active_buffer->completion,

			msecs_to_jiffies(MSM_FD_PROCESSING_TIMEOUT_MS));

		if (!time) {

			/* Remove active buffer */

			msm_fd_hw_get_active_buffer(fd);

			/* Schedule if other buffers are present in device */

			msm_fd_hw_schedule_next_buffer(fd);

		}
@@ -1378,7 +1395,6 @@ struct msm_fd_buffer *msm_fd_hw_get_active_buffer(struct msm_fd_device *fd) 
	if (!list_empty(&fd->buf_queue)) {

		buffer = list_first_entry(&fd->buf_queue,

			struct msm_fd_buffer, list);

		list_del(&buffer->list);

	}

	spin_unlock(&fd->slock);
@@ -1425,6 +1441,13 @@ int msm_fd_hw_schedule_next_buffer(struct msm_fd_device *fd) 
		return -EBUSY;

	}



	ret = msm_fd_hw_remove_active_buffer(fd);

	if (ret == 0) {

		dev_err(fd->dev, "Active buffer is missing\n");

		spin_unlock(&fd->slock);

		return -EBUSY;

	}



	buf = msm_fd_hw_next_buffer(fd);

	if (buf) {

		ret = msm_fd_hw_try_enable(fd, buf, MSM_FD_DEVICE_RUNNING);