[arch-commits] Commit in lib32-libdrm/trunk (2 files)

2018-05-11 Thread Laurent Carlier via arch-commits
Date: Saturday, May 12, 2018 @ 05:20:39
  Author: lcarlier
Revision: 320982

upgpkg: lib32-libdrm 2.4.92-1

upstream update 2.4.92

Modified:
  lib32-libdrm/trunk/PKGBUILD
Deleted:
  lib32-libdrm/trunk/fix_mistake_in_initial_hole_size_calculation.diff

---+
 PKGBUILD  |6 +--
 fix_mistake_in_initial_hole_size_calculation.diff |   39 
 2 files changed, 3 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-12 03:40:23 UTC (rev 320981)
+++ PKGBUILD2018-05-12 05:20:39 UTC (rev 320982)
@@ -4,8 +4,8 @@
 
 _pkgbasename=libdrm
 pkgname=lib32-$_pkgbasename
-pkgver=2.4.91
-pkgrel=3
+pkgver=2.4.92
+pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services (32-bit)"
 url="https://dri.freedesktop.org/;
 arch=(x86_64)
@@ -15,7 +15,7 @@
 checkdepends=('lib32-cairo')
 
source=(https://dri.freedesktop.org/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2{,.sig}
 no-drmdevice-test.diff)
-sha512sums=('07578c00c121ba37033db7172590e26d1545f81c242bbce2cfb7fb904bde504822c275d6468e5c5d20360d0046ae73d9b058aa0459ba35eb11927141cc998772'
+sha512sums=('9b75584d8957d298125884d490b74c0a641725d17088ba47f3dc2ec9d06519d8387eb464c024ee11712b31b17fb84e1a9a52bd4ebc7c316beb7d2f8711dc9eb2'
 'SKIP'
 
'f1dd5d8c2270c092ccb8e4f92a0da9ab27706dfa22dcedd3fb2414b968ced9333c8bf62baf0219b822e43dce0d804d1dd5cc27d09b0afe8c01967c1784d4a4bb')
 validpgpkeys=('B97BD6A80CAC4981091AE547FE558C72A67013C3') # Maarten Lankhorst 


Deleted: fix_mistake_in_initial_hole_size_calculation.diff
===
--- fix_mistake_in_initial_hole_size_calculation.diff   2018-05-12 03:40:23 UTC 
(rev 320981)
+++ fix_mistake_in_initial_hole_size_calculation.diff   2018-05-12 05:20:39 UTC 
(rev 320982)
@@ -1,39 +0,0 @@
-From 33a2851ab9bc3cd8a68bedf4cf0fdc549b0f3596 Mon Sep 17 00:00:00 2001
-From: Andrey Grodzovsky 
-Date: Mon, 19 Feb 2018 02:18:36 -0500
-Subject: amdgpu: Fix mistake in initial hole size calculation.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Andrey Grodzovsky 
-Acked-by: Christian König 

- amdgpu/amdgpu_vamgr.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/amdgpu/amdgpu_vamgr.c b/amdgpu/amdgpu_vamgr.c
-index 722067f..5840042 100644
 a/amdgpu/amdgpu_vamgr.c
-+++ b/amdgpu/amdgpu_vamgr.c
-@@ -57,7 +57,7 @@ drm_private void amdgpu_vamgr_init(struct amdgpu_bo_va_mgr 
*mgr, uint64_t start,
-   pthread_mutex_init(>bo_va_mutex, NULL);
-   pthread_mutex_lock(>bo_va_mutex);
-   n = calloc(1, sizeof(struct amdgpu_bo_va_hole));
--  n->size = mgr->va_max;
-+  n->size = mgr->va_max - start;
-   n->offset = start;
-   list_add(>list, >va_holes);
-   pthread_mutex_unlock(>bo_va_mutex);
-@@ -80,6 +80,7 @@ amdgpu_vamgr_find_va(struct amdgpu_bo_va_mgr *mgr, uint64_t 
size,
-   struct amdgpu_bo_va_hole *hole, *n;
-   uint64_t offset = 0, waste = 0;
- 
-+
-   alignment = MAX2(alignment, mgr->va_alignment);
-   size = ALIGN(size, mgr->va_alignment);
- 
--- 
-cgit v1.1
-
-


[arch-commits] Commit in lib32-libdrm/trunk (2 files)

2018-02-20 Thread Laurent Carlier via arch-commits
Date: Tuesday, February 20, 2018 @ 17:32:53
  Author: lcarlier
Revision: 296491

upgpkg: lib32-libdrm 2.4.90-2

fix amdgpu cards - FS#57576

Added:
  lib32-libdrm/trunk/fix_mistake_in_initial_hole_size_calculation.diff
Modified:
  lib32-libdrm/trunk/PKGBUILD

---+
 PKGBUILD  |9 +++-
 fix_mistake_in_initial_hole_size_calculation.diff |   39 
 2 files changed, 46 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-20 17:32:31 UTC (rev 296490)
+++ PKGBUILD2018-02-20 17:32:53 UTC (rev 296491)
@@ -14,10 +14,12 @@
 makedepends=('valgrind' 'meson')
 checkdepends=('lib32-cairo')
 
source=(https://dri.freedesktop.org/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2{,.sig}
-no-drmdevice-test.diff)
+no-drmdevice-test.diff
+fix_mistake_in_initial_hole_size_calculation.diff)
 
sha512sums=('3d32d60c44ffdcb58667d0926e6af8d375332add1f243d8b2d37567aeef4e4b26d786294aeecf46c3dea94fc002fb73756567c457300703acfc21e32ffbd458c'
 'SKIP'
-
'f1dd5d8c2270c092ccb8e4f92a0da9ab27706dfa22dcedd3fb2414b968ced9333c8bf62baf0219b822e43dce0d804d1dd5cc27d09b0afe8c01967c1784d4a4bb')
+
'f1dd5d8c2270c092ccb8e4f92a0da9ab27706dfa22dcedd3fb2414b968ced9333c8bf62baf0219b822e43dce0d804d1dd5cc27d09b0afe8c01967c1784d4a4bb'
+
'679ba7ef4f29cc4d511d5fbb7b505d8eade4cd3fc16eceaed2d1aa47947ebf31bac113ead5f2a1db8f5626ba290e9e1ffeab28c2abb924d0c85efe816c1201f8')
 validpgpkeys=('B97BD6A80CAC4981091AE547FE558C72A67013C3') # Maarten Lankhorst 

 validpgpkeys+=('215DEE688925CCB965BE5DA97C03D7797B6E1AE2') # Damien Lespiau 

 validpgpkeys+=('10A6D91DA1B05BD29F6DEBAC0C74F35979C486BE') # David Airlie 

@@ -39,6 +41,9 @@
 
   # Fails in a container; autotools skipped this one already
   patch -Np1 -i ../no-drmdevice-test.diff
+  # FS#57576; fix amdgpu cards
+  patch -Np1 -i ../fix_mistake_in_initial_hole_size_calculation.diff
+
 }
 
 build() {

Added: fix_mistake_in_initial_hole_size_calculation.diff
===
--- fix_mistake_in_initial_hole_size_calculation.diff   
(rev 0)
+++ fix_mistake_in_initial_hole_size_calculation.diff   2018-02-20 17:32:53 UTC 
(rev 296491)
@@ -0,0 +1,39 @@
+From 33a2851ab9bc3cd8a68bedf4cf0fdc549b0f3596 Mon Sep 17 00:00:00 2001
+From: Andrey Grodzovsky 
+Date: Mon, 19 Feb 2018 02:18:36 -0500
+Subject: amdgpu: Fix mistake in initial hole size calculation.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andrey Grodzovsky 
+Acked-by: Christian König 
+---
+ amdgpu/amdgpu_vamgr.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/amdgpu/amdgpu_vamgr.c b/amdgpu/amdgpu_vamgr.c
+index 722067f..5840042 100644
+--- a/amdgpu/amdgpu_vamgr.c
 b/amdgpu/amdgpu_vamgr.c
+@@ -57,7 +57,7 @@ drm_private void amdgpu_vamgr_init(struct amdgpu_bo_va_mgr 
*mgr, uint64_t start,
+   pthread_mutex_init(>bo_va_mutex, NULL);
+   pthread_mutex_lock(>bo_va_mutex);
+   n = calloc(1, sizeof(struct amdgpu_bo_va_hole));
+-  n->size = mgr->va_max;
++  n->size = mgr->va_max - start;
+   n->offset = start;
+   list_add(>list, >va_holes);
+   pthread_mutex_unlock(>bo_va_mutex);
+@@ -80,6 +80,7 @@ amdgpu_vamgr_find_va(struct amdgpu_bo_va_mgr *mgr, uint64_t 
size,
+   struct amdgpu_bo_va_hole *hole, *n;
+   uint64_t offset = 0, waste = 0;
+ 
++
+   alignment = MAX2(alignment, mgr->va_alignment);
+   size = ALIGN(size, mgr->va_alignment);
+ 
+-- 
+cgit v1.1
+
+