add support for MIPI cameras

Author: yunshansimon

baseboard-rpi3/media-libs/libcamera/files/99-rpi-camera.rules

@@ -0,0 +1 @@
+SUBSYSTEM=="video4linux|media|drm|dma_heap", MODE="0666"

baseboard-rpi3/media-libs/libcamera/files/camera_hal.yaml

@@ -0,0 +1,19 @@
+cameras:
+  "/base/soc/i2c0mux/i2c@1/imx219@10":
+    location: front
+    rotation: 0
+  "/base/soc/i2c0mux/i2c@1/imx290@1a":
+    location: front
+    rotation: 0
+  "/base/soc/i2c0mux/i2c@1/imx477@1a":
+    location: front
+    rotation: 0
+  "/base/soc/i2c0mux/i2c@1/imx519@1a":
+    location: front
+    rotation: 0
+  "/base/soc/i2c0mux/i2c@1/ov5647@36":
+    location: front
+    rotation: 0
+  "/base/soc/i2c0mux/i2c@1/ov9281@60":
+    location: front
+    rotation: 0

baseboard-rpi3/media-libs/libcamera/files/fix-rpi-build.patch

@@ -0,0 +1,41 @@
+diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
+index 00d48471..2412ce91 100644
+--- a/src/android/camera_device.cpp
++++ b/src/android/camera_device.cpp
+@@ -354,7 +354,9 @@ int CameraDevice::initialize(const CameraConfigData *cameraConfigData)
+ 	 * value for clockwise direction as required by the Android orientation
+ 	 * metadata.
+ 	 */
+-	if (properties.contains(properties::Rotation)) {
++  if (cameraConfigData && cameraConfigData->rotation != -1) {
++    orientation_ = cameraConfigData->rotation;
++  } else if (properties.contains(properties::Rotation)) {
+ 		int rotation = properties.get(properties::Rotation);
+ 		orientation_ = (360 - rotation) % 360;
+ 		if (cameraConfigData && cameraConfigData->rotation != -1 &&
+@@ -697,7 +699,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)
+ 		for (const StreamConfiguration &cfg : *config)
+ 			LOG(HAL, Info) << " - " << cfg.toString();
+ 
+-		return -EINVAL;
++		break;
+ 	case CameraConfiguration::Invalid:
+ 		LOG(HAL, Info) << "Camera configuration invalid";
+ 		return -EINVAL;
+diff --git a/src/ipa/raspberrypi/meson.build b/src/ipa/raspberrypi/meson.build
+index 176055f4..3b2d6a96 100644
+--- a/src/ipa/raspberrypi/meson.build
++++ b/src/ipa/raspberrypi/meson.build
+@@ -1,10 +1,10 @@
+ # SPDX-License-Identifier: CC0-1.0
+ 
+ ipa_name = 'ipa_rpi'
+-
++libboost=cc.find_library('boost', required :false)
+ rpi_ipa_deps = [
+     libcamera_private,
+-    dependency('boost'),
++    libboost,
+     libatomic,
+ ]
+ 

baseboard-rpi3/media-libs/libcamera/libcamera-0.0.1-r662.ebuild renamed to baseboard-rpi3/media-libs/libcamera/libcamera-0.0.1-r663.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="962df634bd0afe12e6f38464f5e602cf1460c430"
+CROS_WORKON_COMMIT="72b6c710d448d5a1ff9407f9f7c7780660ee556a"
 CROS_WORKON_TREE="c66f4eadb3ce21b120447bb910bc9606c3fc499b"
 CROS_WORKON_PROJECT="chromiumos/third_party/libcamera"
 #CROS_WORKON_INCREMENTAL_BUILD="1"
@@ -63,6 +63,7 @@ src_configure() {
 		--sysconfdir /etc/camera
 	)
  # append-flags '-Wno-error=shadow' '-std=c99'
+  filter-flags "-fno-exceptions"
 	meson_src_configure
 }
 
@@ -76,4 +77,10 @@ src_install() {
 	cros-camera_dohal "${D}/usr/$(get_libdir)/libcamera-hal.so" libcamera-hal.so
 
 	dostrip -x "/usr/$(get_libdir)/libcamera/"
+  insinto /etc/camera/libcamera
+  doins ${FILESDIR}/camera_hal.yaml
+  insinto /lib/udev/rules.d
+  doins ${FILESDIR}/99-rpi-camera.rules
 }
+
+PATCHES=( "${FILESDIR}"/fix-rpi-build.patch )

baseboard-rpi3/media-libs/libcamera/libcamera-9999.ebuild

@@ -4,7 +4,7 @@
 EAPI=7
 
 CROS_WORKON_PROJECT="chromiumos/third_party/libcamera"
-CROS_WORKON_INCREMENTAL_BUILD="1"
+#CROS_WORKON_INCREMENTAL_BUILD="1"
 
 inherit cros-camera cros-workon meson
 
@@ -23,6 +23,7 @@ RDEPEND="
 	media-libs/libcamera-configs
 	media-libs/libjpeg-turbo
 	media-libs/libexif
+  dev-libs/boost
 	>=net-libs/gnutls-3.3:=
 	media-libs/libyuv
 	udev? ( virtual/libudev )
@@ -37,6 +38,7 @@ DEPEND="
 src_configure() {
 	local pipelines=(
 		"uvcvideo"
+    "raspberrypi"
 		$(usev ipu3)
 		$(usev rkisp1)
 	)
@@ -54,9 +56,11 @@ src_configure() {
 		-Dandroid="enabled"
 		-Dandroid_platform="cros"
 		-Dpipelines="$(pipeline_list "${pipelines[@]}")"
+    -Dipas="raspberrypi"
 		--buildtype "$(usex debug debug plain)"
 		--sysconfdir /etc/camera
 	)
+  filter-flags "-fno-exceptions"
 	meson_src_configure
 }
 

baseboard-rpi3/media-libs/minigbm/files/vc4_v3d.patch

@@ -328,7 +328,7 @@ Index: minigbm/v3d.c
 ===================================================================
 --- /dev/null
 +++ minigbm/v3d.c
-@@ -0,0 +1,198 @@
+@@ -0,0 +1,200 @@
 +/*
 + * Copyright 2019 The FydeOS Authors. All rights reserved.
 + * Use of this source code is governed by a BSD-style license that can be
@@ -347,7 +347,7 @@ Index: minigbm/v3d.c
 +#include "util.h"
 +#include "external/v3d_drm.h"
 +#define ARC_CALLOC (1<<7)
-+
++#define DEBUG
 +enum v3d_tiling_mode {
 +        /* Untiled resources.  Not valid as texture inputs. */
 +        V3D_TILING_RASTER,
@@ -392,11 +392,11 @@ Index: minigbm/v3d.c
 +  drv_modify_combination(drv, DRM_FORMAT_XBGR8888, &LINEAR_METADATA, BO_USE_SCANOUT);
 +  drv_add_combinations(drv, texture_target_formats, ARRAY_SIZE(texture_target_formats),
 +           &LINEAR_METADATA, BO_USE_TEXTURE_MASK);
-+  drv_modify_combination(drv, DRM_FORMAT_YVU420, &LINEAR_METADATA,  
-+           BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE | 
++  drv_modify_combination(drv, DRM_FORMAT_YVU420, &LINEAR_METADATA,
++           BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE |
 +           BO_USE_HW_VIDEO_DECODER | BO_USE_HW_VIDEO_ENCODER);
 +  drv_modify_combination(drv, DRM_FORMAT_NV12, &LINEAR_METADATA,
-+           BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE | 
++           BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE |
 +           BO_USE_HW_VIDEO_DECODER | BO_USE_HW_VIDEO_ENCODER);
 +  drv_modify_combination(drv, DRM_FORMAT_R8, &LINEAR_METADATA, sw_flags);
 +  drv_modify_combination(drv, DRM_FORMAT_ARGB8888, &LINEAR_METADATA, BO_USE_CURSOR | BO_USE_SCANOUT);
@@ -473,12 +473,14 @@ Index: minigbm/v3d.c
 +  algin_height = ALIGN(height * 12 / 10, 8);
 +  drv_bo_from_format(bo, stride, algin_height, format);
 +  bo->meta.total_size = ALIGN(bo->meta.total_size, 4096);
-+  bo->meta.format_modifier = DRM_FORMAT_MOD_LINEAR;
-+  bo->meta.tiling = V3D_TILING_RASTER;
-+  if (use_flags & (BO_USE_SW_MASK | BO_USE_SCANOUT)) {
++  if (use_flags & BO_USE_SCANOUT) {
 +		 bo_create.flags = ARC_CALLOC;
++     bo->meta.format_modifier = DRM_FORMAT_MOD_LINEAR;
++     bo->meta.tiling = V3D_TILING_RASTER;
 +  } else {
 +     bo_create.flags = 0;
++     bo->meta.format_modifier = DRM_FORMAT_MOD_BROADCOM_UIF;
++//     bo->meta.tiling = V3D_TILING_UIF_NO_XOR;
 +  }
 +  bo_create.size = bo->meta.total_size;
 +  ret = drmIoctl(bo->drv->fd, DRM_IOCTL_V3D_CREATE_BO, &bo_create);
@@ -490,8 +492,8 @@ Index: minigbm/v3d.c
 +  for (plane = 0; plane < bo->meta.num_planes; plane++)
 +    bo->handles[plane].u32 = bo_create.handle;
 +#ifdef DEBUG
-+ drv_log("create bo handler:0x%x, size:%zu, format:%s, width:%u, height:%u\n",
-+   bo_create.handle, bo->meta.total_size, getDrmFormatString(format), width, height);
++ drv_log("create bo handler:0x%x, size:%zu, format:%s, width:%u, height:%u, use_flags:0x%llx\n",
++   bo_create.handle, bo->meta.total_size, getDrmFormatString(format), width, height, use_flags & (BO_USE_SW_MASK | BO_USE_SCANOUT));
 +#endif
 +  return 0;
 +}
@@ -564,7 +566,7 @@ Index: minigbm/vc4.c
 +          &metadata, BO_USE_RENDER_MASK);
 +  drv_add_combinations(drv, texture_target_formats, ARRAY_SIZE(texture_target_formats),
 +          &metadata, BO_USE_TEXTURE_MASK);
-+  drv_modify_combination(drv, DRM_FORMAT_YVU420, &metadata,  BO_USE_CAMERA_READ | 
++  drv_modify_combination(drv, DRM_FORMAT_YVU420, &metadata,  BO_USE_CAMERA_READ |
 +                              BO_USE_CAMERA_WRITE | BO_USE_SCANOUT |
 +                              BO_USE_HW_VIDEO_DECODER | BO_USE_HW_VIDEO_ENCODER);
 +  drv_modify_combination(drv, DRM_FORMAT_NV12, &metadata,
@@ -586,7 +588,7 @@ Index: minigbm/vc4.c
 -
 -	return drv_modify_linear_combinations(drv);
 +  drv_log("vc4 driver inited.\n");
-+  return drv_modify_linear_combinations(drv); 
++  return drv_modify_linear_combinations(drv);
  }
 
  static int vc4_bo_create_for_modifier(struct bo *bo, uint32_t width, uint32_t height,

baseboard-rpi3/media-libs/minigbm/minigbm-0.0.1-r533.ebuild renamed to baseboard-rpi3/media-libs/minigbm/minigbm-0.0.1-r534.ebuild

@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~*"
 VIDEO_CARDS="
 	amdgpu exynos intel marvell mediatek msm
-	radeon radeonsi rockchip tegra vc4 virgl
+	radeon radeonsi rockchip tegra vc4 virgl v3d
 "
 IUSE="-asan kernel-3_18 linear_align_256"
 for card in ${VIDEO_CARDS}; do
@@ -69,6 +69,7 @@ src_configure() {
 	use video_cards_vc4 && append-cppflags -DDRV_VC4 && export DRV_VC4=1
 	use video_cards_virgl && append-cppflags -DDRV_VIRGL && export DRV_VIRGL=1
 	use linear_align_256 && append-cppflags -DLINEAR_ALIGN_256
+  use video_cards_v3d && append-cppflags -DDRV_V3D && export DRV_V3D=1
 	cros-common.mk_src_configure
 }
 

baseboard-rpi3/media-libs/minigbm/minigbm-9999.ebuild

@@ -0,0 +1 @@
+raspberry-kernel-5.10.92.ebuild

chipset-bcm2837/sys-kernel/raspberry-kernel/raspberry-kernel-5.10.92-r1.ebuild

@@ -2875,7 +2875,7 @@ CONFIG_I2C_MUX_GPMUX=m
 # CONFIG_I2C_MUX_LTC4306 is not set
 # CONFIG_I2C_MUX_PCA9541 is not set
 CONFIG_I2C_MUX_PCA954x=m
-# CONFIG_I2C_MUX_PINCTRL is not set
+CONFIG_I2C_MUX_PINCTRL=m
 # CONFIG_I2C_MUX_REG is not set
 # CONFIG_I2C_DEMUX_PINCTRL is not set
 # CONFIG_I2C_MUX_MLXCPLD is not set
@@ -4364,7 +4364,7 @@ CONFIG_DRM_SCHED=y
 # CONFIG_DRM_RADEON is not set
 # CONFIG_DRM_AMDGPU is not set
 # CONFIG_DRM_NOUVEAU is not set
-# CONFIG_DRM_VGEM is not set
+CONFIG_DRM_VGEM=m
 # CONFIG_DRM_VKMS is not set
 CONFIG_DRM_UDL=m
 # CONFIG_DRM_AST is not set
@@ -4480,7 +4480,7 @@ CONFIG_DRM_VC4=y
 CONFIG_TINYDRM_HX8357D=m
 CONFIG_TINYDRM_ILI9225=m
 CONFIG_TINYDRM_ILI9341=m
-# CONFIG_TINYDRM_ILI9486 is not set
+CONFIG_TINYDRM_ILI9486=m
 CONFIG_TINYDRM_MI0283QT=m
 CONFIG_TINYDRM_REPAPER=m
 CONFIG_TINYDRM_ST7586=m