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

Commit 4d505a51 authored by Junzhe Zou's avatar Junzhe Zou Committed by Gerrit - the friendly Code Review server
Browse files

msm: camera: isp: only wait for cdm callback for start 



Add check to make IFE only wait for its CDM callback when it starts.

Change-Id: Idfbebd575d34681d08de0363fb56fca5b7c51130
Signed-off-by: default avatarJunzhe Zou <jnzhezou@codeaurora.org>
parent ff5c2417

drivers/media/platform/msm/camera/cam_core/cam_hw_mgr_intf.h

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ struct cam_hw_config_args { 
	uint32_t                        num_out_map_entries;

	void                           *priv;

	uint64_t                        request_id;

	bool                            init_packet;

};



/**

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

+2 −0
Original line number Diff line number Diff line
@@ -1244,6 +1244,7 @@ static int __cam_isp_ctx_apply_req_in_activated_state( 
	cfg.hw_update_entries = req_isp->cfg;

	cfg.num_hw_update_entries = req_isp->num_cfg;

	cfg.priv  = &req_isp->hw_update_data;

	cfg.init_packet = 0;



	rc = ctx->hw_mgr_intf->hw_config(ctx->hw_mgr_intf->hw_mgr_priv, &cfg);

	if (rc) {
@@ -2374,6 +2375,7 @@ static int __cam_isp_ctx_start_dev_in_ready(struct cam_context *ctx, 
	arg.hw_update_entries = req_isp->cfg;

	arg.num_hw_update_entries = req_isp->num_cfg;

	arg.priv  = &req_isp->hw_update_data;

	arg.init_packet = 1;



	ctx_isp->frame_id = 0;

	ctx_isp->active_req_cnt = 0;

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

+2 −2
Original line number Diff line number Diff line
@@ -1611,7 +1611,7 @@ static int cam_ife_mgr_config_hw(void *hw_mgr_priv, 
			cdm_cmd->cmd[i].len = cmd->len;

		}



		if (cfg->request_id == 1)

		if (cfg->init_packet)

			init_completion(&ctx->config_done_complete);



		CAM_DBG(CAM_ISP, "Submit to CDM");
@@ -1621,7 +1621,7 @@ static int cam_ife_mgr_config_hw(void *hw_mgr_priv, 
			return rc;

		}



		if (cfg->request_id == 1) {

		if (cfg->init_packet) {

			rc = wait_for_completion_timeout(

				&ctx->config_done_complete,

				msecs_to_jiffies(30));