Merge "msm: camera: isp: Handle early PCR for all pipelines" (dc95bc0f) · Commits · e / devices / android_kernel_oneplus_sm7250

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

+2 −7

Original line number	Diff line number	Diff line
		@@ -3161,7 +3161,7 @@ static int __cam_isp_ctx_start_dev_in_ready(struct cam_context *ctx,
		ctx_isp->reported_req_id = 0;
		ctx_isp->substate_activated = ctx_isp->rdi_only_context ?
		CAM_ISP_CTX_ACTIVATED_APPLIED :
		(req_isp->num_fence_map_out) ? CAM_ISP_CTX_ACTIVATED_EPOCH :
		(req_isp->num_fence_map_out) ? CAM_ISP_CTX_ACTIVATED_APPLIED :
		CAM_ISP_CTX_ACTIVATED_SOF;

		/*
		@@ -3183,13 +3183,8 @@ static int __cam_isp_ctx_start_dev_in_ready(struct cam_context *ctx,
		CAM_DBG(CAM_ISP, "start device success ctx %u", ctx->ctx_id);

		list_del_init(&req->list);

		if (req_isp->num_fence_map_out) {
		list_add_tail(&req->list, &ctx->active_req_list);
		ctx_isp->active_req_cnt++;
		} else {
		list_add_tail(&req->list, &ctx->wait_req_list);
		}

		end:
		return rc;
		}