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

Commit e148ab1e 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: fix for avtimer power collapse"

parents 955dc7ff a813646f

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

+0 −1
Original line number Diff line number Diff line
@@ -325,7 +325,6 @@ struct msm_vfe_axi_stream { 
	uint32_t stream_handle;

	uint8_t buf_divert;

	enum msm_vfe_axi_stream_type stream_type;

	uint32_t vt_enable;

	uint32_t frame_based;

	enum msm_vfe_frame_skip_pattern frame_skip_pattern;

	uint32_t framedrop_period;

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

+2 −3
Original line number Diff line number Diff line
@@ -716,9 +716,8 @@ int msm_isp_request_axi_stream(struct vfe_device *vfe_dev, void *arg) 
	}

	stream_info->framedrop_altern_cnt = 0;

	msm_isp_calculate_framedrop(&vfe_dev->axi_data, stream_cfg_cmd);

	stream_info->vt_enable = stream_cfg_cmd->vt_enable;

	if (stream_info->vt_enable) {

		vfe_dev->vt_enable = stream_info->vt_enable;

	if (stream_cfg_cmd->vt_enable && !vfe_dev->vt_enable) {

		vfe_dev->vt_enable = stream_cfg_cmd->vt_enable;

		msm_isp_start_avtimer();

	}

	if (stream_info->num_planes > 1) {