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

Commit b7203507 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 various issues in reseving ub"

parents 058d8d64 27bdd94c

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

+4 −13
Original line number Diff line number Diff line
@@ -1529,6 +1529,7 @@ void msm_vfe47_update_camif_state(struct vfe_device *vfe_dev, 
		msm_camera_io_w_mb((update_state == DISABLE_CAMIF ? 0x0 : 0x6),

				vfe_dev->vfe_base + 0x478);

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

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

		/* testgen OFF*/

		if (vfe_dev->axi_data.src_info[VFE_PIX_0].input_mux == TESTGEN)

			msm_camera_io_w(1 << 1, vfe_dev->vfe_base + 0xC58);
@@ -1700,8 +1701,6 @@ void msm_vfe47_cfg_axi_ub_equal_default( 
	uint32_t wm_ub_size;

	uint64_t delta;

	uint32_t rdi_ub_offset;

	int plane;

	struct msm_vfe_axi_stream *stream_info;



	if (frame_src == VFE_PIX_0) {

		for (i = 0; i < axi_data->hw_info->num_wm; i++) {
@@ -1728,7 +1727,7 @@ void msm_vfe47_cfg_axi_ub_equal_default( 
				vfe_dev->hw_info->vfe_ops.axi_ops.

					ub_reg_offset(vfe_dev, i));

		}

		if (frame_src != SRC_TO_INTF(

		if (!axi_data->free_wm[i] || frame_src != SRC_TO_INTF(

				HANDLE_TO_IDX(axi_data->free_wm[i])))

			continue;
@@ -1745,17 +1744,9 @@ void msm_vfe47_cfg_axi_ub_equal_default( 
			ub_offset += wm_ub_size;

		} else {



			stream_info =  &axi_data->stream_info[

				HANDLE_TO_IDX(axi_data->free_wm[i])];

			for (plane = 0; plane < stream_info->num_planes;

					plane++)

				if (stream_info->wm[plane] ==

					axi_data->free_wm[i])

					break;



			rdi_ub_offset = ((SRC_TO_INTF(

			rdi_ub_offset = (SRC_TO_INTF(

					HANDLE_TO_IDX(axi_data->free_wm[i])) -

					VFE_RAW_0 * 2) + plane) *

					VFE_RAW_0) * 2 *

					axi_data->hw_info->min_wm_ub;

			wm_ub_size = axi_data->hw_info->min_wm_ub * 2;

			msm_camera_io_w((rdi_ub_offset << 16 |

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

+2 −0
Original line number Diff line number Diff line
@@ -3057,6 +3057,7 @@ static int msm_isp_stop_axi_stream(struct vfe_device *vfe_dev, 
			if (intf >= VFE_RAW_0 &&

				intf < VFE_SRC_MAX) {

				vfe_dev->axi_data.src_info[intf].active = 0;

				vfe_dev->axi_data.src_info[intf].flag = 0;

				/* reset frame_id for RDI path */

				if (halt) {

					vfe_dev->
@@ -3108,6 +3109,7 @@ static int msm_isp_stop_axi_stream(struct vfe_device *vfe_dev, 
		for (i = VFE_RAW_0; i < VFE_SRC_MAX; i++) {

			if (src_mask & (1 << i)) {

				vfe_dev->axi_data.src_info[i].active = 0;

				vfe_dev->axi_data.src_info[i].flag = 0;

				/* reset frame_id for RDI path */

				if (halt) {

					vfe_dev->