Browse Source

msm: camera: isp: Combine the exp info for EPCR case

Combine the num_exp for sHDR EPCR case, and we can
override the mode switch related parameters only
when the mup is enabled in new req.

CRs-Fixed: 3106141
Change-Id: I1bd0b38402962ca598f2e5c6bd528a0af2adc55f
Signed-off-by: Depeng Shao <[email protected]>
Depeng Shao 3 years ago
parent
commit
91b28696d8
1 changed files with 8 additions and 2 deletions
  1. 8 2
      drivers/cam_isp/cam_isp_context.c

+ 8 - 2
drivers/cam_isp/cam_isp_context.c

@@ -973,8 +973,14 @@ static int __cam_isp_ctx_enqueue_init_request(
 				req_isp_new->hw_update_data.frame_header_res_id;
 			req_isp_old->hw_update_data.frame_header_cpu_addr =
 				hw_update_data->frame_header_cpu_addr;
-			req_isp_old->hw_update_data.mup_en = req_isp_new->hw_update_data.mup_en;
-			req_isp_old->hw_update_data.mup_val = req_isp_new->hw_update_data.mup_val;
+			if (req_isp_new->hw_update_data.mup_en) {
+				req_isp_old->hw_update_data.mup_en =
+					req_isp_new->hw_update_data.mup_en;
+				req_isp_old->hw_update_data.mup_val =
+					req_isp_new->hw_update_data.mup_val;
+				req_isp_old->hw_update_data.num_exp =
+					req_isp_new->hw_update_data.num_exp;
+			}
 			req_old->request_id = req->request_id;
 
 			list_add_tail(&req->list, &ctx->free_req_list);