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

Commit 674b64d8 authored by Nagesh Subba Reddy's avatar Nagesh Subba Reddy Committed by Gerrit - the friendly Code Review server
Browse files

msm: camera: Fix request frame while CDS is on 



When CDS is in progress, request frame should be supported.
Added additional check for validation of state.

Change-Id: I3ced45a6a50f2ee2cc64c154b402c8dee6cedd74
Signed-off-by: default avatarNagesh Subba Reddy <nageshsreddy@codeaurora.org>
parent f0dd632b

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

+10 −2
Original line number Diff line number Diff line
@@ -383,6 +383,7 @@ int msm_isp_axi_check_stream_state( 
				(stream_cfg_cmd->cmd == STOP_STREAM ||

				stream_cfg_cmd->cmd == STOP_IMMEDIATELY)) {

				stream_info->state = ACTIVE;



			} else {

				pr_err("%s: Invalid stream state: %d\n",

					__func__, stream_info->state);
@@ -1934,9 +1935,16 @@ int msm_isp_update_axi_stream(struct vfe_device *vfe_dev, void *arg) 
				HANDLE_TO_IDX(update_info->stream_handle)];

		if (SRC_TO_INTF(stream_info->stream_src) >= VFE_SRC_MAX)

			continue;



		if (stream_info->state != ACTIVE &&

			stream_info->state != INACTIVE) {

			pr_err("%s: Invalid stream state\n", __func__);

			stream_info->state != INACTIVE &&

			update_cmd->update_type !=

			UPDATE_STREAM_REQUEST_FRAMES &&

			update_cmd->update_type !=

			UPDATE_STREAM_REMOVE_BUFQ) {

			pr_err("%s: Invalid stream state %d, update cmd %d\n",

				__func__, stream_info->state,

				stream_info->stream_id);

			return -EINVAL;

		}

		if (update_cmd->update_type == UPDATE_STREAM_AXI_CONFIG &&