Merge "msm: camera: isp: Configure WM10 as LSB aligned for PDAF" into dev/msm-4.14-camx (0994eb79) · Commits · e / devices / android_kernel_xiaomi_sm6125

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver2.c

+12 −3

Original line number	Diff line number	Diff line
		@@ -1053,12 +1053,21 @@ static int cam_vfe_bus_acquire_wm(
		return -EINVAL;
		}
		rsrc_data->en_cfg = 0x1;
		} else if ((rsrc_data->index >= 10) && (rsrc_data->index < 20)) {
		/* Write master 10-19 stats */
		} else if (rsrc_data->index >= 11 && rsrc_data->index < 20) {
		/* Write master 11 - 19 stats */
		rsrc_data->width = 0;
		rsrc_data->height = 0;
		rsrc_data->stride = 1;
		rsrc_data->en_cfg = 0x3;
		} else if (rsrc_data->index == 10) {
		/* Write master 10 - PDAF/2PD */
		rsrc_data->width = 0;
		rsrc_data->height = 0;
		rsrc_data->stride = 1;
		rsrc_data->en_cfg = 0x3;
		if (vfe_out_res_id == CAM_VFE_BUS_VER2_VFE_OUT_PDAF)
		/* LSB aligned */
		rsrc_data->pack_fmt \|= 0x10;
		} else if (rsrc_data->index == 9) {
		/* Write master 9 - Raw dump */
		rsrc_data->width = rsrc_data->width * 2;
		@@ -1067,7 +1076,7 @@ static int cam_vfe_bus_acquire_wm(
		/* LSB aligned */
		rsrc_data->pack_fmt \|= 0x10;
		} else {
		/* Write master 5-6 DS ports, 10 PDAF */
		/* Write master 5-6 DS ports */
		uint32_t align_width;

		rsrc_data->width = rsrc_data->width * 4;