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

Commit 1631ca3b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camerav2: isp: Allocate UB for all source types"

parents b56dcb8e b6b377f3

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

+1 −0
Original line number Diff line number Diff line
@@ -1512,6 +1512,7 @@ static void msm_vfe40_update_camif_state(struct vfe_device *vfe_dev, 
		msm_camera_io_w_mb((update_state == DISABLE_CAMIF ? 0x0 : 0x6),

				vfe_dev->vfe_base + 0x2F4);

		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 + 0x93C);

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

+1 −2
Original line number Diff line number Diff line
@@ -1728,8 +1728,7 @@ void msm_vfe47_cfg_axi_ub_equal_default( 
				vfe_dev->hw_info->vfe_ops.axi_ops.

					ub_reg_offset(vfe_dev, i));

		}

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

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

		if (!axi_data->free_wm[i])

			continue;



		delta = (uint64_t)axi_data->wm_image_size[i] *