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

Commit 36fd5831 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 continuous streaming for controllable output"

parents 3eb1f448 e90e6bbd

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

+4 −8
Original line number Diff line number Diff line
@@ -825,6 +825,10 @@ static void msm_isp_get_done_buf(struct vfe_device *vfe_dev, 
				__func__, pingpong_status);

		}

	}



	if (stream_info->controllable_output)

		stream_info->request_frm_num--;



	*done_buf = stream_info->buf[pingpong_bit];

	stream_info->buf[pingpong_bit] = NULL;

}
@@ -857,14 +861,6 @@ static int msm_isp_cfg_ping_pong_address(struct vfe_device *vfe_dev, 
		goto buf_error;

	}



	if (stream_info->controllable_output) {

		if (!stream_info->request_frm_num) {

			pr_err("%s: Frame is not required!\n", __func__);

			rc = -EINVAL;

		}

		stream_info->request_frm_num--;

	}



	for (i = 0; i < stream_info->num_planes; i++)

		vfe_dev->hw_info->vfe_ops.axi_ops.update_ping_pong_addr(

			vfe_dev, stream_info->wm[i],