Merge "msm: camera: isp: Stop hw before setting HALT substate" into dev/msm-4.14-camx (b527fe8c) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/media/platform/msm/camera/cam_isp/cam_isp_context.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -3845,12 +3845,6 @@ 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);
		CAM_DBG(CAM_ISP, "next substate %d", ctx_isp->substate_activated);

		/* stop hw first */
		if (ctx_isp->hw_ctx) {
		stop.ctxt_to_hw_map = ctx_isp->hw_ctx;
		@@ -3867,6 +3861,12 @@ 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 %d", ctx_isp->substate_activated);

		while (!list_empty(&ctx->pending_req_list)) {
		req = list_first_entry(&ctx->pending_req_list,
		struct cam_ctx_request, list);