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

Commit dd60eec0 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: Stop burst stream on epoch of last frame"

parents 8a5e8c86 17e71ba7

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

+1 −2
Original line number Diff line number Diff line
@@ -619,8 +619,6 @@ static void msm_vfe40_process_reg_update(struct vfe_device *vfe_dev, 
				(uint32_t)BIT(i));

			switch (i) {

			case VFE_PIX_0:

				msm_isp_save_framedrop_values(vfe_dev,

					VFE_PIX_0);

				msm_isp_notify(vfe_dev, ISP_EVENT_REG_UPDATE,

					VFE_PIX_0, ts);

				if (atomic_read(
@@ -650,6 +648,7 @@ static void msm_vfe40_process_reg_update(struct vfe_device *vfe_dev, 
			}

			if (vfe_dev->axi_data.stream_update[i])

				msm_isp_axi_stream_update(vfe_dev, i);

			msm_isp_save_framedrop_values(vfe_dev, i);

			if (atomic_read(&vfe_dev->axi_data.axi_cfg_update[i])) {

				msm_isp_axi_cfg_update(vfe_dev, i);

				if (atomic_read(

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

+1 −2
Original line number Diff line number Diff line
@@ -449,8 +449,6 @@ static void msm_vfe44_process_reg_update(struct vfe_device *vfe_dev, 
				(uint32_t)BIT(i));

			switch (i) {

			case VFE_PIX_0:

				msm_isp_save_framedrop_values(vfe_dev,

						VFE_PIX_0);

				msm_isp_notify(vfe_dev, ISP_EVENT_REG_UPDATE,

					VFE_PIX_0, ts);

				if (atomic_read(
@@ -480,6 +478,7 @@ static void msm_vfe44_process_reg_update(struct vfe_device *vfe_dev, 
			}

			if (vfe_dev->axi_data.stream_update[i])

				msm_isp_axi_stream_update(vfe_dev, i);

			msm_isp_save_framedrop_values(vfe_dev, i);

			if (atomic_read(&vfe_dev->axi_data.axi_cfg_update[i])) {

				msm_isp_axi_cfg_update(vfe_dev, i);

				if (atomic_read(

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

+1 −2
Original line number Diff line number Diff line
@@ -386,8 +386,6 @@ static void msm_vfe46_process_reg_update(struct vfe_device *vfe_dev, 


			switch (i) {

			case VFE_PIX_0:

				msm_isp_save_framedrop_values(vfe_dev,

							VFE_PIX_0);

				msm_isp_notify(vfe_dev, ISP_EVENT_REG_UPDATE,

					VFE_PIX_0, ts);

				if (atomic_read(
@@ -417,6 +415,7 @@ static void msm_vfe46_process_reg_update(struct vfe_device *vfe_dev, 
			}

			if (vfe_dev->axi_data.stream_update[i])

				msm_isp_axi_stream_update(vfe_dev, i);

			msm_isp_save_framedrop_values(vfe_dev, i);

			if (atomic_read(&vfe_dev->axi_data.axi_cfg_update[i])) {

				msm_isp_axi_cfg_update(vfe_dev, i);

				if (atomic_read(

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

+1 −3
Original line number Diff line number Diff line
@@ -576,8 +576,6 @@ void msm_vfe47_process_reg_update(struct vfe_device *vfe_dev, 
				(uint32_t)BIT(i));

			switch (i) {

			case VFE_PIX_0:

				msm_isp_save_framedrop_values(vfe_dev,

					VFE_PIX_0);

				msm_isp_notify(vfe_dev, ISP_EVENT_REG_UPDATE,

					VFE_PIX_0, ts);

				if (atomic_read(
@@ -592,7 +590,6 @@ void msm_vfe47_process_reg_update(struct vfe_device *vfe_dev, 
			case VFE_RAW_1:

			case VFE_RAW_2:

				msm_isp_increment_frame_id(vfe_dev, i, ts);

				msm_isp_save_framedrop_values(vfe_dev, i);

				msm_isp_notify(vfe_dev, ISP_EVENT_SOF, i, ts);

				msm_isp_update_framedrop_reg(vfe_dev, i);

				/*
@@ -608,6 +605,7 @@ void msm_vfe47_process_reg_update(struct vfe_device *vfe_dev, 
			}

			if (vfe_dev->axi_data.stream_update[i])

				msm_isp_axi_stream_update(vfe_dev, i);

			msm_isp_save_framedrop_values(vfe_dev, i);

			if (atomic_read(&vfe_dev->axi_data.axi_cfg_update[i])) {

				msm_isp_axi_cfg_update(vfe_dev, i);

				if (atomic_read(

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

+3 −1
Original line number Diff line number Diff line
@@ -662,7 +662,9 @@ void msm_isp_update_framedrop_reg(struct vfe_device *vfe_dev, 
		spin_lock_irqsave(&stream_info->lock, flags);



		if (BURST_STREAM == stream_info->stream_type) {

			if (0 == stream_info->runtime_num_burst_capture)

			if (0 == stream_info->runtime_num_burst_capture ||

				(stream_info->runtime_num_burst_capture == 1 &&

				stream_info->activated_framedrop_period == 1))

				stream_info->current_framedrop_period =

					MSM_VFE_STREAM_STOP_PERIOD;

		}