Date: Friday, October 5, 2018 @ 17:30:21 Author: lcarlier Revision: 390181
upgpkg: lib32-libdrm 2.4.95-1 upstream update 2.4.95 Modified: lib32-libdrm/trunk/PKGBUILD Deleted: lib32-libdrm/trunk/0001-xf86drm-fallback-to-normal-path-when-realpath-fails.patch lib32-libdrm/trunk/0002-amdgpu-symbol-check-Add-amdgpu_find_bo_by_cpu_mappin.patch lib32-libdrm/trunk/0003-amdgpu-add-error-return-value-for-finding-bo-by-cpu-.patch -----------------------------------------------------------------+ 0001-xf86drm-fallback-to-normal-path-when-realpath-fails.patch | 81 ---------- 0002-amdgpu-symbol-check-Add-amdgpu_find_bo_by_cpu_mappin.patch | 27 --- 0003-amdgpu-add-error-return-value-for-finding-bo-by-cpu-.patch | 52 ------ PKGBUILD | 15 - 4 files changed, 2 insertions(+), 173 deletions(-) Deleted: 0001-xf86drm-fallback-to-normal-path-when-realpath-fails.patch =================================================================== --- 0001-xf86drm-fallback-to-normal-path-when-realpath-fails.patch 2018-10-05 17:29:47 UTC (rev 390180) +++ 0001-xf86drm-fallback-to-normal-path-when-realpath-fails.patch 2018-10-05 17:30:21 UTC (rev 390181) @@ -1,81 +0,0 @@ -From bcb9d976cd91c018aa4eef13563813288984601f Mon Sep 17 00:00:00 2001 -From: Emil Velikov <[email protected]> -Date: Thu, 23 Aug 2018 10:49:54 +0100 -Subject: [PATCH 1/3] xf86drm: fallback to normal path when realpath fails -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Earlier commit reworked our sysfs handling to use realpath. -Sadly that backfired since the Firefox sandboxing mechanism rejects -that. Despite the files/folders being in the allowed list, of the -sandboxing mechanism. - -Oddly enough, the Chromium sandboxing doesn't complain about any of -this. - -Since there are no Firefox releases with the fix, add a temporary -solution which falls back to the original handling. - -Sadly, this won't work for virgl. - -v2: drop return type - function cannot return NULL (Eric) - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107516 -Fixes: a02900133b3 ("xf86drm: introduce a get_real_pci_path() helper") -Signed-off-by: Emil Velikov <[email protected]> -Reviewed-by: Michel Dänzer <[email protected]> -Tested-by: Michel Dänzer <[email protected]> -Reviewed-by: Eric Engestrom <[email protected]> -Signed-off-by: Laurent Carlier <[email protected]> ---- - xf86drm.c | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/xf86drm.c b/xf86drm.c -index 336d64de..7807dce9 100644 ---- a/xf86drm.c -+++ b/xf86drm.c -@@ -3014,6 +3014,12 @@ get_real_pci_path(int maj, int min, char *real_path) - return real_path; - } - -+static void -+get_normal_pci_path(int maj, int min, char *normal_path) -+{ -+ snprintf(normal_path, PATH_MAX, "/sys/dev/char/%d:%d/device", maj, min); -+} -+ - static int drmParsePciBusInfo(int maj, int min, drmPciBusInfoPtr info) - { - #ifdef __linux__ -@@ -3022,7 +3028,7 @@ static int drmParsePciBusInfo(int maj, int min, drmPciBusInfoPtr info) - int num; - - if (get_real_pci_path(maj, min, real_path) == NULL) -- return -ENOENT; -+ get_normal_pci_path(maj, min, real_path); - - value = sysfs_uevent_get(real_path, "PCI_SLOT_NAME"); - if (!value) -@@ -3143,7 +3149,7 @@ static int parse_separate_sysfs_files(int maj, int min, - int ret; - - if (get_real_pci_path(maj, min, real_path) == NULL) -- return -ENOENT; -+ get_normal_pci_path(maj, min, real_path); - - for (unsigned i = ignore_revision ? 1 : 0; i < ARRAY_SIZE(attrs); i++) { - snprintf(path, PATH_MAX, "%s/%s", real_path, attrs[i]); -@@ -3175,7 +3181,7 @@ static int parse_config_sysfs_file(int maj, int min, - int fd, ret; - - if (get_real_pci_path(maj, min, real_path) == NULL) -- return -ENOENT; -+ get_normal_pci_path(maj, min, real_path); - - snprintf(path, PATH_MAX, "%s/config", real_path); - fd = open(path, O_RDONLY); --- -2.18.0 - Deleted: 0002-amdgpu-symbol-check-Add-amdgpu_find_bo_by_cpu_mappin.patch =================================================================== --- 0002-amdgpu-symbol-check-Add-amdgpu_find_bo_by_cpu_mappin.patch 2018-10-05 17:29:47 UTC (rev 390180) +++ 0002-amdgpu-symbol-check-Add-amdgpu_find_bo_by_cpu_mappin.patch 2018-10-05 17:30:21 UTC (rev 390181) @@ -1,27 +0,0 @@ -From f3d90e8db42d8d8a839558c0bc4c368c0107a4b9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <[email protected]> -Date: Mon, 27 Aug 2018 11:48:48 +0200 -Subject: [PATCH 2/3] amdgpu-symbol-check: Add amdgpu_find_bo_by_cpu_mapping - -Fixes: 4d454424e1f2 ("amdgpu: add a function to find bo by cpu mapping - (v2)" -Signed-off-by: Laurent Carlier <[email protected]> ---- - amdgpu/amdgpu-symbol-check | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/amdgpu/amdgpu-symbol-check b/amdgpu/amdgpu-symbol-check -index 90b7a1d6..b5e4fe60 100755 ---- a/amdgpu/amdgpu-symbol-check -+++ b/amdgpu/amdgpu-symbol-check -@@ -53,6 +53,7 @@ amdgpu_cs_wait_fences - amdgpu_cs_wait_semaphore - amdgpu_device_deinitialize - amdgpu_device_initialize -+amdgpu_find_bo_by_cpu_mapping - amdgpu_get_marketing_name - amdgpu_query_buffer_size_alignment - amdgpu_query_crtc_from_id --- -2.18.0 - Deleted: 0003-amdgpu-add-error-return-value-for-finding-bo-by-cpu-.patch =================================================================== --- 0003-amdgpu-add-error-return-value-for-finding-bo-by-cpu-.patch 2018-10-05 17:29:47 UTC (rev 390180) +++ 0003-amdgpu-add-error-return-value-for-finding-bo-by-cpu-.patch 2018-10-05 17:30:21 UTC (rev 390181) @@ -1,52 +0,0 @@ -From f17725108809efaaf139f141808d537d14db3708 Mon Sep 17 00:00:00 2001 -From: Junwei Zhang <[email protected]> -Date: Thu, 30 Aug 2018 17:35:40 +0800 -Subject: [PATCH 3/3] amdgpu: add error return value for finding bo by cpu - mapping (v2) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -If nothing is found, error should be returned. - -v2: udpate the error value different from parameter check - -Signed-off-by: Junwei Zhang <[email protected]> -Reviewed-by: Christian König <[email protected]> -Reviewed-by: Michel Dänzer <[email protected]> -Signed-off-by: Laurent Carlier <[email protected]> ---- - amdgpu/amdgpu_bo.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/amdgpu/amdgpu_bo.c b/amdgpu/amdgpu_bo.c -index 2f4f90f6..a2fc5250 100644 ---- a/amdgpu/amdgpu_bo.c -+++ b/amdgpu/amdgpu_bo.c -@@ -549,8 +549,9 @@ int amdgpu_find_bo_by_cpu_mapping(amdgpu_device_handle dev, - amdgpu_bo_handle *buf_handle, - uint64_t *offset_in_bo) - { -- uint32_t i; - struct amdgpu_bo *bo; -+ uint32_t i; -+ int r = 0; - - if (cpu == NULL || size == 0) - return -EINVAL; -@@ -577,10 +578,11 @@ int amdgpu_find_bo_by_cpu_mapping(amdgpu_device_handle dev, - } else { - *buf_handle = NULL; - *offset_in_bo = 0; -+ r = -ENXIO; - } - pthread_mutex_unlock(&dev->bo_table_mutex); - -- return 0; -+ return r; - } - - int amdgpu_create_bo_from_user_mem(amdgpu_device_handle dev, --- -2.18.0 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-10-05 17:29:47 UTC (rev 390180) +++ PKGBUILD 2018-10-05 17:30:21 UTC (rev 390181) @@ -3,7 +3,7 @@ _pkgbasename=libdrm pkgname=lib32-$_pkgbasename -pkgver=2.4.94 +pkgver=2.4.95 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services (32-bit)" url="https://dri.freedesktop.org/"; @@ -13,14 +13,8 @@ makedepends=('valgrind' 'meson') checkdepends=('lib32-cairo') source=(https://dri.freedesktop.org/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2 # {,.sig} - 0001-xf86drm-fallback-to-normal-path-when-realpath-fails.patch - 0002-amdgpu-symbol-check-Add-amdgpu_find_bo_by_cpu_mappin.patch - 0003-amdgpu-add-error-return-value-for-finding-bo-by-cpu-.patch no-drmdevice-test.diff) -sha512sums=('1a1699d6ea70b8759b37f3863e0802a99430b58f02e62632ad451356e2463eaf6faf4b810323f7dcc85ffdcca28f674b32caa5631ebd65b83e5b86bd59a35937' - 'abdbb6a53db4abb31c2884cfc8b753be112bff50f112f36adbd8179ad84dc2d706e27175ca9c12d0a5cc059367314850a496a3bf6083ee7ca6eae8fa6466a83c' - '1acb785be6dffad791945d56321d773d88584ec162983493e8cb66d80563bcbb4b2bb50ce223b5945b38dad0c4926e532bf3633676f15af3546b479372a485c6' - '9cc8e9900b12ea0fefce8dae55da5637c9df30f7309bc2ecd9edc1e116be4af047f951c855c5864681a3ef339dd1267835cc5aad47cb66b518b6c62830448cd1' +sha512sums=('9bf8178a871bb059471f58f236c8362245e08877b732b2c8366d402e8066c9a74707e4ec3bf680fca12303f1319875edc98ae8e31bc9826f172798f47197e631' 'f1dd5d8c2270c092ccb8e4f92a0da9ab27706dfa22dcedd3fb2414b968ced9333c8bf62baf0219b822e43dce0d804d1dd5cc27d09b0afe8c01967c1784d4a4bb') validpgpkeys=('B97BD6A80CAC4981091AE547FE558C72A67013C3') # Maarten Lankhorst <[email protected]> validpgpkeys+=('215DEE688925CCB965BE5DA97C03D7797B6E1AE2') # Damien Lespiau <[email protected]> @@ -40,11 +34,6 @@ # Fails in a container; autotools skipped this one already patch -Np1 -i ../no-drmdevice-test.diff - - # upstream fixes - patch -Np1 -i ../0001-xf86drm-fallback-to-normal-path-when-realpath-fails.patch - patch -Np1 -i ../0002-amdgpu-symbol-check-Add-amdgpu_find_bo_by_cpu_mappin.patch - patch -Np1 -i ../0003-amdgpu-add-error-return-value-for-finding-bo-by-cpu-.patch } build() {
