Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ac0fd42 authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: isp: Enable PIX & LINE count irqs by default" into camera-kernel.lnx.4.0

parents 558d74cb 8b0144bd

drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c

+13 −12
Original line number Diff line number Diff line
@@ -2154,7 +2154,6 @@ static int cam_ife_csid_enable_pxl_path( 
	if (csid_hw->csid_debug & CSID_DEBUG_ENABLE_EOF_IRQ)

		val |= CSID_PATH_INFO_INPUT_EOF;



	if (path_config->measure_enabled)

	val |= (CSID_PATH_ERROR_PIX_COUNT |

		CSID_PATH_ERROR_LINE_COUNT);
@@ -2781,7 +2780,6 @@ static int cam_ife_csid_enable_rdi_path( 
	if (csid_hw->csid_debug & CSID_DEBUG_ENABLE_EOF_IRQ)

		val |= CSID_PATH_INFO_INPUT_EOF;



	if (csid_hw->rdi_path_config[id].measure_enabled)

	val |= (CSID_PATH_ERROR_PIX_COUNT |

		CSID_PATH_ERROR_LINE_COUNT);
@@ -4843,14 +4841,15 @@ irqreturn_t cam_ife_csid_irq(int irq_num, void *data) 
				csid_hw->hw_intf->hw_idx,

				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",

			"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,

			((val >>

			csid_reg->cmn_reg->format_measure_height_shift_val) &

			csid_reg->cmn_reg->format_measure_height_mask_val),

			val &

			csid_reg->cmn_reg->format_measure_width_mask_val);

			csid_reg->cmn_reg->format_measure_width_mask_val,

			val);

		}

	}
@@ -4914,14 +4913,15 @@ irqreturn_t cam_ife_csid_irq(int irq_num, void *data) 
				csid_hw->hw_intf->hw_idx,

				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",

			"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,

			((val >>

			csid_reg->cmn_reg->format_measure_height_shift_val) &

			csid_reg->cmn_reg->format_measure_height_mask_val),

			val &

			csid_reg->cmn_reg->format_measure_width_mask_val);

			csid_reg->cmn_reg->format_measure_width_mask_val,

			val);

		}

	}
@@ -4979,7 +4979,7 @@ irqreturn_t cam_ife_csid_irq(int irq_num, void *data) 
				"CSID:%d irq_status_rdi[%d]:0x%x",

				csid_hw->hw_intf->hw_idx, i, irq_status[i]);

			CAM_ERR(CAM_ISP,

			"Expected:: h: 0x%x w: 0x%x actual:: h: 0x%x w: 0x%x",

			"Expected:: h: 0x%x w: 0x%x actual:: h: 0x%x w: 0x%x [format_measure0: 0x%x]",

			((val2 >>

			csid_reg->cmn_reg->format_measure_height_shift_val) &

			csid_reg->cmn_reg->format_measure_height_mask_val),
@@ -4989,7 +4989,8 @@ irqreturn_t cam_ife_csid_irq(int irq_num, void *data) 
			csid_reg->cmn_reg->format_measure_height_shift_val) &

			csid_reg->cmn_reg->format_measure_height_mask_val),

			val &

			csid_reg->cmn_reg->format_measure_width_mask_val);

			csid_reg->cmn_reg->format_measure_width_mask_val,

			val);

		}

	}