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

Commit df8d3538 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: isp: Update logic for assigning Master frame ID"

parents 8bf65755 26d096f2

drivers/media/platform/msm/camera_v2/isp/msm_isp.h

+3 −0
Original line number Diff line number Diff line
@@ -162,6 +162,8 @@ struct msm_vfe_irq_ops { 
	void (*config_irq)(struct vfe_device *vfe_dev,

		uint32_t irq_status0, uint32_t irq_status1,

		enum msm_isp_irq_operation);

	void (*process_eof_irq)(struct vfe_device *vfe_dev,

		uint32_t irq_status0);

};



struct msm_vfe_axi_ops {
@@ -479,6 +481,7 @@ struct msm_vfe_src_info { 
	struct timeval time_stamp;

	enum msm_vfe_dual_hw_type dual_hw_type;

	struct msm_vfe_dual_hw_ms_info dual_hw_ms_info;

	uint32_t eof_id;

};



struct msm_vfe_fetch_engine_info {

drivers/media/platform/msm/camera_v2/isp/msm_isp40.c

+2 −1
Original line number Diff line number Diff line
@@ -1457,7 +1457,7 @@ static void msm_vfe40_update_camif_state(struct vfe_device *vfe_dev, 
		msm_camera_io_w(0x0, vfe_dev->vfe_base + 0x30);

		msm_camera_io_w_mb(0x81, vfe_dev->vfe_base + 0x34);

		msm_camera_io_w_mb(0x1, vfe_dev->vfe_base + 0x24);

		msm_vfe40_config_irq(vfe_dev, 0xF7, 0x81,

		msm_vfe40_config_irq(vfe_dev, 0x17, 0x81,

				MSM_ISP_IRQ_ENABLE);

		msm_camera_io_w_mb(0x140000, vfe_dev->vfe_base + 0x318);
@@ -2279,6 +2279,7 @@ struct msm_vfe_hardware_info vfe40_hw_info = { 
			.process_stats_irq = msm_isp_process_stats_irq,

			.process_epoch_irq = msm_vfe40_process_epoch_irq,

			.config_irq = msm_vfe40_config_irq,

			.process_eof_irq = msm_isp47_process_eof_irq,

		},

		.axi_ops = {

			.reload_wm = msm_vfe40_axi_reload_wm,

drivers/media/platform/msm/camera_v2/isp/msm_isp44.c

+2 −1
Original line number Diff line number Diff line
@@ -1041,7 +1041,7 @@ static void msm_vfe44_update_camif_state(struct vfe_device *vfe_dev, 
		msm_camera_io_w_mb(0x81, vfe_dev->vfe_base + 0x34);

		msm_camera_io_w_mb(0x1, vfe_dev->vfe_base + 0x24);



		msm_vfe44_config_irq(vfe_dev, 0xF7, 0x81,

		msm_vfe44_config_irq(vfe_dev, 0x17, 0x81,

				MSM_ISP_IRQ_ENABLE);

		msm_camera_io_w_mb(0x140000, vfe_dev->vfe_base + 0x318);
@@ -1847,6 +1847,7 @@ struct msm_vfe_hardware_info vfe44_hw_info = { 
			.process_stats_irq = msm_isp_process_stats_irq,

			.process_epoch_irq = msm_vfe44_process_epoch_irq,

			.config_irq = msm_vfe44_config_irq,

			.process_eof_irq = msm_isp47_process_eof_irq,

		},

		.axi_ops = {

			.reload_wm = msm_vfe44_axi_reload_wm,

drivers/media/platform/msm/camera_v2/isp/msm_isp46.c

+2 −1
Original line number Diff line number Diff line
@@ -1117,7 +1117,7 @@ static void msm_vfe46_update_camif_state(struct vfe_device *vfe_dev, 
		msm_camera_io_w(0x0, vfe_dev->vfe_base + 0x64);

		msm_camera_io_w(0x81, vfe_dev->vfe_base + 0x68);

		msm_camera_io_w(0x1, vfe_dev->vfe_base + 0x58);

		msm_vfe46_config_irq(vfe_dev, 0x15, 0x81,

		msm_vfe46_config_irq(vfe_dev, 0x17, 0x81,

					MSM_ISP_IRQ_ENABLE);



		bus_en =
@@ -1951,6 +1951,7 @@ struct msm_vfe_hardware_info vfe46_hw_info = { 
			.process_stats_irq = msm_isp_process_stats_irq,

			.process_epoch_irq = msm_vfe46_process_epoch_irq,

			.config_irq = msm_vfe46_config_irq,

			.process_eof_irq = msm_isp47_process_eof_irq,

		},

		.axi_ops = {

			.reload_wm = msm_vfe46_axi_reload_wm,

drivers/media/platform/msm/camera_v2/isp/msm_isp47.c

+10 −2
Original line number Diff line number Diff line
@@ -662,6 +662,13 @@ void msm_vfe47_process_epoch_irq(struct vfe_device *vfe_dev, 
	}

}



void msm_isp47_process_eof_irq(struct vfe_device *vfe_dev,

	uint32_t irq_status0)

{

	if (irq_status0 & BIT(1))

		vfe_dev->axi_data.src_info[VFE_PIX_0].eof_id++;

}



void msm_vfe47_reg_update(struct vfe_device *vfe_dev,

	enum msm_vfe_input_src frame_src)

{
@@ -1469,7 +1476,7 @@ void msm_vfe47_update_camif_state(struct vfe_device *vfe_dev, 
		msm_camera_io_w(0x0, vfe_dev->vfe_base + 0x64);

		msm_camera_io_w(0x81, vfe_dev->vfe_base + 0x68);

		msm_camera_io_w(0x1, vfe_dev->vfe_base + 0x58);

		msm_vfe47_config_irq(vfe_dev, 0x15, 0x81,

		msm_vfe47_config_irq(vfe_dev, 0x17, 0x81,

					MSM_ISP_IRQ_ENABLE);



		if ((vfe_dev->hvx_cmd > HVX_DISABLE) &&
@@ -2682,6 +2689,7 @@ struct msm_vfe_hardware_info vfe47_hw_info = { 
			.process_stats_irq = msm_isp_process_stats_irq,

			.process_epoch_irq = msm_vfe47_process_epoch_irq,

			.config_irq = msm_vfe47_config_irq,

			.process_eof_irq = msm_isp47_process_eof_irq,

		},

		.axi_ops = {

			.reload_wm = msm_vfe47_axi_reload_wm,