浏览代码

Merge "msm: camera: isp: Check for epoch before applying" into camera-kernel.lnx.4.0

Camera Software Integration 5 年之前
父节点
当前提交
9d3794440c
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      drivers/cam_isp/cam_isp_context.c

+ 3 - 1
drivers/cam_isp/cam_isp_context.c

@@ -1108,7 +1108,9 @@ static int __cam_isp_ctx_apply_req_offline(
 		goto end;
 	}
 
-	if (ctx->state != CAM_CTX_ACTIVATED)
+	if ((ctx->state != CAM_CTX_ACTIVATED) ||
+		(!atomic_read(&ctx_isp->rxd_epoch)) ||
+		(ctx_isp->substate_activated == CAM_ISP_CTX_ACTIVATED_APPLIED))
 		goto end;
 
 	if (ctx_isp->active_req_cnt >= 2)