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

Commit ab536efb 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: fix AXI RESET cmd field to be 32 byte"

parents 3c4a9994 e42d586d

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

+2 −0
Original line number Diff line number Diff line
@@ -1399,6 +1399,8 @@ static int msm_isp_start_axi_stream(struct vfe_device *vfe_dev, 
	vfe_dev->hw_info->vfe_ops.core_ops.reg_update(vfe_dev);

	msm_isp_update_camif_output_count(vfe_dev, stream_cfg_cmd);

	if (camif_update == ENABLE_CAMIF) {

		atomic_set(&vfe_dev->error_info.overflow_state,

				NO_OVERFLOW);

		vfe_dev->axi_data.src_info[VFE_PIX_0].frame_id = 0;

		vfe_dev->hw_info->vfe_ops.core_ops.

			update_camif_state(vfe_dev, camif_update);

include/media/msmb_isp.h

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ struct msm_vfe_axi_halt_cmd { 


struct msm_vfe_axi_reset_cmd {

	uint32_t blocking;

	unsigned long frame_id;

	uint32_t frame_id;

};



struct msm_vfe_axi_restart_cmd {