Explorar el Código

Merge "msm: camera: isp: Update the reported_req_id correctly" into camera-kernel.lnx.5.0

Camera Software Integration hace 4 años
padre
commit
ee9ba1b583
Se han modificado 1 ficheros con 3 adiciones y 1 borrados
  1. 3 1
      drivers/cam_isp/cam_isp_context.c

+ 3 - 1
drivers/cam_isp/cam_isp_context.c

@@ -1840,7 +1840,6 @@ notify_only:
 			if ((!req_isp->bubble_detected) &&
 				(req->request_id > ctx_isp->reported_req_id)) {
 				request_id = req->request_id;
-				ctx_isp->reported_req_id = request_id;
 				__cam_isp_ctx_update_event_record(ctx_isp,
 					CAM_ISP_CTX_EVENT_EPOCH, req);
 				break;
@@ -1850,6 +1849,9 @@ notify_only:
 		if (ctx_isp->substate_activated == CAM_ISP_CTX_ACTIVATED_BUBBLE)
 			request_id = 0;
 
+		if (request_id != 0)
+			ctx_isp->reported_req_id = request_id;
+
 		__cam_isp_ctx_send_sof_timestamp(ctx_isp, request_id,
 			CAM_REQ_MGR_SOF_EVENT_SUCCESS);