From 88406b50a83b7a45917913c946a5c0961dfc110f Mon Sep 17 00:00:00 2001 From: Venkat Chinta Date: Wed, 26 Feb 2020 19:00:01 -0800 Subject: [PATCH] msm: camera: ife: Save dual IFE flag This change saves the dual IFE flag during CAMIF acquire. This line was misplaced during rebase of commit 8e79606ada4d ("msm: camera: isp: Add support for offline IFE"). CRs-Fixed: 2630545 Change-Id: I321898aa6550b15240ca4308b1ceda1fbad14963 Signed-off-by: Venkat Chinta --- .../isp_hw/vfe_hw/vfe_top/cam_vfe_camif_ver3.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_camif_ver3.c b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_camif_ver3.c index ca0cf15ba200..a8533c11f60a 100644 --- a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_camif_ver3.c +++ b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_camif_ver3.c @@ -259,18 +259,21 @@ int cam_vfe_camif_ver3_acquire_resource( camif_data->last_line = acquire_data->vfe_in.in_port->line_stop; camif_data->is_fe_enabled = acquire_data->vfe_in.is_fe_enabled; camif_data->is_offline = acquire_data->vfe_in.is_offline; + camif_data->is_dual = acquire_data->vfe_in.is_dual; camif_data->event_cb = acquire_data->event_cb; camif_data->priv = acquire_data->priv; camif_data->qcfa_bin = acquire_data->vfe_in.in_port->qcfa_bin; camif_data->horizontal_bin = acquire_data->vfe_in.in_port->horizontal_bin; - if (acquire_data->vfe_in.is_dual) + if (camif_data->is_dual) camif_data->dual_hw_idx = acquire_data->vfe_in.dual_hw_idx; - CAM_DBG(CAM_ISP, "VFE:%d CAMIF pix_pattern:%d dsp_mode=%d", + CAM_DBG(CAM_ISP, + "VFE:%d CAMIF pix_pattern:%d dsp_mode=%d is_dual:%d dual_hw_idx:%d", camif_res->hw_intf->hw_idx, - camif_data->pix_pattern, camif_data->dsp_mode); + camif_data->pix_pattern, camif_data->dsp_mode, + camif_data->is_dual, camif_data->dual_hw_idx); return rc; }