Explorar o código

Merge "msm: camera: isp: Wait for cdm submit incase of custom HW" into camera-kernel.lnx.4.0

Haritha Chintalapati %!s(int64=4) %!d(string=hai) anos
pai
achega
da1731a155
Modificáronse 1 ficheiros con 2 adicións e 1 borrados
  1. 2 1
      drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+ 2 - 1
drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

@@ -3966,7 +3966,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));