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

Commit 5124a62b authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "msm: camera: isp: Handle early PCR for all pipelines"" into dev/msm-4.14-camx

parents e8d58d76 c321eb59

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

+7 −2
Original line number Diff line number Diff line
@@ -3170,7 +3170,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_APPLIED :

		(req_isp->num_fence_map_out) ? CAM_ISP_CTX_ACTIVATED_EPOCH :

		CAM_ISP_CTX_ACTIVATED_SOF;



	/*
@@ -3192,8 +3192,13 @@ 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);

	list_add_tail(&req->list, &ctx->wait_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;

}