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

Commit eedefac6 authored by Haritha Chintalapati's avatar Haritha Chintalapati Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: sync: Rearrange sync reason events" into camera-kernel.lnx.4.0

parents ac6f9699 baf2d520

drivers/cam_core/cam_context_utils.c

+3 −3
Original line number Diff line number Diff line
@@ -663,7 +663,7 @@ int32_t cam_context_flush_ctx_to_hw(struct cam_context *ctx) 
				rc = cam_sync_signal(

					req->out_map_entries[i].sync_id,

					CAM_SYNC_STATE_SIGNALED_CANCEL,

					CAM_SYNC_EVENT_FLUSH);

					CAM_SYNC_COMMON_EVENT_FLUSH);

				if (rc == -EALREADY) {

					CAM_ERR(CAM_CTXT,

					"Req: %llu already signalled, sync_id:%d",
@@ -736,7 +736,7 @@ int32_t cam_context_flush_ctx_to_hw(struct cam_context *ctx) 
				rc = cam_sync_signal(

					req->out_map_entries[i].sync_id,

					CAM_SYNC_STATE_SIGNALED_CANCEL,

					CAM_SYNC_EVENT_FLUSH);

					CAM_SYNC_COMMON_EVENT_FLUSH);

				if (rc == -EALREADY) {

					CAM_ERR(CAM_CTXT,

						"Req: %llu already signalled ctx: %pK dev_name: %s dev_handle: %d ctx_state: %d",
@@ -850,7 +850,7 @@ int32_t cam_context_flush_req_to_hw(struct cam_context *ctx, 
				if (sync_id != -1) {

					rc = cam_sync_signal(sync_id,

						CAM_SYNC_STATE_SIGNALED_CANCEL,

						CAM_SYNC_EVENT_FLUSH);

						CAM_SYNC_COMMON_EVENT_FLUSH);

					if (rc == -EALREADY) {

						CAM_ERR(CAM_CTXT,

						"Req: %llu already signalled, sync_id:%d",

drivers/cam_cust/cam_custom_context.c

+5 −5
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static int __cam_custom_ctx_frame_done( 


		rc = cam_sync_signal(req_custom->fence_map_out[j].sync_id,

				CAM_SYNC_STATE_SIGNALED_SUCCESS,

				CAM_SYNC_EVENT_SUCCESS);

				CAM_SYNC_COMMON_EVENT_SUCCESS);

		if (rc)

			CAM_ERR(CAM_CUSTOM, "Sync failed with rc = %d", rc);
@@ -370,7 +370,7 @@ static int __cam_custom_ctx_flush_req(struct cam_context *ctx, 
				rc = cam_sync_signal(

					req_custom->fence_map_out[i].sync_id,

					CAM_SYNC_STATE_SIGNALED_CANCEL,

					CAM_SYNC_EVENT_FLUSH);

					CAM_SYNC_COMMON_EVENT_FLUSH);

				if (rc)

					CAM_ERR_RATE_LIMIT(CAM_CUSTOM,

						"signal fence failed\n");
@@ -546,7 +546,7 @@ static int __cam_custom_stop_dev_core( 
				cam_sync_signal(

					req_custom->fence_map_out[i].sync_id,

					CAM_SYNC_STATE_SIGNALED_CANCEL,

					CAM_SYNC_EVENT_STOP);

					CAM_SYNC_COMMON_EVENT_STOP);

			}

		list_add_tail(&req->list, &ctx->free_req_list);

	}
@@ -563,7 +563,7 @@ static int __cam_custom_stop_dev_core( 
				cam_sync_signal(

					req_custom->fence_map_out[i].sync_id,

					CAM_SYNC_STATE_SIGNALED_CANCEL,

					CAM_SYNC_EVENT_STOP);

					CAM_SYNC_COMMON_EVENT_STOP);

			}

		list_add_tail(&req->list, &ctx->free_req_list);

	}
@@ -580,7 +580,7 @@ static int __cam_custom_stop_dev_core( 
				cam_sync_signal(

					req_custom->fence_map_out[i].sync_id,

					CAM_SYNC_STATE_SIGNALED_CANCEL,

					CAM_SYNC_EVENT_STOP);

					CAM_SYNC_COMMON_EVENT_STOP);

			}

		list_add_tail(&req->list, &ctx->free_req_list);

	}

drivers/cam_isp/cam_isp_context.c

+2 −2
Original line number Diff line number Diff line
@@ -937,7 +937,7 @@ static int __cam_isp_ctx_handle_buf_done_for_request( 


			rc = cam_sync_signal(req_isp->fence_map_out[j].sync_id,

				CAM_SYNC_STATE_SIGNALED_SUCCESS,

				CAM_SYNC_EVENT_SUCCESS);

				CAM_SYNC_COMMON_EVENT_SUCCESS);

			if (rc)

				CAM_DBG(CAM_ISP, "Sync failed with rc = %d",

					 rc);
@@ -1078,7 +1078,7 @@ static int __cam_isp_ctx_handle_buf_done_for_request_verify_addr( 


			rc = cam_sync_signal(req_isp->fence_map_out[j].sync_id,

				CAM_SYNC_STATE_SIGNALED_SUCCESS,

				CAM_SYNC_EVENT_SUCCESS);

				CAM_SYNC_COMMON_EVENT_SUCCESS);

			if (rc)

				CAM_DBG(CAM_ISP, "Sync failed with rc = %d",

					 rc);

drivers/cam_lrme/lrme_hw_mgr/cam_lrme_hw_mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ static int cam_lrme_mgr_cb(void *data, 
		buf_data.request_id = frame_req->req_id;

		buf_data.evt_param = (cb_args->cb_type & CAM_LRME_CB_ERROR) ?

			CAM_SYNC_LRME_EVENT_CB_ERROR :

			CAM_SYNC_EVENT_SUCCESS;

			CAM_SYNC_COMMON_EVENT_SUCCESS;

		CAM_DBG(CAM_LRME, "frame req %llu, evt_id %d",

			frame_req->req_id, evt_id);

		rc = hw_mgr->event_cb(frame_req->ctxt_to_hw_map,

drivers/cam_ope/ope_hw_mgr/cam_ope_hw_mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -1567,7 +1567,7 @@ static void cam_ope_ctx_cdm_callback(uint32_t handle, void *userdata, 
			ope_req->request_id, ctx->ctx_id);

		cam_ope_req_timer_reset(ctx);

		cam_ope_device_timer_reset(ope_hw_mgr);

		buf_data.evt_param = CAM_SYNC_EVENT_SUCCESS;

		buf_data.evt_param = CAM_SYNC_COMMON_EVENT_SUCCESS;

	} else if (status == CAM_CDM_CB_STATUS_HW_RESUBMIT) {

		CAM_INFO(CAM_OPE, "After reset of CDM and OPE, reapply req");

		buf_data.evt_param = CAM_SYNC_OPE_EVENT_HW_RESUBMIT;