samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Vork 0
Code Kwesties Pull-aanvragen Actions Packages Projecten Publicaties Wiki Activiteit

Merge "msm: camera: isp: Print the expected height & width" into camera-kernel.lnx.4.0

Bladeren bron
This commit is contained in:
Haritha Chintalapati
2020-12-02 19:09:36 -08:00
gecommit door Gerrit - the friendly Code Review server
bovenliggende d7cdc013ea b3b1177fdf
commit c1d9e46023
1 gewijzigde bestanden met toevoegingen van 16 en 4 verwijderingen
Download Patch-bestand Download Diff-bestand Expand all files Collapse all files

20
drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c
Bestand weergeven

@@ -5208,6 +5208,9 @@ handle_fatal_error:
CSID_PATH_ERROR_LINE_COUNT)) {
val = cam_io_r_mb(soc_info->reg_map[0].mem_base +
csid_reg->ipp_reg->csid_pxl_format_measure0_addr);
val2 = cam_io_r_mb(soc_info->reg_map[0].mem_base +
csid_reg->ipp_reg->csid_pxl_format_measure_cfg1_addr
);
CAM_ERR(CAM_ISP,
"CSID:%d irq_status_ipp:0x%x",
@@ -5215,8 +5218,11 @@ handle_fatal_error:
irq_status[CAM_IFE_CSID_IRQ_REG_IPP]);
CAM_ERR(CAM_ISP,
"Expected:: h: 0x%x w: 0x%x actual:: h: 0x%x w: 0x%x [format_measure0: 0x%x]",
csid_hw->ipp_path_config.height,
csid_hw->ipp_path_config.width,
((val2 >>
csid_reg->cmn_reg->format_measure_height_shift_val) &
csid_reg->cmn_reg->format_measure_height_mask_val),
val2 &
csid_reg->cmn_reg->format_measure_width_mask_val,
((val >>
csid_reg->cmn_reg->format_measure_height_shift_val) &
csid_reg->cmn_reg->format_measure_height_mask_val),
@@ -5285,6 +5291,9 @@ handle_fatal_error:
CSID_PATH_ERROR_LINE_COUNT)) {
val = cam_io_r_mb(soc_info->reg_map[0].mem_base +
csid_reg->ppp_reg->csid_pxl_format_measure0_addr);
val2 = cam_io_r_mb(soc_info->reg_map[0].mem_base +
csid_reg->ppp_reg->csid_pxl_format_measure_cfg1_addr
);
CAM_ERR(CAM_ISP,
"CSID:%d irq_status_ppp:0x%x",
@@ -5292,8 +5301,11 @@ handle_fatal_error:
irq_status[CAM_IFE_CSID_IRQ_REG_PPP]);
CAM_ERR(CAM_ISP,
"Expected:: h: 0x%x w: 0x%x actual:: h: 0x%x w: 0x%x [format_measure0: 0x%x]",
csid_hw->ppp_path_config.height,
csid_hw->ppp_path_config.width,
((val2 >>
csid_reg->cmn_reg->format_measure_height_shift_val) &
csid_reg->cmn_reg->format_measure_height_mask_val),
val2 &
csid_reg->cmn_reg->format_measure_width_mask_val,
((val >>
csid_reg->cmn_reg->format_measure_height_shift_val) &
csid_reg->cmn_reg->format_measure_height_mask_val),