update rpi4 to r96 with hdmi audio issue

Author: yunshansimon

baseboard-rpi3/chromeos-base/baseboard-bsp/files/powerd/never-suspend.conf

@@ -2,7 +2,7 @@ description     "Setup power manager policy to block suspend"
 author          "yang@fydeos.io"
 
 start on started system-services or started smbproviderd
-
+oom score -100
 
 script
   logger -t "${UPSTART_JOB}" "setup power manager policy to block suspend"

baseboard-rpi3/chromeos-base/bluetooth-input-fix/files/bluetooth-input-fix.conf

@@ -7,5 +7,6 @@ author          "yang@fydeos.io"
 
 start on started udev-boot
 task
+oom score -100
 
 exec modprobe -q uhid

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

@@ -3,13 +3,12 @@
 
 EAPI=7
 
-CXXEXCEPTIONS_FLAGS="-fno-exceptions"
-CROS_WORKON_COMMIT="e56f1f493560e0b641bbe36a528a13767817afed"
-CROS_WORKON_TREE="c8e597e8dc3dc91766fd0b28b32b1588bab63173"
+CROS_WORKON_COMMIT="962df634bd0afe12e6f38464f5e602cf1460c430"
+CROS_WORKON_TREE="c66f4eadb3ce21b120447bb910bc9606c3fc499b"
 CROS_WORKON_PROJECT="chromiumos/third_party/libcamera"
-CROS_WORKON_INCREMENTAL_BUILD="1"
+#CROS_WORKON_INCREMENTAL_BUILD="1"
 
-inherit cros-workon meson
+inherit cros-camera cros-workon meson
 
 DESCRIPTION="Camera support library for Linux"
 HOMEPAGE="https://www.libcamera.org"
@@ -23,11 +22,13 @@ RDEPEND="
 	chromeos-base/cros-camera-libs
 	dev? ( dev-libs/libevent[threads] )
 	dev-libs/libyaml
+	media-libs/libcamera-configs
 	media-libs/libjpeg-turbo
 	media-libs/libexif
 	>=net-libs/gnutls-3.3:=
 	media-libs/libyuv
 	udev? ( virtual/libudev )
+  dev-libs/boost
 "
 
 DEPEND="
@@ -57,10 +58,11 @@ src_configure() {
 		-Dandroid="enabled"
 		-Dandroid_platform="cros"
 		-Dpipelines="$(pipeline_list "${pipelines[@]}")"
+    -Dipas="raspberrypi"
 		--buildtype "$(usex debug debug plain)"
 		--sysconfdir /etc/camera
 	)
-  cros_enable_cxx_exceptions
+ # append-flags '-Wno-error=shadow' '-std=c99'
 	meson_src_configure
 }
 
@@ -71,7 +73,7 @@ src_compile() {
 src_install() {
 	meson_src_install
 
-	dosym ../libcamera.so "/usr/$(get_libdir)/camera_hal/libcamera.so"
+	cros-camera_dohal "${D}/usr/$(get_libdir)/libcamera-hal.so" libcamera-hal.so
 
 	dostrip -x "/usr/$(get_libdir)/libcamera/"
 }

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

@@ -6,7 +6,7 @@ EAPI=7
 CROS_WORKON_PROJECT="chromiumos/third_party/libcamera"
 CROS_WORKON_INCREMENTAL_BUILD="1"
 
-inherit cros-workon meson
+inherit cros-camera cros-workon meson
 
 DESCRIPTION="Camera support library for Linux"
 HOMEPAGE="https://www.libcamera.org"
@@ -67,7 +67,7 @@ src_compile() {
 src_install() {
 	meson_src_install
 
-	dosym ../libcamera.so "/usr/$(get_libdir)/camera_hal/libcamera.so"
+	cros-camera_dohal "${D}/usr/$(get_libdir)/libcamera-hal.so" libcamera-hal.so
 
 	dostrip -x "/usr/$(get_libdir)/libcamera/"
 }

baseboard-rpi3/media-libs/mesa/OWNERS

@@ -0,0 +1,5 @@
+anholt@chromium.org
+chadversary@chromium.org
+ihf@chromium.org
+hoegsberg@chromium.org
+marcheu@chromium.org

baseboard-rpi3/media-libs/mesa/files/BACKPORT-disk_cache-build-option-for-disabled-by-def.patch

@@ -0,0 +1,157 @@
+From 5b6f9e4821a48a1abedf6082ab7a7cb06e7b7905 Mon Sep 17 00:00:00 2001
+From: John Bates <jbates@chromium.org>
+Date: Tue, 13 Oct 2020 14:17:53 -0700
+Subject: [PATCH] BACKPORT: disk_cache: build option for disabled-by-default
+
+On some systems it is problematic to have the shader cache enabled
+by default. This adds a build option to support the disk cache but
+keep it disabled unless the environment variable
+MESA_GLSL_CACHE_DISABLE=false.
+
+For example, on Chrome OS, Chrome already has it's own shader
+disk cache implementation so it disables the mesa feature. Tests
+do not want the shader disk cache enabled because it can cause
+inconsistent performance results and the default 1GB for the
+disk cache could lead to problems that require more effort to
+work around. The Mesa shader disk cache is useful for VMs though,
+where it is easy to configure the feature with environment
+variables. With the current version of Mesa, Chrome OS would need
+to have a system-wide environment variable to disable the disk
+cache everywhere except where needed. More elegant to just build
+Mesa with the cache feature disabled by default.
+
+Reviewed-by: Rob Clark <robdclark@chromium.org>
+Reviewed-by: Eric Anholt <eric@anholt.net>
+---
+ docs/envvars.rst                     |  4 +++-
+ meson.build                          |  5 ++++-
+ meson_options.txt                    |  4 ++--
+ src/compiler/glsl/tests/cache_test.c | 21 +++++++++++++++++++++
+ src/util/disk_cache.c                |  8 +++++++-
+ 5 files changed, 37 insertions(+), 5 deletions(-)
+
+diff --git a/docs/envvars.rst b/docs/envvars.rst
+index 76397eec041..872463e7ccb 100644
+--- a/docs/envvars.rst
++++ b/docs/envvars.rst
+@@ -141,7 +141,9 @@ Core Mesa environment variables
+    features of the given language version if it's higher than what's
+    normally reported. (for developers only)
+ ``MESA_GLSL_CACHE_DISABLE``
+-   if set to ``true``, disables the GLSL shader cache
++   if set to ``true``, disables the GLSL shader cache. If set to
++   ``false``, enables the GLSL shader cache when it is disabled by
++   default.
+ ``MESA_GLSL_CACHE_MAX_SIZE``
+    if set, determines the maximum size of the on-disk cache of compiled
+    GLSL programs. Should be set to a number optionally followed by
+diff --git a/meson.build b/meson.build
+index e8b641c6b1d..46844e8a1e3 100644
+--- a/meson.build
++++ b/meson.build
+@@ -901,11 +901,14 @@ elif _shader_cache == 'false'
+ endif
+ if _shader_cache != 'disabled'
+   if host_machine.system() == 'windows'
+-    if _shader_cache == 'enabled'
++    if ['enabled', 'default-disabled'].contains(_shader_cache)
+       error('Shader Cache does not currently work on Windows')
+     endif
+   else
+     pre_args += '-DENABLE_SHADER_CACHE'
++    if _shader_cache == 'default-disabled'
++      pre_args += '-DSHADER_CACHE_DISABLE_BY_DEFAULT'
++    endif
+     with_shader_cache = true
+   endif
+ endif
+diff --git a/meson_options.txt b/meson_options.txt
+index 2d39d13b6ad..ed93d545cc0 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -173,8 +173,8 @@ option(
+   'shader-cache',
+   type : 'combo',
+   value : 'auto',
+-  choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
+-  description : 'Build with on-disk shader cache support'
++  choices : ['auto', 'true', 'false', 'enabled', 'disabled', 'default-disabled'],
++  description : 'Build with on-disk shader cache support. If set to default-disabled, the feature is only activated when environment variable MESA_GLSL_CACHE_DISABLE is set to false'
+ )
+ option(
+   'vulkan-icd-dir',
+diff --git a/src/compiler/glsl/tests/cache_test.c b/src/compiler/glsl/tests/cache_test.c
+index a1db67a5845..926b5e458cc 100644
+--- a/src/compiler/glsl/tests/cache_test.c
++++ b/src/compiler/glsl/tests/cache_test.c
+@@ -193,6 +193,19 @@ test_disk_cache_create(void)
+ 
+    unsetenv("MESA_GLSL_CACHE_DISABLE");
+ 
++#ifdef SHADER_CACHE_DISABLE_BY_DEFAULT
++   /* With SHADER_CACHE_DISABLE_BY_DEFAULT, ensure that with
++    * MESA_GLSL_CACHE_DISABLE set to nothing, disk_cache_create returns NULL.
++    */
++   unsetenv("MESA_GLSL_CACHE_DISABLE");
++   cache = disk_cache_create("test", "make_check", 0);
++   expect_null(cache, "disk_cache_create with MESA_GLSL_CACHE_DISABLE unset "
++               " and SHADER_CACHE_DISABLE_BY_DEFAULT build option");
++
++   /* For remaining tests, ensure that the cache is enabled. */
++   setenv("MESA_GLSL_CACHE_DISABLE", "false", 1);
++#endif /* SHADER_CACHE_DISABLE_BY_DEFAULT */
++
+    /* For the first real disk_cache_create() clear these environment
+     * variables to test creation of cache in home directory.
+     */
+@@ -266,6 +279,10 @@ test_put_and_get(void)
+    uint8_t one_KB_key[20], one_MB_key[20];
+    int count;
+ 
++#ifdef SHADER_CACHE_DISABLE_BY_DEFAULT
++   setenv("MESA_GLSL_CACHE_DISABLE", "false", 1);
++#endif /* SHADER_CACHE_DISABLE_BY_DEFAULT */
++
+    cache = disk_cache_create("test", "make_check", 0);
+ 
+    disk_cache_compute_key(cache, blob, sizeof(blob), blob_key);
+@@ -437,6 +454,10 @@ test_put_key_and_get_key(void)
+                         { 0,  1, 42, 43, 44, 45, 46, 47, 48, 49,
+                          50, 55, 52, 53, 54, 55, 56, 57, 58, 59};
+ 
++#ifdef SHADER_CACHE_DISABLE_BY_DEFAULT
++   setenv("MESA_GLSL_CACHE_DISABLE", "false", 1);
++#endif /* SHADER_CACHE_DISABLE_BY_DEFAULT */
++
+    cache = disk_cache_create("test", "make_check", 0);
+ 
+    /* First test that disk_cache_has_key returns false before disk_cache_put_key */
+diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c
+index a92d621927a..90310b85463 100644
+--- a/src/util/disk_cache.c
++++ b/src/util/disk_cache.c
+@@ -210,6 +210,12 @@ disk_cache_create(const char *gpu_name, const char *driver_id,
+    uint8_t cache_version = CACHE_VERSION;
+    size_t cv_size = sizeof(cache_version);
+ 
++#ifdef SHADER_CACHE_DISABLE_BY_DEFAULT
++   bool disable_by_default = true;
++#else
++   bool disable_by_default = false;
++#endif
++
+    /* If running as a users other than the real user disable cache */
+    if (geteuid() != getuid())
+       return NULL;
+@@ -220,7 +226,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id,
+       goto fail;
+ 
+    /* At user request, disable shader cache entirely. */
+-   if (env_var_as_boolean("MESA_GLSL_CACHE_DISABLE", false))
++   if (env_var_as_boolean("MESA_GLSL_CACHE_DISABLE", disable_by_default))
+       goto fail;
+ 
+    cache = rzalloc(NULL, struct disk_cache);
+-- 
+2.28.0.1011.ga647a8990f-goog
+

baseboard-rpi3/media-libs/mesa/files/UPSTREAM-anv-Add-DRM_RDWR-flag-in-anv_gem_handle_to_fd.patch

@@ -0,0 +1,31 @@
+From df76963a5cd56c677f189ad89d75935a76fca090 Mon Sep 17 00:00:00 2001
+From: Robin Ole Heinemann <robin.ole.heinemann@t-online.de>
+Date: Sun, 13 Dec 2020 02:22:57 +0100
+Subject: [PATCH] anv: Add DRM_RDWR flag in anv_gem_handle_to_fd
+
+The DRM_RDWR flag is needed for mmap with PROT_WRITE to work.
+
+Cc: mesa-stable
+Signed-off-by: Robin Ole Heinemann <robin.ole.heinemann@gmail.com>
+Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8075>
+---
+ src/intel/vulkan/anv_gem.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/intel/vulkan/anv_gem.c b/src/intel/vulkan/anv_gem.c
+index 81e22428e18..4c43f5f77b4 100644
+--- a/src/intel/vulkan/anv_gem.c
++++ b/src/intel/vulkan/anv_gem.c
+@@ -437,7 +437,7 @@ anv_gem_handle_to_fd(struct anv_device *device, uint32_t gem_handle)
+ {
+    struct drm_prime_handle args = {
+       .handle = gem_handle,
+-      .flags = DRM_CLOEXEC,
++      .flags = DRM_CLOEXEC | DRM_RDWR,
+    };
+ 
+    int ret = gen_ioctl(device->fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &args);
+-- 
+2.29.2
+

baseboard-rpi3/media-libs/mesa/files/UPSTREAM-intel-change-urb-max-shader-geometry-for-CML-GT1.patch

@@ -0,0 +1,39 @@
+From 276e3927b54292b2c0687b1f9bbcc0d69e314de7 Mon Sep 17 00:00:00 2001
+From: Abhishek Kumar <abhishek4.kumar@intel.com>
+Date: Mon, 18 Jan 2021 10:24:23 +0530
+Subject: [PATCH 002/188] intel: change urb max shader geometry for CML GT1
+
+Below deqp cts failure is seen on CML GT1 only , GT2 all test
+passes, changing the max shader geometry to 256 (previous 640)
+fixes all failure tests.Similar issue on BDW GT1
+https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3173
+
+dEQP-GLES31.functional.geometry_shading.layered.
+		render_with_default_layer_cubemap
+		render_with_default_layer_3d
+		render_with_default_layer_2d_array
+
+Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4102
+
+Signed-off-by: Abhishek Kumar <abhishek4.kumar@intel.com>
+Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8550>
+---
+ src/intel/dev/gen_device_info.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/intel/dev/gen_device_info.c b/src/intel/dev/gen_device_info.c
+index 5e26dc10b8c7..242251564658 100644
+--- a/src/intel/dev/gen_device_info.c
++++ b/src/intel/dev/gen_device_info.c
+@@ -764,6 +764,7 @@ static const struct gen_device_info gen_device_info_cfl_gt1 = {
+     * leading to some vertices to go missing if we use too much URB.
+     */
+    .urb.max_entries[MESA_SHADER_VERTEX] = 928,
++   .urb.max_entries[MESA_SHADER_GEOMETRY] = 256,
+    .simulator_id = 24,
+ };
+ static const struct gen_device_info gen_device_info_cfl_gt2 = {
+-- 
+2.7.4
+

baseboard-rpi3/media-libs/mesa/files/UPSTREAM-intel-change-urb-max-shader-geometry-for-KBL-GT1.patch

@@ -0,0 +1,38 @@
+From 26c9574bdb16d7f6cbe06cd5ef5d1ce258afc1ba Mon Sep 17 00:00:00 2001
+From: Abhishek Kumar <abhishek4.kumar@intel.com>
+Date: Tue, 26 Jan 2021 23:50:13 +0530
+Subject: [PATCH] intel: change urb max shader geometry for KBL GT1
+
+Below Deqp CTS failure is seen on KBL GT1(tested on 0x5906) only ,
+GT2 all test passes, changing the max shader geometry to 256
+(previous 640) fixes all failure tests.Similar issues on
+CML GT1 (Gen9) is fixed
+https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8550
+
+dEQP-GLES31.functional.geometry_shading.layered.
+	 render_with_default_layer_cubemap
+	 render_with_default_layer_3d
+	 render_with_default_layer_2d_array
+
+Signed-off-by: Abhishek Kumar <abhishek4.kumar@intel.com>
+Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8731>
+---
+ src/intel/dev/gen_device_info.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/intel/dev/gen_device_info.c b/src/intel/dev/gen_device_info.c
+index 242251564658..b29cc3d51a50 100644
+--- a/src/intel/dev/gen_device_info.c
++++ b/src/intel/dev/gen_device_info.c
+@@ -675,6 +675,7 @@ static const struct gen_device_info gen_device_info_kbl_gt1 = {
+     * leading to some vertices to go missing if we use too much URB.
+     */
+    .urb.max_entries[MESA_SHADER_VERTEX] = 928,
++   .urb.max_entries[MESA_SHADER_GEOMETRY] = 256,
+    .simulator_id = 16,
+ };
+ 
+-- 
+2.17.1
+

baseboard-rpi3/media-libs/mesa/mesa-21.1.5-r2.ebuild

@@ -0,0 +1 @@
+mesa-21.1.ebuild