Merge "msm: camera: isp: Transition to HALT state prior to HW stop" into camera-kernel.lnx.4.0 (20e88f8b) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/cam_isp/cam_isp_context.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -5362,6 +5362,11 @@ static int __cam_isp_ctx_stop_dev_in_activated_unlock(
		(struct cam_isp_context *) ctx->ctx_priv;
		struct cam_isp_stop_args stop_isp;

		/* Mask off all the incoming hardware events */
		spin_lock_bh(&ctx->lock);
		ctx_isp->substate_activated = CAM_ISP_CTX_ACTIVATED_HALT;
		spin_unlock_bh(&ctx->lock);

		/* stop hw first */
		if (ctx_isp->hw_ctx) {
		stop.ctxt_to_hw_map = ctx_isp->hw_ctx;
		@@ -5374,10 +5379,6 @@ static int __cam_isp_ctx_stop_dev_in_activated_unlock(
		&stop);
		}

		/* Mask off all the incoming hardware events */
		spin_lock_bh(&ctx->lock);
		ctx_isp->substate_activated = CAM_ISP_CTX_ACTIVATED_HALT;
		spin_unlock_bh(&ctx->lock);
		CAM_DBG(CAM_ISP, "next Substate[%s]",
		__cam_isp_ctx_substate_val_to_type(
		ctx_isp->substate_activated));