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

Commit b0c61c95 authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: isp: Fix type mismatch arguments in indirect function... 

Merge "msm: camera: isp: Fix type mismatch arguments in indirect function calls" into camera-kernel.lnx.4.0
parents 0490cb29 0d76e160

drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+2 −1
Original line number Diff line number Diff line
@@ -7583,7 +7583,8 @@ static int cam_ife_hw_mgr_find_affected_ctx( 
		 */

		if (notify_err_cb)

			notify_err_cb(ife_hwr_mgr_ctx->common.cb_priv,

				CAM_ISP_HW_EVENT_ERROR, error_event_data);

				CAM_ISP_HW_EVENT_ERROR,

				(void *)error_event_data);

		else {

			CAM_WARN(CAM_ISP, "Error call back is not set");

			goto end;

drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c

+8 −7
Original line number Diff line number Diff line
@@ -5170,7 +5170,7 @@ static int cam_tfe_hw_mgr_find_affected_ctx( 
		 */

		if (notify_err_cb) {

			notify_err_cb(tfe_hwr_mgr_ctx->common.cb_priv,

			CAM_ISP_HW_EVENT_ERROR, error_event_data);

			CAM_ISP_HW_EVENT_ERROR, (void *)error_event_data);

		} else {

			CAM_WARN(CAM_ISP, "Error call back is not set");

			goto end;
@@ -5304,7 +5304,7 @@ static int cam_tfe_hw_mgr_handle_hw_rup( 
		if (atomic_read(&tfe_hw_mgr_ctx->overflow_pending))

			break;

		tfe_hwr_irq_rup_cb(tfe_hw_mgr_ctx->common.cb_priv,

			CAM_ISP_HW_EVENT_REG_UPDATE, &rup_event_data);

			CAM_ISP_HW_EVENT_REG_UPDATE, (void *)&rup_event_data);

		break;



	default:
@@ -5336,7 +5336,8 @@ static int cam_tfe_hw_mgr_handle_hw_epoch( 
		if (atomic_read(&tfe_hw_mgr_ctx->overflow_pending))

			break;

		tfe_hw_irq_epoch_cb(tfe_hw_mgr_ctx->common.cb_priv,

			CAM_ISP_HW_EVENT_EPOCH, &epoch_done_event_data);

			CAM_ISP_HW_EVENT_EPOCH,

			(void *)&epoch_done_event_data);

		break;



	case CAM_ISP_HW_TFE_IN_RDI0:
@@ -5377,7 +5378,7 @@ static int cam_tfe_hw_mgr_handle_hw_sof( 
			break;



		tfe_hw_irq_sof_cb(tfe_hw_mgr_ctx->common.cb_priv,

			CAM_ISP_HW_EVENT_SOF, &sof_done_event_data);

			CAM_ISP_HW_EVENT_SOF, (void *)&sof_done_event_data);



		break;
@@ -5392,7 +5393,7 @@ static int cam_tfe_hw_mgr_handle_hw_sof( 
		if (atomic_read(&tfe_hw_mgr_ctx->overflow_pending))

			break;

		tfe_hw_irq_sof_cb(tfe_hw_mgr_ctx->common.cb_priv,

			CAM_ISP_HW_EVENT_SOF, &sof_done_event_data);

			CAM_ISP_HW_EVENT_SOF, (void *)&sof_done_event_data);

		break;



	default:
@@ -5423,7 +5424,7 @@ static int cam_tfe_hw_mgr_handle_hw_eof( 
		if (atomic_read(&tfe_hw_mgr_ctx->overflow_pending))

			break;

		tfe_hw_irq_eof_cb(tfe_hw_mgr_ctx->common.cb_priv,

			CAM_ISP_HW_EVENT_EOF, &eof_done_event_data);

			CAM_ISP_HW_EVENT_EOF, (void *)&eof_done_event_data);



		break;
@@ -5466,7 +5467,7 @@ static int cam_tfe_hw_mgr_handle_hw_buf_done( 
	if (buf_done_event_data.num_handles > 0 && tfe_hwr_irq_wm_done_cb) {

		CAM_DBG(CAM_ISP, "Notify ISP context");

		tfe_hwr_irq_wm_done_cb(tfe_hw_mgr_ctx->common.cb_priv,

			CAM_ISP_HW_EVENT_DONE, &buf_done_event_data);

			CAM_ISP_HW_EVENT_DONE, (void *)&buf_done_event_data);

	}



	CAM_DBG(CAM_ISP, "Buf done for out_res->res_id: 0x%x",