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

Commit 62ad3e5b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge remote-tracking branch 'dev/msm-4.14' into msm-4.9 07/03"

parents 99f991de 130c3606

drivers/media/platform/msm/camera_v3/cam_core/cam_context_utils.c

+14 −4
Original line number Diff line number Diff line
@@ -461,6 +461,17 @@ int32_t cam_context_prepare_dev_to_hw(struct cam_context *ctx, 
				"[%s][%d] : Moving req[%llu] from free_list to pending_list",

				ctx->dev_name, ctx->ctx_id, req->request_id);



		for (j = 0; j < req->num_in_map_entries; j++) {

			rc = cam_sync_check_valid(

				req->in_map_entries[j].sync_id);

			if (rc) {

				CAM_ERR(CAM_CTXT,

					"invalid in map sync object %d",

					req->in_map_entries[j].sync_id);

				goto put_ref;

			}

		}



		for (j = 0; j < req->num_in_map_entries; j++) {

			cam_context_getref(ctx);

			rc = cam_sync_register_callback(
@@ -482,7 +493,9 @@ int32_t cam_context_prepare_dev_to_hw(struct cam_context *ctx, 
						ctx->dev_name, ctx->ctx_id,

						req->request_id);



				goto put_ctx_ref;

				cam_context_putref(ctx);

				goto put_ref;



			}

			CAM_DBG(CAM_CTXT, "register in fence cb: %d ret = %d",

				req->in_map_entries[j].sync_id, rc);
@@ -491,9 +504,6 @@ int32_t cam_context_prepare_dev_to_hw(struct cam_context *ctx, 
	}



	return rc;

put_ctx_ref:

	for (--j; j >= 0; j--)

		cam_context_putref(ctx);

put_ref:

	for (--i; i >= 0; i--) {

		rc = cam_sync_put_obj_ref(req->out_map_entries[i].sync_id);

drivers/media/platform/msm/camera_v3/cam_cpas/cam_cpas_hw.c

+7 −0
Original line number Diff line number Diff line
@@ -1234,6 +1234,13 @@ static int cam_cpas_hw_register_client(struct cam_hw_info *cpas_hw, 
	rc = cam_common_util_get_string_index(soc_private->client_name,

		soc_private->num_clients, client_name, &client_indx);



	if (rc) {

		CAM_ERR(CAM_CPAS, "No match found for client %s",

			client_name);

		mutex_unlock(&cpas_hw->hw_mutex);

		return rc;

	}



	mutex_lock(&cpas_core->client_mutex[client_indx]);



	if (rc || !CAM_CPAS_CLIENT_VALID(client_indx) ||

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

+210 −116

File changed.

Preview size limit exceeded, changes collapsed.

drivers/media/platform/msm/camera_v3/cam_isp/cam_isp_context.h

+35 −23

File changed.

Preview size limit exceeded, changes collapsed.

drivers/media/platform/msm/camera_v3/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+2 −2
Original line number Diff line number Diff line
@@ -2637,7 +2637,7 @@ static int cam_ife_mgr_stop_hw(void *hw_mgr_priv, void *stop_hw_args) 


	/* Stop the master CSID path first */

	cam_ife_mgr_csid_stop_hw(ctx, &ctx->res_list_ife_csid,

		master_base_idx, CAM_CSID_HALT_AT_FRAME_BOUNDARY);

		master_base_idx, csid_halt_type);



	/* stop rest of the CSID paths  */

	for (i = 0; i < ctx->num_base; i++) {
@@ -2647,7 +2647,7 @@ static int cam_ife_mgr_stop_hw(void *hw_mgr_priv, void *stop_hw_args) 
			ctx->base[i].idx, i, master_base_idx);



		cam_ife_mgr_csid_stop_hw(ctx, &ctx->res_list_ife_csid,

			ctx->base[i].idx, CAM_CSID_HALT_AT_FRAME_BOUNDARY);

			ctx->base[i].idx, csid_halt_type);

	}



	CAM_DBG(CAM_ISP, "Stopping master CID idx %d", master_base_idx);