temp/libcamera: Backport simple-pipeline buffer count patch

Which has already landed upstream. It has been observed to reduce frame drops in some situations, notably with the Pixel 3a rear camera.
2024-10-01 00:35:44 +02:00
8 changed files with 55 additions and 51 deletions
@@ -1,8 +0,0 @@
-# Invert the acceleration so it is directed downwards, at rest on a planet.
-# This is for compatibility with iio-sensor-proxy.
-#
-# https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/issues/375
-SUBSYSTEM=="misc", KERNEL=="fastrpc-adsp*", ENV{ACCEL_MOUNT_MATRIX}="-1, 0, 0; 0, -1, 0; 0, 0, -1"
-
-# Be compatible with the fix to CVE 2024-41024.
-SUBSYSTEM=="misc", KERNEL=="fastrpc-adsp-secure", SYMLINK="fastrpc-adsp"
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-google-bonito
 pkgdesc="Google Pixel 3a XL"
-pkgver=3
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -17,12 +17,9 @@ depends="
 "
 makedepends="devicepkg-dev"
 source="
-	81-libssc-google-sargo.rules
 	90-feedbackd-drv2624.rules
 	deviceinfo
-	hexagonrpcd-adsp-sensorspd.confd
 	modules-initfs
-	no-hexagonrpcd-on-suspend.sh
 	q6voiced.conf
 "
 subpackages="
@@ -50,45 +47,23 @@ kernel_sdc() {

 nonfree_firmware() {
 	pkgdesc="Proprietary firmware blobs for the Google Pixel 3a XL"
-	replaces="hexagonrpcd-openrc"
 	depends="
 		firmware-google-sargo
-		hexagonrpcd
 		linux-firmware-ath10k
 		linux-firmware-qca
 		linux-firmware-qcom
 		soc-qcom-sdm845-modem
 		soc-qcom-sdm845-nonfree-firmware
 	"
-	# Enable HexagonRPCD by default, but not if the user installed this
-	# package then disabled it.
-	install="
-		device-google-sargo-nonfree-firmware.post-install
-	"

 	# The q6voiced configuration can only be used if the ADSP is brought up
 	# via non-free firmware.
 	install -Dm644 "$srcdir"/q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
-
-	# Sensors depend on ADSP firmware and the sensors registry served over FastRPC.
-	install -Dm644 "$srcdir"/hexagonrpcd-adsp-sensorspd.confd \
-		"$subpkgdir"/etc/conf.d/hexagonrpcd-adsp-sensorspd
-
-	# Sensors depend on ADSP firmware and the sensors registry served over FastRPC.
-	install -Dm644 "$srcdir"/81-libssc-google-sargo.rules \
-		"$subpkgdir"/usr/lib/udev/rules.d/81-libssc-google-sargo.rules
-
-	# The FastRPC service is only enabled when non-free firmware is installed.
-	install -Dm755 "$srcdir"/no-hexagonrpcd-on-suspend.sh \
-		"$subpkgdir"/etc/elogind/system-sleep/no-hexagonrpcd-on-suspend.sh
 }

 sha512sums="
-089ce0acba4e1d789e337bedfca7570796a6416e7230ae9b8fc6b625747a40dbb064b1a707877cd6b7bdc73844c6571316e2ec0746a77060f13d98c52fdbfc00  81-libssc-google-sargo.rules
 016d398155f2344417f5e5649a361719ba6e53e593c501b5df39114cdd284302b9bf8686a39817aee0c08fec95b3ab613c181d6cc9596299aaf7fd05dbe0c3dd  90-feedbackd-drv2624.rules
 a6860945d4c75b698a9fadfd0f42355a601c064f62bcf197061ba97be46d23727cac1df355a238042ce9c9017e0ddf458f23a858aad60bebe672ba495cc6c4ad  deviceinfo
-b6208c254b6e44ac4f6d748a38cc6b05da0db2c90235ada2011b138b82ccc3372687df2f5ad97e885e9eea135216a3c52266a08a7f4eb323e62e799f6f82ec7b  hexagonrpcd-adsp-sensorspd.confd
-0253ff4688b789aa7cdbffb22e7ff9497aabe083adc44bf33fa52617215a1f48fc722bd61aa13a35d109eff1e69202eb599dccff029e39c0a390dcab11dd9b76  modules-initfs
-2972005a9cf6ca57061965075593dddfa8ee479bc6c21cd41851b1a14768cb1cddbd31a17975ae17adc36d40d294ccbc6bf83defbd69fc7b363f638d8564fbbc  no-hexagonrpcd-on-suspend.sh
+1eb5f138619f499fab31ea64f63ee9f8984f195528708ec6a01ddc533c74cfb71d1442b97905ae15db24b8faac259fa3e89db357ca9c747ce3ee598c2d681639  modules-initfs
 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98  q6voiced.conf
 "
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-rc-update add hexagonrpcd-adsp-sensorspd
@@ -1,2 +0,0 @@
-# HexagonFS root directory for served files.
-hexagonrpcd_fw_dir="/usr/share/qcom/sdm670/Google/sargo"
@@ -1,4 +1,3 @@
-gpi
 i2c_qcom_geni
 rmi_core
 rmi_i2c
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "pre" ]
-then
-	# If HexagonRPCD listens for a remote method call while the device is
-	# waking up, the DSP may crash. Assume that HexagonRPCD has fulfilled
-	# all incoming remote method invocations, and stop it.
-	rc-service hexagonrpcd-adsp-sensorspd stop
-fi
@@ -0,0 +1,50 @@
+From d3f0e40d49378a70405b975169ab444f4a565a17 Mon Sep 17 00:00:00 2001
+From: Robert Mader <robert.mader@collabora.com>
+Date: Thu, 26 Sep 2024 23:07:39 +0200
+Subject: [PATCH 5/5] pipeline: simple: Increase buffer count to four
+
+Which is not only what many other pipeline handlers use, but also a good
+lower limit when dealing with DRM and similar APIs. Even Mesas EGL and
+Vulkan WSI implementations use for the reason outlined in mesa commit
+992a2dbba80aba35efe83202e1013bd6143f0dba:
+> When the compositor is directly scanning out from the application's buffer it
+> may end up holding on to three buffers. These are the one that is is currently
+> scanning out from, one that has been given to DRM as the next buffer to flip
+> to, and one that has been attached and will be given to DRM as soon as the
+> previous flip completes. When we attach a fourth buffer to the compositor it
+> should replace that third buffer so we should get a release event immediately
+> after that. This patch therefore also changes the number of buffer slots to 4
+> so that we can accomodate that situation.
+
+Given the popularity of this buffer number the bump should be unlikely
+to cause problems. At the same time it may help with performance or
+even work around glitches.
+
+The previous number was introduced in commit
+a8964c28c80fb520ee3c7b10143371081d41405a without mentioning a specific
+reason against the change at hand.
+
+Signed-off-by: Robert Mader <robert.mader@collabora.com>
+Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
+Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
+Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
+---
+ src/libcamera/pipeline/simple/simple.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp
+index 29320a26..b32f8b2c 100644
+--- a/src/libcamera/pipeline/simple/simple.cpp
+++ b/src/libcamera/pipeline/simple/simple.cpp
+@@ -1134,7 +1134,7 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate()
+ 			cfg.frameSize = format.planes[0].size;
+ 		}
+ 
+-		cfg.bufferCount = 3;
+		cfg.bufferCount = 4;
+ 	}
+ 
+ 	return status;
+-- 
+2.46.2
+
@@ -3,7 +3,7 @@
 pkgname=libcamera
 pkgver=9999
 _pkgver=0.3.2
-pkgrel=6
+pkgrel=7
 pkgdesc="Linux camera framework"
 url="https://libcamera.org/"
 arch="all"
@@ -46,6 +46,7 @@ source="https://gitlab.freedesktop.org/camera/libcamera/-/archive/v$_pkgver/libc
 	0002-libcamera-simple-Force-disable-softwareISP-for-milli.patch
 	0003-libcamera-simple-Enable-softISP-for-the-Pinephone.patch
 	0004-libcamera-simple-Skip-hwISP-formats-if-swISP-is-acti.patch
+	0005-pipeline-simple-Increase-buffer-count-to-four.patch
 	qcam.desktop
 	90-libcamera.rules
 	"
@@ -150,6 +151,7 @@ ac7df3e4509ae874199810057f4d8416da71720c15534578cc352608a8ae228dfa4814f9eb995d55
 9b6da8bd11ff9d8400ed721fbbeb960ac8753c078fdd971d786a446a9f96fea19dfc55be2705dc44a152e11de996f88139c1d24637bffc257da5083d19fe80c9  0002-libcamera-simple-Force-disable-softwareISP-for-milli.patch
 0fc6a1108c4e905d2d422a664622dc25ec459f13765b5711ad009d4df0fd0cceda8cd067a18e5e54eb2346b292481952161e72deb03d416ba80b300256c25e40  0003-libcamera-simple-Enable-softISP-for-the-Pinephone.patch
 35c74746453f4c2e24a2185331afabcf64e3af01bec2462ec09940518cda0e91c4a1f33853b4b009e1f8352af3c606fbd4b4d3791ffbba0f610f19538380c4c8  0004-libcamera-simple-Skip-hwISP-formats-if-swISP-is-acti.patch
+b3ba41f81f30979e9b2bd41f5068cd720a11cde2e2a2e31a875493ad9e299cb3dd7b81b5862bea71201001533c6bde18e3d025f65df23e73af3b9363857654a2  0005-pipeline-simple-Increase-buffer-count-to-four.patch
 22167a4eceb6d1b40b0b7c45fdf116c71684f5340de7f767535cb8e160ad9d2ae0f00cb3d461f73a344520a48a4641cf46226841d78bee06bfbfd2a91337f754  qcam.desktop
 cb4eb19eec766f1b8667a8b7c9d5f7d44a2dce79fddfdf3b6e3d1849066cebe79f82566bdcf6659c7ddf4faaf233d5adac10cda636935785e5305e2b7e9b34a9  90-libcamera.rules
 "