From 5ef9d03a86f8190afe22e60dcf1593ac74af3241 Mon Sep 17 00:00:00 2001 From: Karthik Anantha Ram Date: Thu, 22 Oct 2020 16:53:25 -0700 Subject: [PATCH] msm: camera: isp: Wait for cdm submit incase of custom HW If IFE is connected to custom HW in the pipeline, make the cdm submit a blocking call to ensure settings are programmed to IFE on time. CRs-Fixed: 2805278 Change-Id: Ia0d771a0f875a3b41c67eef496a96461c579dac0 Signed-off-by: Karthik Anantha Ram --- drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c b/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c index 40f1d24701e6..299f9f8da733 100644 --- a/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c +++ b/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c @@ -3960,7 +3960,8 @@ static int cam_ife_mgr_config_hw(void *hw_mgr_priv, return rc; } - if (cfg->init_packet) { + if (cfg->init_packet || + (ctx->custom_config & CAM_IFE_CUSTOM_CFG_SW_SYNC_ON)) { rem_jiffies = wait_for_completion_timeout( &ctx->config_done_complete, msecs_to_jiffies(60));