From 014fdc1d76d9f6185992a62f7b9f59a848c3aff5 Mon Sep 17 00:00:00 2001 From: Robert Mader Date: Thu, 29 Aug 2024 18:42:28 +0200 Subject: [PATCH] temp/libcamera: Change udev rule with uaccess tag for udmabuf (MR 5541) In upstream discussions regarding dmabuf allocation in was concluded that using udmabuf, which only uses virtual memory, is the better option for the time being. Libcamera gained support for that with version 0.3.1 and it was confirmed that devices currently using the libcamera softwareISP can sample from them, notably: - Librem5 - PinePhone - Pixel 3a Thus let's follow upstream and allow access to that by default - and remove access to /dev/dma_heap again. See also: https://github.com/systemd/systemd/pull/33738 [ci:skip-build]: already built successfully in CI --- temp/libcamera/90-libcamera.rules | 2 +- temp/libcamera/APKBUILD | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/temp/libcamera/90-libcamera.rules b/temp/libcamera/90-libcamera.rules index c6b5a214a..7a73b17e3 100644 --- a/temp/libcamera/90-libcamera.rules +++ b/temp/libcamera/90-libcamera.rules @@ -1 +1 @@ -SUBSYSTEM=="dma_heap",GROUP="video",MODE="0660" +KERNEL=="udmabuf",TAG+="uaccess" diff --git a/temp/libcamera/APKBUILD b/temp/libcamera/APKBUILD index c2212b423..a2afaae70 100644 --- a/temp/libcamera/APKBUILD +++ b/temp/libcamera/APKBUILD @@ -3,7 +3,7 @@ pkgname=libcamera pkgver=9999 _pkgver=0.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="Linux camera framework" url="https://libcamera.org/" arch="all" @@ -153,5 +153,5 @@ a5809b7664685bb44ca05a722655d8b94991c90306b69be1e7b135a1ad72699ab69b0e9bf7edbee0 47616a06fad66df31e29ebd9c024c95bdea542dd1f5c0ed448a242e35a6d9909f973a74332bfe084478c91ac7a2d778d7b10270cd493dba07bb8d5ad34e9544c 0003-libcamera-simple-Enable-softISP-for-the-Pinephone.patch 685b8cfae3bb9a000d95a36d9daf9d4ff8770fd877e43c69f0fc0768ebd457282f03ec6ad9bf3a33e72765665bbd642af5db66c1a82aac249ce8c2522291dee6 0004-libcamera-simple-Skip-hwISP-formats-if-swISP-is-acti.patch 22167a4eceb6d1b40b0b7c45fdf116c71684f5340de7f767535cb8e160ad9d2ae0f00cb3d461f73a344520a48a4641cf46226841d78bee06bfbfd2a91337f754 qcam.desktop -444a0a52b374751c388f807b6adcc63b36488547adaa5fb70b606dc5646132b1a893a76254236b5c80f3a6d041a4597d413e050af0323cd05626d758190838e2 90-libcamera.rules +cb4eb19eec766f1b8667a8b7c9d5f7d44a2dce79fddfdf3b6e3d1849066cebe79f82566bdcf6659c7ddf4faaf233d5adac10cda636935785e5305e2b7e9b34a9 90-libcamera.rules "