Merge "msm: camera: isp: Support of Y8 format for IFE FD port" into dev/msm-4.14-camx (456a35e0) · Commits · e / devices / android_kernel_xiaomi_nabu

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -514,6 +514,8 @@ static int cam_vfe_bus_get_num_wm(
		case CAM_FORMAT_TP10:
		case CAM_FORMAT_PLAIN16_10:
		return 2;
		case CAM_FORMAT_Y_ONLY:
		return 1;
		default:
		break;
		}
		@@ -832,6 +834,7 @@ static enum cam_vfe_bus_packer_format
		case CAM_FORMAT_NV12:
		case CAM_FORMAT_UBWC_NV12:
		case CAM_FORMAT_UBWC_NV12_4R:
		case CAM_FORMAT_Y_ONLY:
		return PACKER_FMT_PLAIN_8_LSB_MSB_10;
		case CAM_FORMAT_PLAIN16_16:
		return PACKER_FMT_PLAIN_16_16BPP;
		@@ -990,6 +993,7 @@ static int cam_vfe_bus_acquire_wm(
		/* Fall through for NV12 */
		case CAM_FORMAT_NV21:
		case CAM_FORMAT_NV12:
		case CAM_FORMAT_Y_ONLY:
		switch (plane) {
		case PLANE_C:
		rsrc_data->height /= 2;