From: Shubhraprakash Das <sadas@codeaurora.org>
Date: Tue, 15 Nov 2016 03:38:37 +0000 (-0800)
Subject: msm: camera: isp: Check reg update miss only for PIX stream
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1e796900d30798d99d0ae4adee617ce0bf4ce3ce;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

msm: camera: isp: Check reg update miss only for PIX stream

Reg updates can only miss on PIX stream since reg updates
are forced for RDI streams. This also prevents the error
check from being called multiple times for PIX streams.

CRs-Fixed: 1089937
Change-Id: Ibe0ea7efabc5a8452f05fdc2ab8b3ec7931a66e7
Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
---

diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c
index 71f5962bba8d..1bf628de4df0 100644
--- a/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c
+++ b/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c
@@ -700,7 +700,7 @@ void msm_isp_check_for_output_error(struct vfe_device *vfe_dev,
 		sof_info->regs_not_updated =
 			vfe_dev->reg_update_requested;
 	}
-	for (i = 0; i < VFE_AXI_SRC_MAX; i++) {
+	for (i = 0; i < RDI_INTF_0; i++) {
 		stream_info = msm_isp_get_stream_common_data(vfe_dev,
 								i);
 		stream_idx = HANDLE_TO_IDX(stream_info->stream_handle[0]);
@@ -980,16 +980,12 @@ void msm_isp_notify(struct vfe_device *vfe_dev, uint32_t event_type,
 				event_data.u.sof_info.ms_delta_info.
 				num_delta_info = 1;
 			}
-			spin_unlock_irqrestore(&vfe_dev->common_data->
-				common_dev_data_lock, flags);
-		} else {
-			spin_unlock_irqrestore(&vfe_dev->common_data->
-				common_dev_data_lock, flags);
-			if (frame_src <= VFE_RAW_2) {
-				msm_isp_check_for_output_error(vfe_dev, ts,
-					&event_data.u.sof_info);
-			}
 		}
+		spin_unlock_irqrestore(&vfe_dev->common_data->
+			common_dev_data_lock, flags);
+		if (frame_src == VFE_PIX_0)
+			msm_isp_check_for_output_error(vfe_dev, ts,
+					&event_data.u.sof_info);
 		break;
 
 	default: