libdrm: Changes to 'debian-unstable'

[Andreas Boll]

 Android.common.mk  |1 
 amdgpu/Android.mk  |3 
 amdgpu/Makefile.am |5 
 amdgpu/amdgpu-symbol-check |3 
 amdgpu/amdgpu.h|   43 +
 amdgpu/amdgpu_asic_id.c|  139 
 amdgpu/amdgpu_cs.c |   28 +++
 amdgpu/amdgpu_device.c |   51 +-
 amdgpu/amdgpu_internal.h   |   18 --
 amdgpu/amdgpu_vamgr.c  |   31 +--
 configure.ac   |2 
 data/amdgpu.ids|   31 +++
 debian/changelog   |   11 +
 debian/control |2 
 debian/libdrm-amdgpu1.symbols  |3 
 debian/libdrm-etnaviv1.symbols |5 
 debian/libdrm-freedreno1.symbols   |1 
 debian/libdrm2.symbols |8 
 debian/rules   |8 
 etnaviv/Makefile.sources   |1 
 etnaviv/etnaviv-symbol-check   |5 
 etnaviv/etnaviv_bo_cache.c |   26 ++-
 etnaviv/etnaviv_cmd_stream.c   |   20 ++
 etnaviv/etnaviv_drm.h  |   43 -
 etnaviv/etnaviv_drmif.h|   23 ++
 etnaviv/etnaviv_perfmon.c  |  189 ++
 etnaviv/etnaviv_priv.h |   25 ++
 exynos/exynos_fimg2d.c |   21 ++
 exynos/exynos_fimg2d.h |   21 ++
 exynos/fimg2d_reg.h|   21 ++
 freedreno/freedreno-symbol-check   |1 
 freedreno/freedreno_drmif.h|3 
 freedreno/freedreno_pipe.c |   19 ++
 freedreno/freedreno_priv.h |3 
 freedreno/kgsl/kgsl_pipe.c |3 
 freedreno/kgsl/kgsl_priv.h |2 
 freedreno/msm/msm_drm.h|   40 
 freedreno/msm/msm_pipe.c   |   41 
 freedreno/msm/msm_priv.h   |3 
 freedreno/msm/msm_ringbuffer.c |1 
 include/drm/README |   22 --
 include/drm/mga_drm.h  |   12 +
 include/drm/nouveau_drm.h  |   94 ++-
 include/drm/qxl_drm.h  |   82 +
 include/drm/r128_drm.h |   10 +
 include/drm/radeon_drm.h   |  128 +++
 include/drm/savage_drm.h   |   20 +-
 include/drm/sis_drm.h  |   10 +
 include/drm/tegra_drm.h|   14 +
 include/drm/vc4_drm.h  |   47 +
 include/drm/via_drm.h  |8 
 include/drm/vmwgfx_drm.h   |9 +
 libkms/exynos.c|   22 ++
 tests/amdgpu/amdgpu_test.c |  186 +++---
 tests/amdgpu/amdgpu_test.h |   56 ++
 tests/amdgpu/basic_tests.c |  311 +++--
 tests/amdgpu/bo_tests.c|   75 
 tests/amdgpu/cs_tests.c|   64 +++
 tests/amdgpu/deadlock_tests.c  |   27 ++-
 tests/amdgpu/uvd_enc_tests.c   |   81 +++--
 tests/amdgpu/vce_tests.c   |   65 +++
 tests/amdgpu/vcn_tests.c   |   74 +++-
 tests/exynos/exynos_fimg2d_event.c |   27 ++-
 tests/exynos/exynos_fimg2d_perf.c  |   27 ++-
 tests/exynos/exynos_fimg2d_test.c  |   21 ++
 xf86drm.c  |   63 +++
 xf86drm.h  |   14 +
 xf86drmMode.c  |   98 +++
 xf86drmMode.h  |   22 ++
 69 files changed, 1940 insertions(+), 653 deletions(-)

New commits:
commit 69d8e77f048c02cc963e83b38732979aa3adf2b8
Author: Andreas Boll 
Date:   Mon Dec 18 17:47:57 2017 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 29c9b61..b21986d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.89-1) UNRELEASED; urgency=medium
+libdrm (2.4.89-1) unstable; urgency=medium
 
   * New upstream release.
   * Update libdrm2.symbols and shlibs.
@@ -7,7 +7,7 @@ libdrm (2.4.89-1) UNRELEASED; urgency=medium
   * Update libdrm-freedreno1.symbols and shlibs.
   * Bump standards version to 4.1.2.
 
- -- Andreas Boll   Mon, 18 Dec 2017 16:53:06 +0100
+ -- Andreas Boll   Mon, 18 Dec 2017 17:47:40 +0100
 
 libdrm (2.4.88-1) unstable; urgency=medium
 

commit 69bb021a2ba39dcc8c8604a886974b5b14bc3eb0
Author: Andreas Boll 
Date:   Mon Dec 18 17:38:24 2017 +0100

Bump standards version to 4.1.2.

diff --git a/debian/changelog b/debian/changelog
index f19ae29..29c9b61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libdrm (2.4.89-1) UNRELEASED; urgency=medium
   * Update libdrm-amdgpu1.symbols and shlibs.
   * Update libdrm-etnaviv1.symbols and shlibs.
   * Update libdrm-freedreno1.symbols and shlibs.
+  * Bump standards version to 4.1.2.
 
  -- Andreas Boll   Mon, 18 Dec 2017 16:53:06 +0100
 
diff --git a/debian/control b/debian/control
index 2274f72..fd4688e 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
  

libdrm: Changes to 'debian-unstable'

[Andreas Boll]

 amdgpu/Makefile.sources   |1 
 amdgpu/amdgpu-symbol-check|2 
 amdgpu/amdgpu.h   |   18 +
 amdgpu/amdgpu_vm.c|   53 ++
 configure.ac  |2 
 debian/changelog  |7 +
 debian/libdrm-amdgpu1.symbols |2 
 debian/rules  |2 
 include/drm/drm.h |   41 +++
 include/drm/drm_mode.h|   92 +++--
 tests/amdgpu/Makefile.am  |3 
 tests/amdgpu/amdgpu_test.c|7 +
 tests/amdgpu/amdgpu_test.h|   15 
 tests/amdgpu/vm_tests.c   |  151 ++
 xf86drm.c |   38 +-
 15 files changed, 403 insertions(+), 31 deletions(-)

New commits:
commit a9362d253586a2f0d2c142a5084de1eb283e7c39
Author: Andreas Boll 
Date:   Tue Nov 14 10:10:31 2017 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 5551899..d0d865b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdrm (2.4.88-1) UNRELEASED; urgency=medium
+libdrm (2.4.88-1) unstable; urgency=medium
 
   * New upstream release.
   * Update libdrm-amdgpu1.symbols and shlibs.
 
- -- Andreas Boll   Tue, 14 Nov 2017 09:48:52 +0100
+ -- Andreas Boll   Tue, 14 Nov 2017 10:10:19 +0100
 
 libdrm (2.4.85-1) unstable; urgency=medium
 

commit 2b0f9f2223df588e1f911f0eb4cb6ab823ee5dbc
Author: Andreas Boll 
Date:   Tue Nov 14 10:00:51 2017 +0100

Update libdrm-amdgpu1.symbols and shlibs.

diff --git a/debian/changelog b/debian/changelog
index c451923..5551899 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libdrm (2.4.88-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Update libdrm-amdgpu1.symbols and shlibs.
 
  -- Andreas Boll   Tue, 14 Nov 2017 09:48:52 +0100
 
diff --git a/debian/libdrm-amdgpu1.symbols b/debian/libdrm-amdgpu1.symbols
index 0b516ff..4dde497 100644
--- a/debian/libdrm-amdgpu1.symbols
+++ b/debian/libdrm-amdgpu1.symbols
@@ -53,3 +53,5 @@ libdrm_amdgpu.so.1 libdrm-amdgpu1 #MINVER#
  amdgpu_va_range_alloc@Base 2.4.63
  amdgpu_va_range_free@Base 2.4.63
  amdgpu_va_range_query@Base 2.4.63
+ amdgpu_vm_reserve_vmid@Base 2.4.88
+ amdgpu_vm_unreserve_vmid@Base 2.4.88
diff --git a/debian/rules b/debian/rules
index 113a619..502ddab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -108,7 +108,7 @@ ifeq ($(NOUVEAU), yes)
dh_makeshlibs -plibdrm-nouveau2 -V'libdrm-nouveau2 (>= 2.4.66)' -- -c4
 endif
dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (>= 2.4.39)' -- -c4
-   dh_makeshlibs -plibdrm-amdgpu1 -V'libdrm-amdgpu1 (>= 2.4.85)' -- -c4
+   dh_makeshlibs -plibdrm-amdgpu1 -V'libdrm-amdgpu1 (>= 2.4.88)' -- -c4
 ifeq ($(ARM), yes)
dh_makeshlibs -plibdrm-omap1 -V'libdrm-omap1 (>= 2.4.38)' -- -c4
dh_makeshlibs -plibdrm-exynos1 -V'libdrm-exynos1 (>= 2.4.66)' -- -c4

commit 48a5d7be0af0476aca26aed42c2e941716f5c630
Author: Andreas Boll 
Date:   Tue Nov 14 09:49:04 2017 +0100

Bump changelog

diff --git a/debian/changelog b/debian/changelog
index d866408..c451923 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.88-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Andreas Boll   Tue, 14 Nov 2017 09:48:52 +0100
+
 libdrm (2.4.85-1) unstable; urgency=medium
 
   * New upstream release.

commit 2fe4c07b38ded7f4b9341512da6e670d3321012b
Author: Marek Olšák 
Date:   Fri Nov 3 17:28:58 2017 +0100

configure.ac: bump version for release

diff --git a/configure.ac b/configure.ac
index a300ff3..b2d961b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 
 AC_PREREQ([2.63])
 AC_INIT([libdrm],
-[2.4.87],
+[2.4.88],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
 [libdrm])
 

commit f3091bac21a963f1a3d8ce5db85c0f2b4acbeb49
Author: Andrey Grodzovsky 
Date:   Thu Nov 2 10:29:55 2017 -0400

amdgpu: Fix wrappers for AMDGPU_VM IOCTL.

Rmove amdgpu_context_handle from the interface and use
amdgpu_device_handle instead. Uupdate VMID reservation test
accordingly.

Signed-off-by: Andrey Grodzovsky 
Reviewed-by: Christian König 

diff --git a/amdgpu/amdgpu.h b/amdgpu/amdgpu.h
index 597fc2b..df85a24 100644
--- a/amdgpu/amdgpu.h
+++ b/amdgpu/amdgpu.h
@@ -1496,7 +1496,7 @@ void amdgpu_cs_chunk_fence_info_to_data(struct 
amdgpu_cs_fence_info *fence_info,
  *
  * \return  0 on success otherwise POSIX Error code
 */
-int amdgpu_vm_reserve_vmid(amdgpu_context_handle context, uint32_t flags);
+int amdgpu_vm_reserve_vmid(amdgpu_device_handle dev, uint32_t flags);
 
 /**
  * Free reserved VMID
@@ -1505,7 +1505,7 @@ int 

libdrm: Changes to 'debian-unstable'

[Andreas Boll]

 amdgpu/amdgpu-symbol-check|1 
 amdgpu/amdgpu.h   |   17 +++-
 amdgpu/amdgpu_cs.c|   17 ++--
 configure.ac  |2 
 debian/changelog  |8 +++
 debian/control|2 
 debian/libdrm-amdgpu1.symbols |1 
 debian/rules  |2 
 include/drm/amdgpu_drm.h  |   32 ++-
 tests/modetest/modetest.c |   89 +-
 xf86drmMode.c |   10 ++--
 xf86drmMode.h |   11 ++---
 12 files changed, 171 insertions(+), 21 deletions(-)

New commits:
commit d3feff5f1afbdee438c7375763f13846e965c3e1
Author: Andreas Boll 
Date:   Mon Oct 30 14:01:53 2017 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index febcc7a..d866408 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdrm (2.4.85-1) UNRELEASED; urgency=medium
+libdrm (2.4.85-1) unstable; urgency=medium
 
   * New upstream release.
   * Update libdrm-amdgpu1.symbols and shlibs.
   * Bump standards version to 4.1.1.
 
- -- Andreas Boll   Mon, 30 Oct 2017 13:38:25 +0100
+ -- Andreas Boll   Mon, 30 Oct 2017 14:01:40 +0100
 
 libdrm (2.4.84-2) unstable; urgency=medium
 

commit 0e8476c29d68f07032212bae9d4b3d18e14319c7
Author: Andreas Boll 
Date:   Mon Oct 30 13:52:39 2017 +0100

Bump standards version to 4.1.1.

diff --git a/debian/changelog b/debian/changelog
index 18ce89d..febcc7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libdrm (2.4.85-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Update libdrm-amdgpu1.symbols and shlibs.
+  * Bump standards version to 4.1.1.
 
  -- Andreas Boll   Mon, 30 Oct 2017 13:38:25 +0100
 
diff --git a/debian/control b/debian/control
index 3777fcc..2274f72 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
  libpciaccess-dev,
  valgrind [amd64 armhf i386 mips mipsel powerpc s390x],
  libbsd-dev [kfreebsd-any],
-Standards-Version: 4.0.0
+Standards-Version: 4.1.1
 Section: libs
 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/lib/libdrm.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/lib/libdrm.git

commit af89a5aba1c4e275cbf07bb4e3f6476981e07ad0
Author: Andreas Boll 
Date:   Mon Oct 30 13:51:33 2017 +0100

Update libdrm-amdgpu1.symbols and shlibs.

diff --git a/debian/changelog b/debian/changelog
index 848315c..18ce89d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libdrm (2.4.85-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Update libdrm-amdgpu1.symbols and shlibs.
 
  -- Andreas Boll   Mon, 30 Oct 2017 13:38:25 +0100
 
diff --git a/debian/libdrm-amdgpu1.symbols b/debian/libdrm-amdgpu1.symbols
index 8a6dd8d..0b516ff 100644
--- a/debian/libdrm-amdgpu1.symbols
+++ b/debian/libdrm-amdgpu1.symbols
@@ -18,6 +18,7 @@ libdrm_amdgpu.so.1 libdrm-amdgpu1 #MINVER#
  amdgpu_cs_chunk_fence_to_dep@Base 2.4.82
  amdgpu_cs_create_semaphore@Base 2.4.67
  amdgpu_cs_create_syncobj@Base 2.4.82
+ amdgpu_cs_ctx_create2@Base 2.4.85
  amdgpu_cs_ctx_create@Base 2.4.63
  amdgpu_cs_ctx_free@Base 2.4.63
  amdgpu_cs_destroy_semaphore@Base 2.4.67
diff --git a/debian/rules b/debian/rules
index fecf6e4..113a619 100755
--- a/debian/rules
+++ b/debian/rules
@@ -108,7 +108,7 @@ ifeq ($(NOUVEAU), yes)
dh_makeshlibs -plibdrm-nouveau2 -V'libdrm-nouveau2 (>= 2.4.66)' -- -c4
 endif
dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (>= 2.4.39)' -- -c4
-   dh_makeshlibs -plibdrm-amdgpu1 -V'libdrm-amdgpu1 (>= 2.4.82)' -- -c4
+   dh_makeshlibs -plibdrm-amdgpu1 -V'libdrm-amdgpu1 (>= 2.4.85)' -- -c4
 ifeq ($(ARM), yes)
dh_makeshlibs -plibdrm-omap1 -V'libdrm-omap1 (>= 2.4.38)' -- -c4
dh_makeshlibs -plibdrm-exynos1 -V'libdrm-exynos1 (>= 2.4.66)' -- -c4

commit ffde4528e6647e5b5a2668f0139857c061b62de6
Author: Andreas Boll 
Date:   Mon Oct 30 13:38:41 2017 +0100

Bump changelog

diff --git a/debian/changelog b/debian/changelog
index 96948fa..848315c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.85-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Andreas Boll   Mon, 30 Oct 2017 13:38:25 +0100
+
 libdrm (2.4.84-2) unstable; urgency=medium
 
   * libdrm-amdgpu1.symbols: Updated.

commit e580be90e88eeed95faa5452e343f3ec509517e5
Author: Marek Olšák 
Date:   Sat Oct 21 00:26:24 2017 +0200

configure.ac: bump version to 2.4.85

diff --git a/configure.ac b/configure.ac
index ccb910a..16df3a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 
 AC_PREREQ([2.63])
 AC_INIT([libdrm],
-[2.4.84],
+[2.4.85],
 

libdrm: Changes to 'debian-unstable'

[Timo Aaltonen]

 debian/changelog  |6 ++
 debian/libdrm-amdgpu1.symbols |4 
 2 files changed, 10 insertions(+)

New commits:
commit b5edf1b07e3c613d245a69e9dedad6f24232301f
Author: Timo Aaltonen 
Date:   Fri Oct 13 10:42:56 2017 +0300

upload to unstable

diff --git a/debian/changelog b/debian/changelog
index feaeae6..96948fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libdrm (2.4.84-2) UNRELEASED; urgency=medium
+libdrm (2.4.84-2) unstable; urgency=medium
 
   * libdrm-amdgpu1.symbols: Updated.
 
- -- Timo Aaltonen   Fri, 13 Oct 2017 10:18:46 +0300
+ -- Timo Aaltonen   Fri, 13 Oct 2017 10:42:37 +0300
 
 libdrm (2.4.84-1) unstable; urgency=medium
 

commit f576442ba4423efbb4baefa650aa032560c2f32c
Author: Timo Aaltonen 
Date:   Fri Oct 13 10:23:59 2017 +0300

libdrm-amdgpu1.symbols: Updated.

diff --git a/debian/changelog b/debian/changelog
index c249462..feaeae6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.84-2) UNRELEASED; urgency=medium
+
+  * libdrm-amdgpu1.symbols: Updated.
+
+ -- Timo Aaltonen   Fri, 13 Oct 2017 10:18:46 +0300
+
 libdrm (2.4.84-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/libdrm-amdgpu1.symbols b/debian/libdrm-amdgpu1.symbols
index 7b17173..8a6dd8d 100644
--- a/debian/libdrm-amdgpu1.symbols
+++ b/debian/libdrm-amdgpu1.symbols
@@ -23,12 +23,16 @@ libdrm_amdgpu.so.1 libdrm-amdgpu1 #MINVER#
  amdgpu_cs_destroy_semaphore@Base 2.4.67
  amdgpu_cs_destroy_syncobj@Base 2.4.82
  amdgpu_cs_export_syncobj@Base 2.4.82
+ amdgpu_cs_fence_to_handle@Base 2.4.84
  amdgpu_cs_import_syncobj@Base 2.4.82
  amdgpu_cs_query_fence_status@Base 2.4.63
  amdgpu_cs_query_reset_state@Base 2.4.63
  amdgpu_cs_signal_semaphore@Base 2.4.67
  amdgpu_cs_submit@Base 2.4.63
  amdgpu_cs_submit_raw@Base 2.4.82
+ amdgpu_cs_syncobj_export_sync_file@Base 2.4.84
+ amdgpu_cs_syncobj_import_sync_file@Base 2.4.84
+ amdgpu_cs_syncobj_wait@Base 2.4.84
  amdgpu_cs_wait_fences@Base 2.4.81
  amdgpu_cs_wait_semaphore@Base 2.4.67
  amdgpu_device_deinitialize@Base 2.4.63

libdrm: Changes to 'debian-unstable'

[Timo Aaltonen]

Rebased ref, commits from common ancestor:
commit 79112c95c3bad5b547f8e56e5c833ed60061e61a
Author: Timo Aaltonen 
Date:   Fri Oct 13 09:10:44 2017 +0300

release to unstable

diff --git a/debian/changelog b/debian/changelog
index 5cc6a30..c249462 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdrm (2.4.84-1) UNRELEASED; urgency=medium
+libdrm (2.4.84-1) unstable; urgency=medium
 
   * New upstream release.
   * libdrm2.symbols: Updated.
 
- -- Timo Aaltonen   Fri, 13 Oct 2017 08:59:10 +0300
+ -- Timo Aaltonen   Fri, 13 Oct 2017 09:10:17 +0300
 
 libdrm (2.4.83-1) unstable; urgency=medium
 

commit 2a8bee86de6e66bf59dbf555bbc25a1d92c0e13d
Author: Timo Aaltonen 
Date:   Fri Oct 13 09:10:15 2017 +0300

libdrm2.symbols: Updated.

diff --git a/debian/changelog b/debian/changelog
index 7eacdd0..5cc6a30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libdrm (2.4.84-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * libdrm2.symbols: Updated.
 
  -- Timo Aaltonen   Fri, 13 Oct 2017 08:59:10 +0300
 
diff --git a/debian/libdrm2.symbols b/debian/libdrm2.symbols
index 57b1814..2bb159e 100644
--- a/debian/libdrm2.symbols
+++ b/debian/libdrm2.symbols
@@ -174,6 +174,7 @@ libdrm.so.2 libdrm2 #MINVER#
  drmSyncobjFDToHandle@Base 2.4.82
  drmSyncobjHandleToFD@Base 2.4.82
  drmSyncobjImportSyncFile@Base 2.4.82
+ drmSyncobjWait@Base 2.4.84
  drmUnlock@Base 2.3.1
  drmUnmap@Base 2.3.1
  drmUnmapBufs@Base 2.3.1

libdrm: Changes to 'debian-unstable'

[Timo Aaltonen]

 Android.common.mk|2 
 amdgpu/Android.mk|2 
 amdgpu/amdgpu-symbol-check   |4 
 amdgpu/amdgpu.h  |   64 ++
 amdgpu/amdgpu_asic_id.c  |   15 +-
 amdgpu/amdgpu_cs.c   |   54 
 amdgpu/amdgpu_device.c   |   19 ++-
 configure.ac |2 
 data/Android.mk  |3 
 debian/changelog |6 
 etnaviv/etnaviv_bo.c |5 
 freedreno/kgsl/kgsl_ringbuffer.c |2 
 include/drm/amdgpu_drm.h |   21 +++
 include/drm/drm.h|   22 +++
 include/drm/drm_mode.h   |   47 +++
 intel/intel_chipset.h|4 
 tests/amdgpu/Makefile.am |7 -
 tests/amdgpu/amdgpu_test.c   |6 
 tests/amdgpu/amdgpu_test.h   |   15 ++
 tests/amdgpu/basic_tests.c   |8 +
 tests/amdgpu/deadlock_tests.c|  245 +++
 tests/amdgpu/uvd_enc_tests.c |   31 +++-
 tests/amdgpu/uve_ib.h|4 
 xf86drm.c|   22 +++
 xf86drm.h|3 
 25 files changed, 586 insertions(+), 27 deletions(-)

New commits:
commit 6bfd418587781ed6b1bc297985cb2736ca5a015b
Author: Timo Aaltonen 
Date:   Fri Oct 13 09:04:28 2017 +0300

release to unstable

diff --git a/debian/changelog b/debian/changelog
index 7eacdd0..ce8d938 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libdrm (2.4.84-1) UNRELEASED; urgency=medium
+libdrm (2.4.84-1) unstable; urgency=medium
 
   * New upstream release.
 
- -- Timo Aaltonen   Fri, 13 Oct 2017 08:59:10 +0300
+ -- Timo Aaltonen   Fri, 13 Oct 2017 09:04:18 +0300
 
 libdrm (2.4.83-1) unstable; urgency=medium
 

commit d88127af6625adcdf2717fc5472b9b7465bcdb14
Author: Timo Aaltonen 
Date:   Fri Oct 13 09:04:15 2017 +0300

update the changelog

diff --git a/debian/changelog b/debian/changelog
index 5e18d58..7eacdd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.84-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Timo Aaltonen   Fri, 13 Oct 2017 08:59:10 +0300
+
 libdrm (2.4.83-1) unstable; urgency=medium
 
   * New upstream release.

commit 290d29d9794813a2fe0578dbb905ad09bc810516
Author: Marek Olšák 
Date:   Thu Oct 12 20:48:54 2017 +0200

configure.ac: bump version to 2.4.84

diff --git a/configure.ac b/configure.ac
index f847a66..ccb910a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 
 AC_PREREQ([2.63])
 AC_INIT([libdrm],
-[2.4.83],
+[2.4.84],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
 [libdrm])
 

commit c74d4614048f65b412caa572c900d15adba38ce3
Author: Marek Olšák 
Date:   Fri Sep 8 16:05:54 2017 +0200

amdgpu: add amdgpu_cs_fence_to_handle

v2: update amdgpu-symbol-check

Reviewed-by: Chunming Zhou 

diff --git a/amdgpu/amdgpu-symbol-check b/amdgpu/amdgpu-symbol-check
index 7ecfc98..d9f89ef 100755
--- a/amdgpu/amdgpu-symbol-check
+++ b/amdgpu/amdgpu-symbol-check
@@ -34,6 +34,7 @@ amdgpu_cs_ctx_free
 amdgpu_cs_destroy_semaphore
 amdgpu_cs_destroy_syncobj
 amdgpu_cs_export_syncobj
+amdgpu_cs_fence_to_handle
 amdgpu_cs_import_syncobj
 amdgpu_cs_query_fence_status
 amdgpu_cs_query_reset_state
diff --git a/amdgpu/amdgpu.h b/amdgpu/amdgpu.h
index 979acfc..23cde10 100644
--- a/amdgpu/amdgpu.h
+++ b/amdgpu/amdgpu.h
@@ -1433,6 +1433,20 @@ int 
amdgpu_cs_syncobj_import_sync_file(amdgpu_device_handle dev,
   int sync_file_fd);
 
 /**
+ * Export an amdgpu fence as a handle (syncobj or fd).
+ *
+ * \param what AMDGPU_FENCE_TO_HANDLE_GET_{SYNCOBJ, FD}
+ * \param out_handle   returned handle
+ *
+ * \return   0 on success\n
+ *  <0 - Negative POSIX Error code
+ */
+int amdgpu_cs_fence_to_handle(amdgpu_device_handle dev,
+ struct amdgpu_cs_fence *fence,
+ uint32_t what,
+ uint32_t *out_handle);
+
+/**
  *  Submit raw command submission to kernel
  *
  * \param   dev   - \c [in] device handle
diff --git a/amdgpu/amdgpu_cs.c b/amdgpu/amdgpu_cs.c
index 2cde7bf..9577d5c 100644
--- a/amdgpu/amdgpu_cs.c
+++ b/amdgpu/amdgpu_cs.c
@@ -713,3 +713,25 @@ void amdgpu_cs_chunk_fence_to_dep(struct amdgpu_cs_fence 
*fence,
dep->ctx_id = fence->context->id;
dep->handle = fence->fence;
 }
+
+int amdgpu_cs_fence_to_handle(amdgpu_device_handle dev,
+ struct amdgpu_cs_fence *fence,
+ uint32_t what,
+ uint32_t *out_handle)
+{
+   union drm_amdgpu_fence_to_handle fth = {0};
+   int r;
+
+   fth.in.fence.ctx_id = fence->context->id;
+   fth.in.fence.ip_type = 

libdrm: Changes to 'debian-unstable'

[Timo Aaltonen]

 amdgpu/Android.mk  |6 
 amdgpu/amdgpu_bo.c |   58 ++--
 amdgpu/amdgpu_internal.h   |   24 -
 configure.ac   |2 
 data/Android.mk|9 
 data/amdgpu.ids|1 
 debian/changelog   |6 
 etnaviv/etnaviv_bo.c   |2 
 freedreno/freedreno_bo.c   |1 
 freedreno/freedreno_pipe.c |   10 
 freedreno/msm/msm_ringbuffer.c |8 
 include/drm/drm_fourcc.h   |   31 ++
 include/drm/drm_mode.h |   50 +++
 radeon/radeon_surface.c|1 
 tests/amdgpu/Makefile.am   |1 
 tests/amdgpu/amdgpu_test.c |6 
 tests/amdgpu/amdgpu_test.h |   15 +
 tests/amdgpu/basic_tests.c |  270 ++---
 tests/amdgpu/cs_tests.c|   44 ++-
 tests/amdgpu/frame.h   |2 
 tests/amdgpu/uvd_enc_tests.c   |  500 ++
 tests/amdgpu/uve_ib.h  |  527 +
 tests/amdgpu/vce_tests.c   |   44 ++-
 tests/drmsl.c  |   28 +-
 xf86drm.c  |6 
 25 files changed, 1464 insertions(+), 188 deletions(-)

New commits:
commit f099b599fc13620a6774b1fc358bc5f2adb953e4
Author: Timo Aaltonen 
Date:   Tue Oct 3 11:15:37 2017 +0300

release to sid

diff --git a/debian/changelog b/debian/changelog
index cc110bc..5e18d58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.83-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Timo Aaltonen   Tue, 03 Oct 2017 11:15:26 +0300
+
 libdrm (2.4.82-1) unstable; urgency=medium
 
   * New upstream release.

commit f19dbb79fe54994ecd505ac67ad15d19f591933a
Author: Daniel Stone 
Date:   Thu Aug 24 12:31:30 2017 +0100

configure.ac: Bump version to 2.4.83

diff --git a/configure.ac b/configure.ac
index 5a7b1f8..f847a66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 
 AC_PREREQ([2.63])
 AC_INIT([libdrm],
-[2.4.82],
+[2.4.83],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
 [libdrm])
 

commit 99d3f8253cff617af4662c48ba737bf6e10e146e
Author: Philipp Zabel 
Date:   Mon Aug 21 14:41:11 2017 +0200

etnaviv: fix etna_bo_from_name

Look up BOs from the name table using the name parameter instead of
req.handle (which at this point is always zero).

Signed-off-by: Philipp Zabel 
Reviewed-by: Eric Engestrom 
Reviewed-by: Christian Gmeiner 
Reviewed-by: Wladimir J. van der Laan 
Reviewed-by: Daniel Stone 

diff --git a/etnaviv/etnaviv_bo.c b/etnaviv/etnaviv_bo.c
index 4ad0434..4fe877f 100644
--- a/etnaviv/etnaviv_bo.c
+++ b/etnaviv/etnaviv_bo.c
@@ -173,7 +173,7 @@ struct etna_bo *etna_bo_from_name(struct etna_device *dev, 
uint32_t name)
pthread_mutex_lock(_lock);
 
/* check name table first, to see if bo is already open: */
-   bo = lookup_bo(dev->name_table, req.handle);
+   bo = lookup_bo(dev->name_table, name);
if (bo)
goto out_unlock;
 

commit a0531e76f68e5f69cdc149d7cbff4ba299352dfe
Author: Chih-Wei Huang 
Date:   Thu Jul 27 16:20:52 2017 +0800

android: amdgpu: fix build break

Define two macros to avoid building errors.

Fixes: 7e6bf88cac (amdgpu: move asic id table to a separate file)

Signed-off-by: Chih-Wei Huang 

diff --git a/amdgpu/Android.mk b/amdgpu/Android.mk
index bf0611b..88d3765 100644
--- a/amdgpu/Android.mk
+++ b/amdgpu/Android.mk
@@ -10,5 +10,11 @@ LOCAL_SHARED_LIBRARIES := libdrm
 
 LOCAL_SRC_FILES := $(LIBDRM_AMDGPU_FILES)
 
+LOCAL_CFLAGS := \
+   -DAMDGPU_ASIC_ID_TABLE=\"/system/etc/hwdata/amdgpu.ids\" \
+   -DAMDGPU_ASIC_ID_TABLE_NUM_ENTRIES=$(shell egrep -ci 
'^[0-9a-f]{4},.*[0-9a-f]+,' $(LIBDRM_TOP)/data/amdgpu.ids)
+
+LOCAL_REQUIRED_MODULES := amdgpu.ids
+
 include $(LIBDRM_COMMON_MK)
 include $(BUILD_SHARED_LIBRARY)

commit e5ce5c6807a85187dd9cede54e9144f3bcc3ee47
Author: Chih-Wei Huang 
Date:   Thu Jul 27 16:20:51 2017 +0800

android: add rules to build amdgpu.ids

Signed-off-by: Chih-Wei Huang 

diff --git a/data/Android.mk b/data/Android.mk
new file mode 100644
index 000..3c1fd7c
--- /dev/null
+++ b/data/Android.mk
@@ -0,0 +1,9 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := amdgpu.ids
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/hwdata
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+include $(BUILD_PREBUILT)

commit 20138ea997e4e2eadd43846c114a7891688d653d
Author: Jan Vesely 
Date:   Fri Jul 28 10:23:22 2017 -0400

drmsltest: Check expected neighbours

Fixes: 

libdrm: Changes to 'debian-unstable'

[Emilio Pozuelo Monfort]

 debian/changelog |6 --
 debian/control   |2 +-
 debian/rules |4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit fc3d4a6ecc5435f07b9408249042d61f667487ba
Author: Emilio Pozuelo Monfort 
Date:   Fri Jul 28 22:40:23 2017 +0200

Release to unstable

diff --git a/debian/changelog b/debian/changelog
index 56040ae..cc110bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.82-1) UNRELEASED; urgency=medium
+libdrm (2.4.82-1) unstable; urgency=medium
 
   * New upstream release.
   * debian/upstream/signing-key.asc: add key from Lucas Stach.
@@ -7,7 +7,7 @@ libdrm (2.4.82-1) UNRELEASED; urgency=medium
   * debian/rules: Bump shlibs for the libraries with new symbols.
   * debian/control: Bump Standards-Version to 4.0.0; no changes needed.
 
- -- Emilio Pozuelo Monfort   Wed, 26 Jul 2017 19:18:06 +0200
+ -- Emilio Pozuelo Monfort   Fri, 28 Jul 2017 22:40:20 +0200
 
 libdrm (2.4.81-2) unstable; urgency=medium
 

commit a212996b7db9074c71993ff3796770f29c93638f
Author: Emilio Pozuelo Monfort 
Date:   Fri Jul 28 22:40:12 2017 +0200

Bump Standards-Version to 4.0.0

diff --git a/debian/changelog b/debian/changelog
index 0ceeab8..56040ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libdrm (2.4.82-1) UNRELEASED; urgency=medium
   * Add libdrm-common package for new data files.
   * debian/*.symbols: add new symbols.
   * debian/rules: Bump shlibs for the libraries with new symbols.
+  * debian/control: Bump Standards-Version to 4.0.0; no changes needed.
 
  -- Emilio Pozuelo Monfort   Wed, 26 Jul 2017 19:18:06 +0200
 
diff --git a/debian/control b/debian/control
index 5466d8d..3777fcc 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
  libpciaccess-dev,
  valgrind [amd64 armhf i386 mips mipsel powerpc s390x],
  libbsd-dev [kfreebsd-any],
-Standards-Version: 3.9.8
+Standards-Version: 4.0.0
 Section: libs
 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/lib/libdrm.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/lib/libdrm.git

commit b8299f5d1ec3b8f990fcbfbf14feca65681e98c1
Author: Emilio Pozuelo Monfort 
Date:   Fri Jul 28 22:38:39 2017 +0200

Bump shlibs for the libraries with new symbols

diff --git a/debian/changelog b/debian/changelog
index 832c067..0ceeab8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libdrm (2.4.82-1) UNRELEASED; urgency=medium
   * debian/upstream/signing-key.asc: add key from Lucas Stach.
   * Add libdrm-common package for new data files.
   * debian/*.symbols: add new symbols.
+  * debian/rules: Bump shlibs for the libraries with new symbols.
 
  -- Emilio Pozuelo Monfort   Wed, 26 Jul 2017 19:18:06 +0200
 
diff --git a/debian/rules b/debian/rules
index bf130d6..fecf6e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -100,7 +100,7 @@ override_dh_install:
dh_install --fail-missing
 
 override_dh_makeshlibs:
-   dh_makeshlibs -plibdrm2 -V'libdrm2 (>= 2.4.81)' --add-udeb=libdrm2-udeb 
-- -c4
+   dh_makeshlibs -plibdrm2 -V'libdrm2 (>= 2.4.82)' --add-udeb=libdrm2-udeb 
-- -c4
 ifeq ($(INTEL), yes)
dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (>= 2.4.75)' -- -c4
 endif
@@ -108,7 +108,7 @@ ifeq ($(NOUVEAU), yes)
dh_makeshlibs -plibdrm-nouveau2 -V'libdrm-nouveau2 (>= 2.4.66)' -- -c4
 endif
dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (>= 2.4.39)' -- -c4
-   dh_makeshlibs -plibdrm-amdgpu1 -V'libdrm-amdgpu1 (>= 2.4.81)' -- -c4
+   dh_makeshlibs -plibdrm-amdgpu1 -V'libdrm-amdgpu1 (>= 2.4.82)' -- -c4
 ifeq ($(ARM), yes)
dh_makeshlibs -plibdrm-omap1 -V'libdrm-omap1 (>= 2.4.38)' -- -c4
dh_makeshlibs -plibdrm-exynos1 -V'libdrm-exynos1 (>= 2.4.66)' -- -c4

libdrm: Changes to 'debian-unstable'

[Emilio Pozuelo Monfort]

 Android.common.mk   |1 
 Makefile.am |1 
 amdgpu/.editorconfig|9 
 amdgpu/Makefile.am  |7 
 amdgpu/Makefile.sources |2 
 amdgpu/amdgpu-symbol-check  |7 
 amdgpu/amdgpu.h |   85 +++-
 amdgpu/amdgpu_asic_id.c |  219 ++
 amdgpu/amdgpu_asic_id.h |  165 ---
 amdgpu/amdgpu_cs.c  |   85 
 amdgpu/amdgpu_device.c  |   28 -
 amdgpu/amdgpu_internal.h|   10 
 configure.ac|6 
 data/Makefile.am|   23 +
 data/amdgpu.ids |  159 +++
 debian/changelog|9 
 debian/control  |   16 
 debian/libdrm-amdgpu1.symbols   |7 
 debian/libdrm-common.install|1 
 debian/libdrm2.symbols  |6 
 debian/upstream/signing-key.asc |   45 ++
 etnaviv/etnaviv_cmd_stream.c|8 
 include/drm/amdgpu_drm.h|   54 ++
 include/drm/drm.h   |   26 +
 include/drm/drm_fourcc.h|  147 ++
 include/drm/drm_sarea.h |8 
 include/drm/vc4_drm.h   |   22 -
 intel/intel_bufmgr_gem.c|2 
 intel/intel_chipset.h   |   65 ++-
 intel/intel_decode.c|4 
 tests/amdgpu/Makefile.am|5 
 tests/amdgpu/amdgpu_test.c  |   24 -
 tests/amdgpu/amdgpu_test.h  |   15 
 tests/amdgpu/cs_tests.c |7 
 tests/amdgpu/decode_messages.h  |  848 
 tests/amdgpu/uvd_messages.h |  813 --
 tests/amdgpu/vcn_tests.c|  410 +++
 xf86drm.c   |   83 +++
 xf86drm.h   |8 
 39 files changed, 2421 insertions(+), 1019 deletions(-)

New commits:
commit 2a37112d9dec6a9a5a4d6ab5716f287b9d4227e9
Author: Emilio Pozuelo Monfort 
Date:   Wed Jul 26 20:10:15 2017 +0200

Add new symbols

diff --git a/debian/changelog b/debian/changelog
index 68cb8d5..832c067 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libdrm (2.4.82-1) UNRELEASED; urgency=medium
   * New upstream release.
   * debian/upstream/signing-key.asc: add key from Lucas Stach.
   * Add libdrm-common package for new data files.
+  * debian/*.symbols: add new symbols.
 
  -- Emilio Pozuelo Monfort   Wed, 26 Jul 2017 19:18:06 +0200
 
diff --git a/debian/libdrm-amdgpu1.symbols b/debian/libdrm-amdgpu1.symbols
index 842463b..7b17173 100644
--- a/debian/libdrm-amdgpu1.symbols
+++ b/debian/libdrm-amdgpu1.symbols
@@ -14,14 +14,21 @@ libdrm_amdgpu.so.1 libdrm-amdgpu1 #MINVER#
  amdgpu_bo_va_op_raw@Base 2.4.77
  amdgpu_bo_wait_for_idle@Base 2.4.63
  amdgpu_create_bo_from_user_mem@Base 2.4.63
+ amdgpu_cs_chunk_fence_info_to_data@Base 2.4.82
+ amdgpu_cs_chunk_fence_to_dep@Base 2.4.82
  amdgpu_cs_create_semaphore@Base 2.4.67
+ amdgpu_cs_create_syncobj@Base 2.4.82
  amdgpu_cs_ctx_create@Base 2.4.63
  amdgpu_cs_ctx_free@Base 2.4.63
  amdgpu_cs_destroy_semaphore@Base 2.4.67
+ amdgpu_cs_destroy_syncobj@Base 2.4.82
+ amdgpu_cs_export_syncobj@Base 2.4.82
+ amdgpu_cs_import_syncobj@Base 2.4.82
  amdgpu_cs_query_fence_status@Base 2.4.63
  amdgpu_cs_query_reset_state@Base 2.4.63
  amdgpu_cs_signal_semaphore@Base 2.4.67
  amdgpu_cs_submit@Base 2.4.63
+ amdgpu_cs_submit_raw@Base 2.4.82
  amdgpu_cs_wait_fences@Base 2.4.81
  amdgpu_cs_wait_semaphore@Base 2.4.67
  amdgpu_device_deinitialize@Base 2.4.63
diff --git a/debian/libdrm2.symbols b/debian/libdrm2.symbols
index 0d73704..57b1814 100644
--- a/debian/libdrm2.symbols
+++ b/debian/libdrm2.symbols
@@ -168,6 +168,12 @@ libdrm.so.2 libdrm2 #MINVER#
  drmSetMaster@Base 2.4.3
  drmSetServerInfo@Base 2.3.1
  drmSwitchToContext@Base 2.3.1
+ drmSyncobjCreate@Base 2.4.82
+ drmSyncobjDestroy@Base 2.4.82
+ drmSyncobjExportSyncFile@Base 2.4.82
+ drmSyncobjFDToHandle@Base 2.4.82
+ drmSyncobjHandleToFD@Base 2.4.82
+ drmSyncobjImportSyncFile@Base 2.4.82
  drmUnlock@Base 2.3.1
  drmUnmap@Base 2.3.1
  drmUnmapBufs@Base 2.3.1

commit 7aca9341e65807b502b83bb54ebef3bb8cea0238
Author: Emilio Pozuelo Monfort 
Date:   Wed Jul 26 20:02:13 2017 +0200

Add libdrm-common package

diff --git a/debian/changelog b/debian/changelog
index 1f0e1f3..68cb8d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libdrm (2.4.82-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * debian/upstream/signing-key.asc: add key from Lucas Stach.
+  * Add libdrm-common package for new data files.
 
  -- Emilio Pozuelo Monfort   Wed, 26 Jul 2017 19:18:06 +0200
 
diff --git a/debian/control b/debian/control
index dc9d271..5466d8d 100644
--- a/debian/control
+++ b/debian/control
@@ -48,6 +48,7 @@ Description: Userspace interface to kernel DRM services -- 
development files
 Package: libdrm2
 Architecture: linux-any kfreebsd-any
 Depends:
+ libdrm-common (>= ${source:Version}),
  ${shlibs:Depends},
  

libdrm: Changes to 'debian-unstable'

[Andreas Boll]

 .editorconfig |   19 
 Android.common.mk |   14 
 Android.mk|   19 
 README|6 
 amdgpu/Android.mk |8 
 amdgpu/amdgpu-symbol-check|3 
 amdgpu/amdgpu.h   |   77 ++
 amdgpu/amdgpu_bo.c|   30 -
 amdgpu/amdgpu_cs.c|  106 +++-
 amdgpu/amdgpu_device.c|   24 
 amdgpu/amdgpu_gpu_info.c  |   92 ++-
 amdgpu/amdgpu_internal.h  |4 
 amdgpu/amdgpu_vamgr.c |6 
 autogen.sh|6 
 configure.ac  |   32 -
 debian/changelog  |   65 ++
 debian/control|  150 -
 debian/libdrm-amdgpu1.symbols |3 
 debian/libdrm-etnaviv1.install|1 
 debian/libdrm-etnaviv1.symbols|   32 +
 debian/libdrm-intel1.symbols  |4 
 debian/libdrm2.symbols|3 
 debian/rules  |   47 -
 debian/source/format  |1 
 debian/source/local-options   |7 
 debian/upstream/signing-key.asc   |   29 +
 etnaviv/Android.mk|8 
 etnaviv/etnaviv-symbol-check  |1 
 etnaviv/etnaviv_cmd_stream.c  |   33 +
 etnaviv/etnaviv_drm.h |8 
 etnaviv/etnaviv_drmif.h   |2 
 etnaviv/etnaviv_gpu.c |   72 +-
 etnaviv/etnaviv_priv.h|   22 
 exynos/exynos_drm.c   |2 
 exynos/exynos_drmif.h |8 
 exynos/exynos_fimg2d.c|   14 
 freedreno/Android.mk  |8 
 freedreno/Makefile.am |1 
 freedreno/freedreno_bo.c  |   12 
 freedreno/freedreno_bo_cache.c|4 
 freedreno/freedreno_device.c  |5 
 freedreno/freedreno_priv.h|   56 ++
 freedreno/kgsl/kgsl_device.c  |2 
 freedreno/msm/msm_device.c|2 
 freedreno/msm/msm_ringbuffer.c|7 
 include/drm/README|6 
 include/drm/amdgpu_drm.h  |  468 -
 include/drm/drm.h |3 
 include/drm/drm_mode.h|   45 +
 include/drm/i915_drm.h|  276 ++
 intel/Android.mk  |8 
 intel/intel-symbol-check  |4 
 intel/intel_bufmgr.h  |   11 
 intel/intel_bufmgr_gem.c  |  159 --
 intel/intel_decode.c  |3 
 libkms/Android.mk |6 
 libkms/Makefile.am|4 
 libkms/exynos.c   |3 
 libkms/linux.c|   94 ---
 man/drm-kms.xml   |4 
 man/drm-memory.xml|4 
 man/drm.xml   |6 
 man/drmAvailable.xml  |4 
 man/drmHandleEvent.xml|4 
 man/drmModeGetResources.xml   |4 
 nouveau/Android.mk|8 
 radeon/Android.mk |8 
 tegra/tegra-symbol-check  |7 
 tests/Makefile.am |   46 -
 tests/amdgpu/amdgpu_test.c|  259 -
 tests/amdgpu/amdgpu_test.h|3 
 tests/amdgpu/basic_tests.c|  134 -
 tests/amdgpu/bo_tests.c   |   13 
 tests/amdgpu/cs_tests.c   |   49 +
 tests/amdgpu/vce_tests.c  |   62 +-
 tests/auth.c  |  138 -
 tests/dristat.c   |  285 --
 tests/drmdevice.c |   60 +-
 tests/drmstat.c   |  419 
 tests/drmtest.c   |  135 -
 tests/drmtest.h   |   40 -
 tests/etnaviv/Makefile.am |1 
 tests/exynos/Makefile.am  |4 
 tests/exynos/exynos_fimg2d_test.c |   43 -
 tests/getclient.c |   61 --
 tests/getstats.c  |   50 -
 tests/getversion.c|   49 -
 tests/lock.c  |  264 --
 tests/modetest/Android.mk |3 
 tests/modetest/Makefile.am|4 
 tests/modetest/modetest.c |   39 +
 tests/name_from_fd.c  |   58 --
 tests/nouveau/Makefile.am |8 
 tests/openclose.c |   37 -
 tests/proptest/Android.mk |3 
 tests/setversion.c|   91 ---
 tests/updatedraw.c|  154 -
 tests/util/Android.mk |7 
 tests/util/kms.c  |4 
 xf86drm.c |  992 ++
 xf86drm.h |   56 ++
 xf86drmMode.c |   26 
 xf86drmMode.h |   19 
 103 files changed, 2994 insertions(+), 2816 deletions(-)

New commits:
commit 2e333078575f643bf4eb26b3d1ffbaeca8403932
Author: Andreas Boll 
Date:   Fri Jun 23 11:58:40 2017 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index f650792..05f0e31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@

libdrm: Changes to 'debian-unstable'

[Andreas Boll]

 Makefile.am  |1 
 README   |2 -
 configure.ac |2 -
 debian/changelog |   10 +++
 debian/compat|2 -
 debian/control   |3 --
 debian/libdrm-freedreno1.symbols |1 
 debian/libdrm-intel1.symbols |1 
 debian/libdrm2.symbols   |1 
 debian/rules |8 +++---
 debian/upstream/signing-key.asc  |   29 ++
 etnaviv/etnaviv-symbol-check |3 ++
 etnaviv/etnaviv_bo.c |2 -
 etnaviv/etnaviv_device.c |   23 +
 etnaviv/etnaviv_drmif.h  |3 ++
 etnaviv/etnaviv_pipe.c   |9 +-
 etnaviv/etnaviv_priv.h   |8 +++---
 freedreno/freedreno-symbol-check |1 
 freedreno/freedreno_pipe.c   |4 +++
 freedreno/freedreno_priv.h   |1 
 freedreno/freedreno_ringbuffer.c |9 ++
 freedreno/freedreno_ringbuffer.h |6 +++-
 freedreno/kgsl/kgsl_pipe.c   |5 +++
 freedreno/msm/msm_ringbuffer.c   |   27 ++--
 include/drm/README   |2 -
 include/drm/vc4_drm.h|2 +
 intel/intel-symbol-check |1 
 intel/intel_bufmgr.h |2 +
 intel/intel_bufmgr_fake.c|4 +--
 intel/intel_bufmgr_gem.c |   17 ++---
 intel/intel_chipset.h|   13 +++--
 radeon/radeon_cs_gem.c   |   10 +++
 radeon/radeon_surface.c  |2 -
 tests/kms/kms-universal-planes.c |2 -
 xf86drm.c|   51 +++
 xf86drm.h|5 +++
 36 files changed, 237 insertions(+), 35 deletions(-)

New commits:
commit a4d943024af59e7bd81847aae9097d13537378e6
Author: Andreas Boll 
Date:   Tue Nov 29 19:01:17 2016 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 72384ad..b7897da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.74-1) UNRELEASED; urgency=medium
+libdrm (2.4.74-1) unstable; urgency=medium
 
   * New upstream release.
   * Update debian/upstream/signing-key.asc.
@@ -6,7 +6,7 @@ libdrm (2.4.74-1) UNRELEASED; urgency=medium
 shlibs.
   * Bump debhelper compat to 10.
 
- -- Andreas Boll   Tue, 29 Nov 2016 18:19:05 +0100
+ -- Andreas Boll   Tue, 29 Nov 2016 19:01:04 +0100
 
 libdrm (2.4.73-1) unstable; urgency=medium
 

commit d963fbc94795e4903f9ada320540380a3e774b7b
Author: Andreas Boll 
Date:   Tue Nov 29 18:52:03 2016 +0100

Bump debhelper compat to 10.

diff --git a/debian/changelog b/debian/changelog
index 48539d7..72384ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libdrm (2.4.74-1) UNRELEASED; urgency=medium
   * Update debian/upstream/signing-key.asc.
   * Bump libdrm2's, libdrm-freedreno1's and libdrm-intel1's symbols and
 shlibs.
+  * Bump debhelper compat to 10.
 
  -- Andreas Boll   Tue, 29 Nov 2016 18:19:05 +0100
 
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 7854824..e60a4aa 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: Andreas Boll 
 Build-Depends:
- debhelper (>= 9),
- dh-autoreconf,
+ debhelper (>= 10),
  quilt,
  xsltproc,
  docbook-xsl,
diff --git a/debian/rules b/debian/rules
index ebc5a9a..34abe72 100755
--- a/debian/rules
+++ b/debian/rules
@@ -135,4 +135,4 @@ ifeq ($(FREEDRENO), yes)
 endif
 
 %:
-   dh $@ --with quilt,autoreconf --builddirectory=build/
+   dh $@ --with quilt --builddirectory=build/

commit 59f71414c0a4e45fa75bda9990c2d97cc5687519
Author: Andreas Boll 
Date:   Tue Nov 29 18:49:09 2016 +0100

Bump libdrm2's, libdrm-freedreno1's and libdrm-intel1's symbols and shlibs.

diff --git a/debian/changelog b/debian/changelog
index d74fb38..48539d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ libdrm (2.4.74-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Update debian/upstream/signing-key.asc.
+  * Bump libdrm2's, libdrm-freedreno1's and libdrm-intel1's symbols and
+shlibs.
 
  -- Andreas Boll   Tue, 29 Nov 2016 18:19:05 +0100
 
diff --git a/debian/libdrm-freedreno1.symbols b/debian/libdrm-freedreno1.symbols
index 70b84cd..c015b50 100644
--- a/debian/libdrm-freedreno1.symbols
+++ b/debian/libdrm-freedreno1.symbols
@@ -32,6 +32,7 @@ libdrm_freedreno.so.1 libdrm-freedreno1 #MINVER#
  fd_ringbuffer_flush@Base 0
  fd_ringbuffer_grow@Base 2.4.70
  fd_ringbuffer_new@Base 0
+ fd_ringbuffer_reloc2@Base 2.4.74
  

libdrm: Changes to 'debian-unstable'

[Andreas Boll]

 Makefile.am  |1 
 Makefile.sources |1 
 amdgpu/Makefile.sources  |1 
 amdgpu/amdgpu-symbol-check   |1 
 amdgpu/amdgpu.h  |   10 
 amdgpu/amdgpu_asic_id.h  |  165 +
 amdgpu/amdgpu_device.c   |   15 
 amdgpu/amdgpu_gpu_info.c |2 
 configure.ac |2 
 debian/changelog |7 
 debian/libdrm-amdgpu1.symbols|1 
 debian/libdrm-freedreno1.symbols |1 
 debian/libdrm-intel1.symbols |3 
 debian/libdrm2.symbols   |1 
 debian/rules |8 
 freedreno/freedreno-symbol-check |1 
 freedreno/freedreno_drmif.h  |1 
 freedreno/freedreno_priv.h   |3 
 freedreno/freedreno_ringbuffer.c |   11 
 freedreno/freedreno_ringbuffer.h |5 
 freedreno/kgsl/kgsl_ringbuffer.c |6 
 freedreno/msm/msm_drm.h  |   22 
 freedreno/msm/msm_ringbuffer.c   |   18 
 include/drm/README   |  157 +
 include/drm/drm.h|   17 
 include/drm/drm_mode.h   |   49 +
 intel/Makefile.sources   |3 
 intel/intel-symbol-check |3 
 intel/intel_bufmgr.h |4 
 intel/intel_bufmgr_gem.c |  392 ++
 intel/uthash.h   | 1074 +++
 libsync.h|  148 +
 xf86drm.c|8 
 xf86drmMode.c|   16 
 xf86drmMode.h|3 
 35 files changed, 2035 insertions(+), 125 deletions(-)

New commits:
commit cd11bac06d51efc4a1e1ab0c6882575774d7a8cd
Author: Andreas Boll 
Date:   Tue Nov 15 15:43:26 2016 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 857673a..afe749c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdrm (2.4.73-1) UNRELEASED; urgency=medium
+libdrm (2.4.73-1) unstable; urgency=medium
 
   * New upstream release.
   * Bump libdrm2's, libdrm-amdgpu1's, libdrm-freedreno1's and libdrm-
 intel1's symbols and shlibs.
   * Update a bunch of URLs in packaging to https.
 
- -- Andreas Boll   Thu, 03 Nov 2016 12:13:24 +0100
+ -- Andreas Boll   Tue, 15 Nov 2016 15:43:02 +0100
 
 libdrm (2.4.71-1) unstable; urgency=medium
 

commit 35354731e531e390ed2167c89ce4abdd56bab89f
Author: Andreas Boll 
Date:   Tue Nov 15 15:29:18 2016 +0100

Bump libdrm2's, libdrm-amdgpu1's, libdrm-freedreno1's and libdrm-intel1's 
symbols and shlibs.

diff --git a/debian/changelog b/debian/changelog
index 5b0a495..857673a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 libdrm (2.4.73-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Bump libdrm2's, libdrm-amdgpu1's, libdrm-freedreno1's and libdrm-
+intel1's symbols and shlibs.
   * Update a bunch of URLs in packaging to https.
 
  -- Andreas Boll   Thu, 03 Nov 2016 12:13:24 +0100
diff --git a/debian/libdrm-amdgpu1.symbols b/debian/libdrm-amdgpu1.symbols
index a1014f4..b4e4d68 100644
--- a/debian/libdrm-amdgpu1.symbols
+++ b/debian/libdrm-amdgpu1.symbols
@@ -24,6 +24,7 @@ libdrm_amdgpu.so.1 libdrm-amdgpu1 #MINVER#
  amdgpu_cs_wait_semaphore@Base 2.4.67
  amdgpu_device_deinitialize@Base 2.4.63
  amdgpu_device_initialize@Base 2.4.63
+ amdgpu_get_marketing_name@Base 2.4.73
  amdgpu_query_buffer_size_alignment@Base 2.4.63
  amdgpu_query_crtc_from_id@Base 2.4.63
  amdgpu_query_firmware_version@Base 2.4.63
diff --git a/debian/libdrm-freedreno1.symbols b/debian/libdrm-freedreno1.symbols
index b686576..70b84cd 100644
--- a/debian/libdrm-freedreno1.symbols
+++ b/debian/libdrm-freedreno1.symbols
@@ -28,6 +28,7 @@ libdrm_freedreno.so.1 libdrm-freedreno1 #MINVER#
  fd_ringbuffer_del@Base 0
  fd_ringbuffer_emit_reloc_ring@Base 0
  fd_ringbuffer_emit_reloc_ring_full@Base 2.4.70
+ fd_ringbuffer_flush2@Base 2.4.73
  fd_ringbuffer_flush@Base 0
  fd_ringbuffer_grow@Base 2.4.70
  fd_ringbuffer_new@Base 0
diff --git a/debian/libdrm-intel1.symbols b/debian/libdrm-intel1.symbols
index cf08516..102f799 100644
--- a/debian/libdrm-intel1.symbols
+++ b/debian/libdrm-intel1.symbols
@@ -59,6 +59,9 @@ libdrm_intel.so.1 libdrm-intel1 #MINVER#
  drm_intel_gem_bo_clear_relocs@Base 2.4.27
  drm_intel_gem_bo_context_exec@Base 2.4.36
  drm_intel_gem_bo_get_reloc_count@Base 2.4.27
+ drm_intel_gem_bo_map__cpu@Base 2.4.73
+ drm_intel_gem_bo_map__gtt@Base 2.4.73
+ drm_intel_gem_bo_map__wc@Base 2.4.73
  drm_intel_gem_bo_map_gtt@Base 2.4.3
  drm_intel_gem_bo_map_unsynchronized@Base 2.4.32
  drm_intel_gem_bo_start_gtt_access@Base 2.4.3
diff --git a/debian/libdrm2.symbols b/debian/libdrm2.symbols
index 60899af..1a57179 100644
--- a/debian/libdrm2.symbols
+++ b/debian/libdrm2.symbols
@@ -126,6 +126,7 @@ libdrm.so.2 libdrm2 #MINVER#
  drmModeObjectGetProperties@Base 2.4.36
  

libdrm: Changes to 'debian-unstable'

[Andreas Boll]

 debian/changelog |6 ++
 debian/control   |2 +-
 debian/copyright |2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 867e5db69b00402ba3ae517aa1cc2fe331e4ed01
Author: Andreas Boll 
Date:   Thu Nov 3 12:14:11 2016 +0100

Update a bunch of URLs in packaging to https.

diff --git a/debian/changelog b/debian/changelog
index 5beb35b..6b0520f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.71-2) UNRELEASED; urgency=medium
+
+  * Update a bunch of URLs in packaging to https.
+
+ -- Andreas Boll   Thu, 03 Nov 2016 12:13:24 +0100
+
 libdrm (2.4.71-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 688e7e1..7854824 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Standards-Version: 3.9.8
 Section: libs
 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/lib/libdrm.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/lib/libdrm.git
-Homepage: http://cgit.freedesktop.org/mesa/drm/
+Homepage: https://cgit.freedesktop.org/mesa/drm/
 
 Package: libdrm-dev
 Section: libdevel
diff --git a/debian/copyright b/debian/copyright
index 3715aaa..c55fc47 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
 This package was downloaded from
-http://dri.freedesktop.org/libdrm/
+https://dri.freedesktop.org/libdrm/
 
 It was debianized by Marcelo E. Magallon  on
 Fri, 19 Aug 2005 21:11:18 -0600.

libdrm: Changes to 'debian-unstable'

[Andreas Boll]

 .gitignore  |4 
 Makefile.am |6 
 RELEASING   |   26 
 amdgpu/amdgpu_gpu_info.c|   20 
 configure.ac|   19 
 debian/changelog|7 
 debian/libdrm-intel1.symbols|2 
 debian/libdrm2.symbols  |1 
 debian/rules|4 
 etnaviv/Android.mk  |   18 
 etnaviv/Makefile.am |   26 
 etnaviv/Makefile.sources|   12 
 etnaviv/etnaviv-symbol-check|   45 
 etnaviv/etnaviv_bo.c|  347 +++
 etnaviv/etnaviv_bo_cache.c  |  196 
 etnaviv/etnaviv_cmd_stream.c|  243 +
 etnaviv/etnaviv_device.c|   96 ++
 etnaviv/etnaviv_drm.h   |  233 
 etnaviv/etnaviv_drmif.h |  188 
 etnaviv/etnaviv_gpu.c   |  175 +++
 etnaviv/etnaviv_pipe.c  |   78 +
 etnaviv/etnaviv_priv.h  |  199 
 etnaviv/libdrm_etnaviv.pc.in|   11 
 include/drm/amdgpu_drm.h|   44 
 include/drm/i915_drm.h  |2 
 include/drm/radeon_drm.h|   51 -
 intel/intel-symbol-check|2 
 intel/intel_bufmgr.h|3 
 intel/intel_bufmgr_gem.c|   30 
 radeon/radeon_surface.c |8 
 tests/Makefile.am   |4 
 tests/amdgpu/vce_ib.h   |2 
 tests/etnaviv/Makefile.am   |   41 
 tests/etnaviv/cmdstream.xml.h   |  242 +
 tests/etnaviv/etnaviv_2d_test.c |  240 +
 tests/etnaviv/etnaviv_bo_cache_test.c   |  121 ++
 tests/etnaviv/etnaviv_cmd_stream_test.c |  123 ++
 tests/etnaviv/state.xml.h   |  375 
 tests/etnaviv/state_2d.xml.h| 1497 
 tests/etnaviv/write_bmp.c   |  151 +++
 tests/etnaviv/write_bmp.h   |   34 
 tests/modetest/modetest.c   |5 
 tests/util/kms.c|2 
 util_double_list.h  |2 
 xf86drmMode.c   |   21 
 xf86drmMode.h   |7 
 46 files changed, 4897 insertions(+), 66 deletions(-)

New commits:
commit a61442adb281ff2a021f1db19440ec1557bb47bd
Author: Andreas Boll 
Date:   Thu Oct 6 10:31:43 2016 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 3fc04d9..5beb35b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.71-1) UNRELEASED; urgency=medium
+libdrm (2.4.71-1) unstable; urgency=medium
 
   * New upstream release.
   * Update symbols file and bump shlibs for libdrm2.
@@ -7,7 +7,7 @@ libdrm (2.4.71-1) UNRELEASED; urgency=medium
 the past and won't be useful without the equivalent of the Linux
 Direct Rendering Manager (DRM) subsystem.
 
- -- Andreas Boll   Thu, 08 Sep 2016 13:09:49 +0200
+ -- Andreas Boll   Thu, 06 Oct 2016 10:31:27 +0200
 
 libdrm (2.4.70-1) unstable; urgency=medium
 

commit 3c087014f17a0f40862e3ea8b8b2a6eb3ac6606c
Author: Andreas Boll 
Date:   Thu Oct 6 10:10:21 2016 +0200

Update libdrm-intel1.symbols and shlibs.

diff --git a/debian/changelog b/debian/changelog
index 85379d7..3fc04d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libdrm (2.4.71-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Update symbols file and bump shlibs for libdrm2.
+  * Update libdrm-intel1.symbols and shlibs.
   * Remove Hurd from the architecture list. It FTBFS, haven't built in
 the past and won't be useful without the equivalent of the Linux
 Direct Rendering Manager (DRM) subsystem.
diff --git a/debian/libdrm-intel1.symbols b/debian/libdrm-intel1.symbols
index 23795a2..cf08516 100644
--- a/debian/libdrm-intel1.symbols
+++ b/debian/libdrm-intel1.symbols
@@ -68,7 +68,9 @@ libdrm_intel.so.1 libdrm-intel1 #MINVER#
  drm_intel_gem_context_destroy@Base 2.4.37
  drm_intel_get_aperture_sizes@Base 2.4.26
  drm_intel_get_eu_total@Base 2.4.60
+ drm_intel_get_min_eu_in_pool@Base 2.4.71
  drm_intel_get_pipe_from_crtc_id@Base 2.4.11
+ drm_intel_get_pooled_eu@Base 2.4.71
  drm_intel_get_reset_stats@Base 2.4.48
  drm_intel_get_subslice_total@Base 2.4.60
  drm_intel_reg_read@Base 2.4.38
diff --git a/debian/rules b/debian/rules
index 4acebc8..d0c6eb0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -116,7 +116,7 @@ endif
 override_dh_makeshlibs:
dh_makeshlibs -plibdrm2 -V'libdrm2 (>= 2.4.71)' --add-udeb=libdrm2-udeb 
-- -c4
 ifeq ($(INTEL), yes)
-   dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (>= 2.4.66)' -- -c4
+   dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (>= 2.4.71)' -- -c4
 endif
 ifeq 

libdrm: Changes to 'debian-unstable'

[Andreas Boll]

 debian/changelog |8 
 debian/control   |   16 
 2 files changed, 16 insertions(+), 8 deletions(-)

New commits:
commit c47f47ea1cc777b9f9162fd3ea8955e25e5904c6
Author: Andreas Boll 
Date:   Thu Sep 8 13:10:41 2016 +0200

Remove Hurd from the architecture list.

It FTBFS, haven't built in the past and won't be useful without the
equivalent of the Linux Direct Rendering Manager (DRM) subsystem.

diff --git a/debian/changelog b/debian/changelog
index 7cb5342..c44b82d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libdrm (2.4.70-2) UNRELEASED; urgency=medium
+
+  * Remove Hurd from the architecture list. It FTBFS, haven't built in
+the past and won't be useful without the equivalent of the Linux
+Direct Rendering Manager (DRM) subsystem.
+
+ -- Andreas Boll   Thu, 08 Sep 2016 13:09:49 +0200
+
 libdrm (2.4.70-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 82f78e3..688e7e1 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Homepage: http://cgit.freedesktop.org/mesa/drm/
 
 Package: libdrm-dev
 Section: libdevel
-Architecture: any
+Architecture: linux-any kfreebsd-any
 Depends:
  libdrm2 (= ${binary:Version}),
  libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 
x32],
@@ -47,7 +47,7 @@ Description: Userspace interface to kernel DRM services -- 
development files
  This package provides the development environment for libdrm.
 
 Package: libdrm2
-Architecture: any
+Architecture: linux-any kfreebsd-any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
@@ -65,7 +65,7 @@ Description: Userspace interface to kernel DRM services -- 
runtime
 Package: libdrm2-udeb
 Package-Type: udeb
 Section: debian-installer
-Architecture: any
+Architecture: linux-any kfreebsd-any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
@@ -75,7 +75,7 @@ Description: Userspace interface to kernel DRM services -- 
runtime
 Package: libdrm2-dbg
 Section: debug
 Priority: extra
-Architecture: any
+Architecture: linux-any kfreebsd-any
 Depends:
  libdrm2 (= ${binary:Version}),
  ${misc:Depends},
@@ -150,7 +150,7 @@ Description: Userspace interface to nouveau-specific kernel 
DRM -- debugging sym
  This package provides the debugging symbols for the libdrm-nouveau2 package.
 
 Package: libdrm-radeon1
-Architecture: any
+Architecture: linux-any kfreebsd-any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
@@ -166,7 +166,7 @@ Description: Userspace interface to radeon-specific kernel 
DRM services -- runti
 Package: libdrm-radeon1-dbg
 Section: debug
 Priority: extra
-Architecture: any
+Architecture: linux-any kfreebsd-any
 Depends:
  libdrm-radeon1 (= ${binary:Version}),
  ${misc:Depends},
@@ -305,7 +305,7 @@ Description: Userspace interface to tegra-specific kernel 
DRM services -- debugg
  This package provides the debugging symbols for the libdrm-tegra0 package.
 
 Package: libdrm-amdgpu1
-Architecture: any
+Architecture: linux-any kfreebsd-any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
@@ -321,7 +321,7 @@ Description: Userspace interface to amdgpu-specific kernel 
DRM services -- runti
 Package: libdrm-amdgpu1-dbg
 Section: debug
 Priority: extra
-Architecture: any
+Architecture: linux-any kfreebsd-any
 Depends:
  libdrm-amdgpu1 (= ${binary:Version}),
  ${misc:Depends},

libdrm: Changes to 'debian-unstable'

[Andreas Boll]

 Makefile.am  |2 
 Makefile.sources |3 
 configure.ac |2 
 debian/changelog |9 
 debian/libdrm-freedreno1.symbols |4 
 debian/rules |2 
 debian/source/local-options  |   14 +
 freedreno/Makefile.am|2 
 freedreno/Makefile.sources   |1 
 freedreno/README |   16 -
 freedreno/freedreno-symbol-check |4 
 freedreno/freedreno_bo.c |  141 +
 freedreno/freedreno_bo_cache.c   |  222 +
 freedreno/freedreno_device.c |   62 +
 freedreno/freedreno_drmif.h  |   14 +
 freedreno/freedreno_priv.h   |   38 +++
 freedreno/freedreno_ringbuffer.c |   51 
 freedreno/freedreno_ringbuffer.h |   16 -
 freedreno/kgsl/README|   26 ++
 freedreno/kgsl/kgsl_bo.c |6 
 freedreno/kgsl/kgsl_ringbuffer.c |   13 -
 freedreno/msm/msm_bo.c   |   20 +
 freedreno/msm/msm_device.c   |3 
 freedreno/msm/msm_drm.h  |  109 ++
 freedreno/msm/msm_priv.h |   17 -
 freedreno/msm/msm_ringbuffer.c   |  410 ---
 include/drm/virtgpu_drm.h|  109 +-
 intel/Makefile.am|1 
 libkms/Makefile.am   |2 
 man/drm-kms.xml  |2 
 nouveau/Makefile.am  |2 
 radeon/Makefile.am   |3 
 radeon/radeon_cs_gem.c   |2 
 tests/drmdevice.c|   13 -
 tests/modetest/Makefile.am   |2 
 util_double_list.h   |6 
 xf86drm.c|   25 +-
 37 files changed, 922 insertions(+), 452 deletions(-)

New commits:
commit cc02f99b2c3e19f8108a7341eedb2666e6c6e602
Author: Andreas Boll 
Date:   Mon Jul 25 12:33:11 2016 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 915a635..7cb5342 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdrm (2.4.70-1) UNRELEASED; urgency=medium
+libdrm (2.4.70-1) unstable; urgency=medium
 
   * New upstream release.
   * Update libdrm-freedreno1.symbols and shlibs.
   * source/local-options: Add more files to extend-diff-ignore option.
 Fixes 17 patch-system-but-direct-changes-in-diff lintian warnings.
 
- -- Andreas Boll   Mon, 25 Jul 2016 11:54:36 +0200
+ -- Andreas Boll   Mon, 25 Jul 2016 12:32:20 +0200
 
 libdrm (2.4.69-1) unstable; urgency=medium
 

commit a2bfeba63f2c5f58a2c9803dd9aea01abd346c4c
Author: Andreas Boll 
Date:   Mon Jul 25 12:17:05 2016 +0200

source/local-options: Add more files to extend-diff-ignore option.

Fixes 17 patch-system-but-direct-changes-in-diff lintian warnings.

diff --git a/debian/changelog b/debian/changelog
index 010c37e..915a635 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ libdrm (2.4.70-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Update libdrm-freedreno1.symbols and shlibs.
+  * source/local-options: Add more files to extend-diff-ignore option.
+Fixes 17 patch-system-but-direct-changes-in-diff lintian warnings.
 
  -- Andreas Boll   Mon, 25 Jul 2016 11:54:36 +0200
 
diff --git a/debian/source/local-options b/debian/source/local-options
index ec29ae8..b0c5d03 100644
--- a/debian/source/local-options
+++ b/debian/source/local-options
@@ -1 +1,13 @@
---extend-diff-ignore=intel/tests/g.*batch.sh
+# ignore symlinks from git, use source files from the tarball
+extend-diff-ignore = intel/tests/g.*batch.sh
+
+## The following files aren't shipped in the upstream tarball
+
+# Android Makefiles
+extend-diff-ignore = Android\.mk|CleanSpec\.mk
+
+# misc. files and scripts used by libdrm developers but not required for the 
build
+extend-diff-ignore = RELEASING|autogen\.sh|freedreno/kgsl/README
+
+# dead code
+extend-diff-ignore = tests/auth.c|tests/lock.c

commit 108ad20738f8d67fc7e728e79f136aa8fc41c5d1
Author: Andreas Boll 
Date:   Mon Jul 25 12:03:22 2016 +0200

Update libdrm-freedreno1.symbols and shlibs.

diff --git a/debian/changelog b/debian/changelog
index 4b565b5..010c37e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libdrm (2.4.70-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Update libdrm-freedreno1.symbols and shlibs.
 
  -- Andreas Boll   Mon, 25 Jul 2016 11:54:36 +0200
 
diff --git a/debian/libdrm-freedreno1.symbols b/debian/libdrm-freedreno1.symbols
index 5a4f465..b686576 100644
--- a/debian/libdrm-freedreno1.symbols
+++ b/debian/libdrm-freedreno1.symbols
@@ -18,14 +18,18 @@ libdrm_freedreno.so.1 libdrm-freedreno1 #MINVER#
  fd_device_new@Base 0
  fd_device_new_dup@Base 0
  fd_device_ref@Base 0
+ fd_device_version@Base 2.4.70
  fd_pipe_del@Base 0
  fd_pipe_get_param@Base 0
  

libdrm: Changes to 'debian-unstable'

[Andreas Boll]

 Android.mk  |4 
 amdgpu/Android.mk   |2 
 configure.ac|5 
 debian/changelog|5 
 debian/upstream/signing-key.asc |  226 ++
 freedreno/Android.mk|2 
 freedreno/msm/msm_ringbuffer.c  |5 
 include/drm/vc4_drm.h   |   21 
 intel/Android.mk|2 
 intel/intel_chipset.h   |   26 
 libkms/Android.mk   |2 
 libkms/linux.c  |5 
 nouveau/Android.mk  |2 
 radeon/Android.mk   |2 
 radeon/radeon_surface.c |6 
 tests/amdgpu/basic_tests.c  |   56 +
 tests/amdgpu/cs_tests.c |   51 +
 tests/modetest/Android.mk   |2 
 tests/proptest/Android.mk   |2 
 tests/util/Android.mk   |2 
 xf86drm.c   | 1454 
 21 files changed, 1108 insertions(+), 774 deletions(-)

New commits:
commit 108c9902ef556e3d841a95f41b0c0431053363f1
Author: Andreas Boll 
Date:   Thu Jul 21 10:25:26 2016 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index adb8c16..1a625e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.69-1) UNRELEASED; urgency=medium
+libdrm (2.4.69-1) unstable; urgency=medium
 
   [ Andreas Boll ]
   * New upstream release.
@@ -9,7 +9,7 @@ libdrm (2.4.69-1) UNRELEASED; urgency=medium
   [ Julien Cristau ]
   * Build libdrm-tegra on arm64 (closes: #828023).  Thanks, Martin Michlmayr!
 
- -- Andreas Boll   Tue, 10 May 2016 14:45:31 +0200
+ -- Andreas Boll   Thu, 21 Jul 2016 10:25:17 +0200
 
 libdrm (2.4.68-1) unstable; urgency=medium
 

commit e36e80c3fefb3bcee9c0b81f7b1b92345a5375bc
Author: Andreas Boll 
Date:   Thu Jul 21 09:42:29 2016 +0200

Bump changelog.

diff --git a/debian/changelog b/debian/changelog
index 5af53f2..adb8c16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-libdrm (2.4.68-2) UNRELEASED; urgency=medium
+libdrm (2.4.69-1) UNRELEASED; urgency=medium
 
   [ Andreas Boll ]
+  * New upstream release.
   * Update debian/upstream/signing-key.asc.
   * Bump Standards-Version to 3.9.8, no changes needed.
   * Update watch url to use https instead of http.

commit 9d92a1f02032b2598d44d93567a425356bb8c773
Author: Andreas Boll 
Date:   Thu Jul 21 09:34:11 2016 +0200

Update debian/upstream/signing-key.asc

Add Eric Anholt's key D1FC9EE8.

diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
index 0feee56..825d341 100644
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@@ -343,3 +343,229 @@ 
Lz7boQFSm/REGmPIUtRdE7hHCHijczuqvzhRQ1H7N3yGlbiCip6vH9VJTH4tkqK4
 F2vRWhurk3aFZO7UT1FhAoX62bY6JPsotqQQJg4XP/M7uM6PMg==
 =z5S1
 -END PGP PUBLIC KEY BLOCK-
+-BEGIN PGP PUBLIC KEY BLOCK-
+
+mQINBFH8yAsBEAC8tpEivCRFjoVPjwNrRr1xAh9NQQ0aQdjYLva+RFGFRYG9IQTf
+ZgzrXXeG6p5kGW9ywtaYAi9M4ekKtzVoRMHWILEYMhNeu26syjJsK7oyzzLhLURn
+7UPsBJSsdn0eJ2Dyzk4mKny/eCaKIWmPtwu1lDgQFpM8YozIA816kHuTiWsqUXeG
+4CZlfHh05jYUW/4UMAC2UXJrHeO0USl0OgnIwI4Y+P1f1ygCXRBcD6A+9V5Wjhzz
+7Gd8IA1y16VyVkYQNs4E0C8/MDtxpAHfqe8PuSFzGVbXF+WZT8H4Ii2y5a6Xa0VN
+m2ZnKR0kEJRE1UW7KDmX4oIi3w0485ZtyzGP5v6+xYLRkAjH6uUQ/7DsbHqtHFu9
+cwRQ4LPqOgcrSKNK0LqDrKHssqOhy9vjXEKZPjtn1Lb5zFhR33ENck375pY9SbGB
+l230r1j6iYounIp1bv31mSoRNhi4uB9LzuQHWoyF+maLlhPBNBnJgQ9o7bDs6veo
+HUbIatZr0g79c93IXH8bWf0uaDUvDDNi3favwyhHa/j1lkDd8ZipbSXMxhlpuiAb
+enYd3An7ueAqCM/v0mXNBcOjVNJZaoCf2AT/G2wTegk5WHDb3aECDG3a36OE+ciP
+rFs4/WnFYaK7voRFj/97e2pLFiqSWSk9BZ4hdP/2IuigASN81vAXT4RVNwARAQAB
+tB1FcmljIEFuaG9sdCA8ZXJpY0BhbmhvbHQubmV0PokCOgQTAQgAJAIbAwULCQgH
+AwUVCgkICwUWAgMBAAIeAQIXgAUCUg6UHAIZAQAKCRC11ik20fye6IqnEACFmoAF
+EhJJWXTyJdqV96wDA11Y1rFmrglsm4fNPaYCRRyWe8CtSkzOsTEZyKn/Ry0PqxnL
+4dTk0/y3EKIOlxn1UMC+enwrPqMP5kLHHz3uMKm/vl0LXou7m9jbzVmQzFLbu03T
+94oU0pFPQKcanCxh5EqyFmuVDuak3GwTrnOIcJpgAULP1bj41u4MXa5LivcZctTC
+jhIhVVBNvf7Vv66x9mvbiccDHBdxQIt9s1a4OfHTPeObOH9yo6lZ6sQB5lck5HOd
+xqdkX0NMc4uFwr02Xjf8rAG6pHsxfZ0WDQzSmMaSSW4CoPSeSFUWQLQZSPZ3k3UI
+p7gFMF1eHeFlI4HaKZy/mjGPs8GwrBOwEwjuZlJsdxQvNqABq4SqTJ2kWc7qPfsw
+VYGC2JrEcoSBRM95FaFKfV2ioYX2BZW/mqCUFRqrznXvHag7vel26/HGmY3m6qJk
+09TD5SxT2ds0X5syx4gNaMUQ+D4BvbgrgOWfrPtkS5kAsjSIxqnmQZE4nOt5XS7T
+DBq1j7+SO2mIq88ecxrxj3s+TBO8ANQagO+HfPinbMwc/EiI5iqHbSS/O4J+HmKT
+v8JMUQaqwVulwS7i1DHi53sOUbQ2oSak5TD9sDLCXev/fG+e2fXaXgdR9OuKcG4c
+CvDgQIi0BMRzCR4bTVi1S7EQsIjA0eBTRippfLQeRXJpYyBBbmhvbHQgPGFuaG9s
+dEBnbWFpbC5jb20+iQI3BBMBCAAhBQJR/MlWAhsDBQsJCAcDBRUKCQgLBRYCAwEA
+Ah4BAheAAAoJELXWKTbR/J7okCcP+wQKwF7L/6lvAJ7xXfg/kEjBTxlonv6sGTYb
+uZYJX00F5tyfXQtE2cUeX3M3CvEU9Y+pQLbSTaC5oUVwwwSLgvf4OyGHU5n1d/g4
+Y0sbkO5nnyEim6dgV1DBuht/9XBFH11rnXLwU1GLAMuQhcuzakmWutWA2zEW5KOd
+0fXRdxCsaA1ZcXDbZ70mJ2gi7bW23V4fwa5jwpnupmbPkI394oCd7G0zVG1hUaib

libdrm: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |4 
 debian/control   |6 +++---
 debian/rules |   14 +-
 3 files changed, 20 insertions(+), 4 deletions(-)

New commits:
commit a3371f72cd819251c9f3acee77c032b9e2931024
Author: Julien Cristau 
Date:   Fri Jun 24 11:17:10 2016 +0200

Build libdrm-tegra on arm64 (closes: #828023).

Thanks, Martin Michlmayr!

diff --git a/debian/changelog b/debian/changelog
index 329abdc..5af53f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 libdrm (2.4.68-2) UNRELEASED; urgency=medium
 
+  [ Andreas Boll ]
   * Update debian/upstream/signing-key.asc.
   * Bump Standards-Version to 3.9.8, no changes needed.
   * Update watch url to use https instead of http.
 
+  [ Julien Cristau ]
+  * Build libdrm-tegra on arm64 (closes: #828023).  Thanks, Martin Michlmayr!
+
  -- Andreas Boll   Tue, 10 May 2016 14:45:31 +0200
 
 libdrm (2.4.68-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index e81dff2..82f78e3 100644
--- a/debian/control
+++ b/debian/control
@@ -34,7 +34,7 @@ Depends:
  libdrm-omap1 (= ${binary:Version}) [any-arm],
  libdrm-freedreno1 (= ${binary:Version}) [any-arm arm64],
  libdrm-exynos1 (= ${binary:Version}) [any-arm],
- libdrm-tegra0 (= ${binary:Version}) [any-arm],
+ libdrm-tegra0 (= ${binary:Version}) [any-arm arm64],
  ${misc:Depends},
 Multi-Arch: same
 Description: Userspace interface to kernel DRM services -- development files
@@ -274,7 +274,7 @@ Description: Userspace interface to exynos-specific kernel 
DRM services -- debug
  This package provides the debugging symbols for the libdrm-exynos1 package.
 
 Package: libdrm-tegra0
-Architecture: any-arm
+Architecture: any-arm arm64
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
@@ -290,7 +290,7 @@ Description: Userspace interface to tegra-specific kernel 
DRM services -- runtim
 Package: libdrm-tegra0-dbg
 Section: debug
 Priority: extra
-Architecture: any-arm
+Architecture: any-arm arm64
 Depends:
  libdrm-tegra0 (= ${binary:Version}),
  ${misc:Depends},
diff --git a/debian/rules b/debian/rules
index 2dd69bc..169f648 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,10 +49,18 @@ endif
 ifeq ($(ARM), yes)
confflags += --enable-exynos-experimental-api
confflags += --enable-omap-experimental-api
-   confflags += --enable-tegra-experimental-api
 else
confflags += --disable-exynos-experimental-api
confflags += --disable-omap-experimental-api
+endif
+
+# Tegra is on arm and arm64
+ifneq (,$(filter arm arm64,$(DEB_HOST_ARCH_CPU)))
+   TEGRA = yes
+endif
+ifeq ($(TEGRA), yes)
+   confflags += --enable-tegra-experimental-api
+else
confflags += --disable-tegra-experimental-api
 endif
 
@@ -96,6 +104,8 @@ endif
 ifeq ($(ARM), yes)
dh_strip -plibdrm-omap1 --dbg-package=libdrm-omap1-dbg
dh_strip -plibdrm-exynos1 --dbg-package=libdrm-exynos1-dbg
+endif
+ifeq ($(TEGRA), yes)
dh_strip -plibdrm-tegra0 --dbg-package=libdrm-tegra0-dbg
 endif
 ifeq ($(FREEDRENO), yes)
@@ -116,6 +126,8 @@ endif
 ifeq ($(ARM), yes)
dh_makeshlibs -plibdrm-omap1 -V'libdrm-omap1 (>= 2.4.38)' -- -c4
dh_makeshlibs -plibdrm-exynos1 -V'libdrm-exynos1 (>= 2.4.66)' -- -c4
+endif
+ifeq ($(TEGRA), yes)
dh_makeshlibs -plibdrm-tegra0 -V'libdrm-tegra0' -- -c4
 endif
 ifeq ($(FREEDRENO), yes)

libdrm: Changes to 'debian-unstable'

[Andreas Boll]

 debian/changelog |1 +
 debian/watch |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1078ee929b57a7b33d67997ebe47e66df9414b76
Author: Andreas Boll 
Date:   Wed May 11 09:54:31 2016 +0200

Update watch url to use https instead of http.

diff --git a/debian/changelog b/debian/changelog
index c860567..329abdc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libdrm (2.4.68-2) UNRELEASED; urgency=medium
 
   * Update debian/upstream/signing-key.asc.
   * Bump Standards-Version to 3.9.8, no changes needed.
+  * Update watch url to use https instead of http.
 
  -- Andreas Boll   Tue, 10 May 2016 14:45:31 +0200
 
diff --git a/debian/watch b/debian/watch
index 754b4b0..4d3a83b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 #git=git://anongit.freedesktop.org/mesa/drm
 version=3
 opts=pgpsigurlmangle=s/$/.sig/ \
-http://dri.freedesktop.org/libdrm/libdrm-(.*)\.tar\.gz
+https://dri.freedesktop.org/libdrm/libdrm-(.*)\.tar\.gz

libdrm: Changes to 'debian-unstable'

[Andreas Boll]

 debian/changelog|7 +++
 debian/control  |2 -
 debian/upstream/signing-key.asc |   76 
 3 files changed, 84 insertions(+), 1 deletion(-)

New commits:
commit faef933820d873aea3fcf10a414d5f2b3e3d213f
Author: Andreas Boll 
Date:   Tue May 10 14:48:53 2016 +0200

Bump Standards-Version to 3.9.8, no changes needed.

diff --git a/debian/changelog b/debian/changelog
index 5f90a87..c860567 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libdrm (2.4.68-2) UNRELEASED; urgency=medium
 
   * Update debian/upstream/signing-key.asc.
+  * Bump Standards-Version to 3.9.8, no changes needed.
 
  -- Andreas Boll   Tue, 10 May 2016 14:45:31 +0200
 
diff --git a/debian/control b/debian/control
index 11b42be..e81dff2 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends:
  libpciaccess-dev,
  valgrind [amd64 armhf i386 mips mipsel powerpc s390x],
  libbsd-dev [kfreebsd-any],
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Section: libs
 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/lib/libdrm.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/lib/libdrm.git

commit 7b3ec3a377400d7fd0631bdc41130a1e29b23b0c
Author: Andreas Boll 
Date:   Tue May 10 14:46:21 2016 +0200

Update debian/upstream/signing-key.asc

Add Kenneth Graunke's key 1D49CC38.

diff --git a/debian/changelog b/debian/changelog
index 8fe6653..5f90a87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.68-2) UNRELEASED; urgency=medium
+
+  * Update debian/upstream/signing-key.asc.
+
+ -- Andreas Boll   Tue, 10 May 2016 14:45:31 +0200
+
 libdrm (2.4.68-1) unstable; urgency=medium
 
   * New upstream release. (LP: #1577735)
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
index aaad3be..0feee56 100644
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@@ -267,3 +267,79 @@ 
PbhMPfeaGCH4dFPDkD6kmpbHtPKm/5JI/4YfurNAL4INW8EYJoZgpddB9QDwMWkv
 lPS0zfDC+hiRF5twRXRVzP3jYFe6+cyQ0FqMayLcdnov
 =lkAG
 -END PGP PUBLIC KEY BLOCK-
+-BEGIN PGP PUBLIC KEY BLOCK-
+
+mQINBFLdfBoBEACk5Aqcovsc+iPUvtltTE9tAz/f4uFghce2b9KIJ5z4tUCbgBQe
+nWJt0H/IWCTRfkFVrIoKFTOTgEZ/YMAGM6wQNMlkK+R1DJQK2FBTTR/cR9PY7hzT
+ZjRCPd5tpkZ5C9iikwtuMeaZuDNlBhKrByyCJYS00z6n63hcONdJ9cuE+fodAMc/
+nMBgQ5HF/rBVKmP7/KG31MYRbvbhHTvta+P6i5nVRMoZYFA6UJiDyqbcE0s2u2X8
+GFTw0afvQ52CsrGKlRGTbVFX4AFp7oxjJmpfDZhFtuM4iGGgG1rSrWmcMt6y0h+A
+3So/FbVzNM/0vtgGUR5sZf762/lKLdaMdF1n4VrsmFfLRFZ7fI9JlRmmiShDxyLZ
+jPNfj+a5SQNW+NYbQ9ZjTbfpmNOQnDZliuMpvY07qGHdC9kAzEKjRBOL/XRqHMaF
+mh/JNICPvPA1jIUByrmZoAxOZ5OTXvpahK8O9/YYT6qB74QOtK4pFFuEiKO/aKSJ
+WyYDP8bzgdl984cYE+kgymV7Mmh5zL+t1JeoToIEexG4dJlVLXJcdNFvKyzsvkuX
+Wg3gCUpyNW1MLvFng7rZL7g4glVI3+XKe3Ox36QZ+koMC6VohigTrtTOYc44SMGv
+RmOdI4sx2RlQGlnu76sLRlQJ/Ct5lZZcZSqr67CKhBrD6BBmdX193+grUwARAQAB
+tCVLZW5uZXRoIEdyYXVua2UgPGt3Z0BmcmVlZGVza3RvcC5vcmc+iQI5BBMBAgAj
+BQJS3YKOAhsDBwsJCAcDAgEGFQgCCQoLBBYCAwECHgECF4AACgkQW1vaBx1JzDjA
+SA//YoorF9TP+do7vzaNwoi/nLigxjbDAiVX0/XP71jM9QQdMPohvn346MqDwnzv
+l/UK9E0j/itXG8ARXVERHtCeXAx48FmVy6p0lXcHbJ2ysKTHSL/CdRodzXfNUwmv
+kU6YkcFHlm/RFHsxWigYLHWPJCquz5T4wOBLsCDa8CogLjvVJNoAJoicua9nT/fO
+CtZl9unvrz1wRT2oS1TPGfnDwd8egsIDBffxcqPz5S0sjmkiCH3hMX9CSTJE4bTA
+OchHDYnU9RATiYDUL2ylEnP5JMeLxmRFMWrJvr1nZ21w7GyVrIkTcKUGQwAywphw
+/xD2RVtUSxt8SICHdSAxzZvHuDYeZ+S6gIPAgvnkAeobASoWdJ3Mc4Ee4QkArRXZ
+/9wRcjneEIx0TWJa0p/79hNS5IWfTqyDVjI25S7dwbEeIJH7A8MK9m6Fp2FcDSLd
+XntQUH1Apdu6GYTKH1oh+4uGJ3GJb3z15Z/Y4V2Sm+ZJceRhMMDHAdxPAMJaX7Kk
+OGn8l3oSifEiywSlAU2Us4tdqsRCZmhNwdhSrSpzDVjdrFddbkVyoYTKQJZaqAt4
+xzYUCMS75WMz/Xg9LuOQaI+51GV+NAh1OMuSpyMQd7d6M+hecJxV7qumhaxteuH9
+JvdnoOcXnZEnuHOlx8g8ZVuXcbuwyef09RqXYRnCDvm50cG0J0tlbm5ldGggR3Jh
+dW5rZSA8a2VubmV0aEB3aGl0ZWNhcGUub3JnPokCOQQTAQIAIwUCUt18GgIbAwcL
+CQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEFtb2gcdScw44K4P+gLWw4r1ArMi
+6Q45yZiNOBBEhMzGPIoOg1eVw/+b/ZBHxDFmtcKZ7Y/59LC9lvJq4ncsxjAsqjF0
+MQHvGcoUTJuOTd0e00QoRwxlhmKU6TOToe+/g/WB4HMZSYs0sKL65xrfTz/2uhgo
+IihUesosNK0VQlaR0UTjQ4CF7qlbFyfcnnFWLA2ov27jORwYylBz+ohzFURaadMg
+JafwsoAGd1JkS92BCASQ+PHq657NSVRuZ99S8XCwnCUpENS7Qe0X72PVrhuwa/n4
+C/DKVpBdinbU9DmM2e2D1JdyhtVtt+lY2nCgANE+D3k2BHswe8SRWFenSwuLA2xd
+fJsVlMgOUU1jRLmy5a8Z1wyjVmiD34UH5lpf3rGBBXCDN5894gxij/pomFWU4XR+
+FUymff76RYOXvA89oPHDB3v9sHcLdI6OQv0+HSjhM+AeEuPKCteTWnCmTVE+7wkn
+lEVlinntW4hkDSMqKFktGqOhKIIHxMsGhO2+PPXo96FZmSZSkFEBhFHae//lmYzt
+xO+lXcek5HsHLWKphGDpPdHH/z0yNtN9J9pC0NFoiHKxBTSigpmKiooHfjiwanIP
+6tAiTtv8Nu3P2oO3sErLNlfqBfsMQO5EzSuCn2ifWFq1awCm/6TeYYi2ovz0BE6+
+G5ZNi1U8J9pITy2G2sJltIVsdKWisO7JtC1LZW5uZXRoIEdyYXVua2UgPGtlbm5l
+dGgudy5ncmF1bmtlQGludGVsLmNvbT6JAjkEEwECACMFAlLdgqICGwMHCwkIBwMC
+AQYVCAIJCgsEFgIDAQIeAQIXgAAKCRBbW9oHHUnMOLjBD/9puaiEo7s7qSzDUm2V
+2mV/IXQ4NY3ylHFq1KCYlcCpuKJOtkzL0ab1J+WQs1LbEMOE5csP4njaS73a4ppk

libdrm: Changes to 'debian-unstable'

[Timo Aaltonen]

 .gitignore|3 
 amdgpu/amdgpu.h   |4 
 configure.ac  |2 
 debian/changelog  |6 
 exynos/exynos_drm.c   |2 
 freedreno/freedreno_bo.c  |7 
 freedreno/freedreno_drmif.h   |1 
 freedreno/kgsl/kgsl_drm.h |2 
 freedreno/kgsl/kgsl_pipe.c|1 
 freedreno/kgsl/msm_kgsl.h |4 
 freedreno/msm/msm_drm.h   |1 
 freedreno/msm/msm_pipe.c  |2 
 include/drm/drm.h |   68 +--
 include/drm/drm_fourcc.h  |   17 
 include/drm/drm_mode.h|  170 +---
 include/drm/drm_sarea.h   |2 
 include/drm/i915_drm.h|   43 +-
 include/drm/tegra_drm.h   |3 
 include/drm/vmwgfx_drm.h  |  792 ++
 intel/intel_bufmgr_fake.c |2 
 intel/intel_bufmgr_gem.c  |2 
 intel/intel_chipset.h |   30 +
 intel/intel_decode.c  |2 
 intel/tests/gen5-3d.batch-ref.txt |2 
 intel/tests/gen6-3d.batch-ref.txt |2 
 libkms/Android.mk |2 
 tests/amdgpu/basic_tests.c|6 
 tests/amdgpu/vce_tests.c  |   20 
 tests/kms/kms-steal-crtc.c|1 
 tests/modetest/modetest.c |2 
 tests/proptest/proptest.c |2 
 tests/util/kms.c  |1 
 xf86drm.c |2 
 xf86drmMode.c |2 
 34 files changed, 925 insertions(+), 283 deletions(-)

New commits:
commit 09e9210bcf5c2c6940f5514fc978731ba2c4710f
Author: Timo Aaltonen 
Date:   Tue May 3 14:30:20 2016 +0300

upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 61fb15f..8fe6653 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libdrm (2.4.68-1) UNRELEASED; urgency=medium
+libdrm (2.4.68-1) unstable; urgency=medium
 
   * New upstream release. (LP: #1577735)
 
- -- Timo Aaltonen   Tue, 03 May 2016 14:27:40 +0300
+ -- Timo Aaltonen   Tue, 03 May 2016 14:30:06 +0300
 
 libdrm (2.4.67-1) unstable; urgency=medium
 

commit d62c51a0b49097330f7d5be516611abcfb59fe64
Author: Timo Aaltonen 
Date:   Tue May 3 14:30:04 2016 +0300

update changelog

diff --git a/debian/changelog b/debian/changelog
index ded83db..61fb15f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.68-1) UNRELEASED; urgency=medium
+
+  * New upstream release. (LP: #1577735)
+
+ -- Timo Aaltonen   Tue, 03 May 2016 14:27:40 +0300
+
 libdrm (2.4.67-1) unstable; urgency=medium
 
   * New upstream release.

commit fc09c5ab84240e9b6bd0bed01685ef004f56c4fa
Author: Kenneth Graunke 
Date:   Wed Apr 27 17:52:50 2016 -0700

Bump version for release

Signed-off-by: Kenneth Graunke 

diff --git a/configure.ac b/configure.ac
index ed07789..a04ce87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 
 AC_PREREQ([2.63])
 AC_INIT([libdrm],
-[2.4.67],
+[2.4.68],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
 [libdrm])
 

commit e3623d34cad0ac3f181b0deee0931df202b8f909
Author: Michał Winiarski 
Date:   Wed Feb 17 11:40:19 2016 +0100

intel/skl: Add missing SKL PCI IDs

Used by production devices:
Intel(R) HD Graphics 510
Intel(R) HD Graphics 535
Intel(R) Iris(TM) Graphics 550
Intel(R) Iris(TM) Graphics P555

Signed-off-by: Michał Winiarski 
Tested-by: Lionel Landwerlin 
Reviewed-by: Kenneth Graunke 

diff --git a/intel/intel_chipset.h b/intel/intel_chipset.h
index 8e42a40..e2554c3 100644
--- a/intel/intel_chipset.h
+++ b/intel/intel_chipset.h
@@ -168,6 +168,7 @@
 #define PCI_CHIP_SKYLAKE_DT_GT10x1902
 #define PCI_CHIP_SKYLAKE_ULT_GT1   0x1906
 #define PCI_CHIP_SKYLAKE_SRV_GT1   0x190A /* Reserved */
+#define PCI_CHIP_SKYLAKE_H_GT1 0x190B
 #define PCI_CHIP_SKYLAKE_ULX_GT1   0x190E /* Reserved */
 #define PCI_CHIP_SKYLAKE_DT_GT20x1912
 #define PCI_CHIP_SKYLAKE_FUSED0_GT20x1913 /* Reserved */
@@ -179,9 +180,12 @@
 #define PCI_CHIP_SKYLAKE_WKS_GT2   0x191D
 #define PCI_CHIP_SKYLAKE_ULX_GT2   0x191E
 #define PCI_CHIP_SKYLAKE_MOBILE_GT20x1921 /* Reserved */
-#define PCI_CHIP_SKYLAKE_GT3   0x1926
-#define PCI_CHIP_SKYLAKE_HALO_GT3  0x192B /* Reserved */
+#define PCI_CHIP_SKYLAKE_ULT_GT3_0 0x1923
+#define PCI_CHIP_SKYLAKE_ULT_GT3_1 0x1926
+#define PCI_CHIP_SKYLAKE_ULT_GT3_2 0x1927
 #define PCI_CHIP_SKYLAKE_SRV_GT4   0x192A
+#define PCI_CHIP_SKYLAKE_HALO_GT3  0x192B /* Reserved */
+#define PCI_CHIP_SKYLAKE_SRV_GT3   0x192D
 #define PCI_CHIP_SKYLAKE_DT_GT4 

libdrm: Changes to 'debian-unstable'

[Timo Aaltonen]

 debian/changelog  |5 +++--
 debian/libdrm-amdgpu1.symbols |4 
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 336c30b6c19f67e1c3c40e3360e72f0f5c76c09f
Author: Timo Aaltonen 
Date:   Tue Feb 16 12:14:29 2016 +0200

release to unstable

diff --git a/debian/changelog b/debian/changelog
index 486e7ac..ded83db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdrm (2.4.67-1) UNRELEASED; urgency=medium
+libdrm (2.4.67-1) unstable; urgency=medium
 
   * New upstream release.
   * patches: Refreshed.
   * libdrm-amdgpu1.symbols: Updated.
 
- -- Timo Aaltonen   Tue, 16 Feb 2016 10:05:33 +0200
+ -- Timo Aaltonen   Tue, 16 Feb 2016 12:14:16 +0200
 
 libdrm (2.4.66-2) unstable; urgency=medium
 

commit eb52c127c9426a7eaa246b85cc0cf073760655df
Author: Timo Aaltonen 
Date:   Tue Feb 16 12:14:10 2016 +0200

libdrm-amdgpu1.symbols: Updated.

diff --git a/debian/changelog b/debian/changelog
index a5e4427..486e7ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libdrm (2.4.67-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * patches: Refreshed.
+  * libdrm-amdgpu1.symbols: Updated.
 
  -- Timo Aaltonen   Tue, 16 Feb 2016 10:05:33 +0200
 
diff --git a/debian/libdrm-amdgpu1.symbols b/debian/libdrm-amdgpu1.symbols
index 7ab54db..a1014f4 100644
--- a/debian/libdrm-amdgpu1.symbols
+++ b/debian/libdrm-amdgpu1.symbols
@@ -13,11 +13,15 @@ libdrm_amdgpu.so.1 libdrm-amdgpu1 #MINVER#
  amdgpu_bo_va_op@Base 2.4.63
  amdgpu_bo_wait_for_idle@Base 2.4.63
  amdgpu_create_bo_from_user_mem@Base 2.4.63
+ amdgpu_cs_create_semaphore@Base 2.4.67
  amdgpu_cs_ctx_create@Base 2.4.63
  amdgpu_cs_ctx_free@Base 2.4.63
+ amdgpu_cs_destroy_semaphore@Base 2.4.67
  amdgpu_cs_query_fence_status@Base 2.4.63
  amdgpu_cs_query_reset_state@Base 2.4.63
+ amdgpu_cs_signal_semaphore@Base 2.4.67
  amdgpu_cs_submit@Base 2.4.63
+ amdgpu_cs_wait_semaphore@Base 2.4.67
  amdgpu_device_deinitialize@Base 2.4.63
  amdgpu_device_initialize@Base 2.4.63
  amdgpu_query_buffer_size_alignment@Base 2.4.63

libdrm: Changes to 'debian-unstable'

[Timo Aaltonen]

 Android.mk   |   19 +
 Makefile.am  |6 
 Makefile.sources |1 
 amdgpu/amdgpu-symbol-check   |4 
 amdgpu/amdgpu.h  |   65 +
 amdgpu/amdgpu_bo.c   |   14 -
 amdgpu/amdgpu_cs.c   |  181 ++-
 amdgpu/amdgpu_internal.h |   16 +
 amdgpu/libdrm_amdgpu.pc.in   |1 
 configure.ac |   62 +++--
 debian/changelog |7 
 debian/patches/01_default_perms.diff |   10 
 freedreno/freedreno_drmif.h  |1 
 freedreno/kgsl/kgsl_pipe.c   |3 
 freedreno/msm/msm_drm.h  |1 
 freedreno/msm/msm_pipe.c |   45 ++-
 include/drm/vc4_drm.h|  279 +++
 intel/intel_chipset.h|   57 
 intel/intel_decode.c |2 
 libkms/libkms.pc.in  |1 
 radeon/libdrm_radeon.pc.in   |1 
 radeon/radeon_bo_gem.c   |2 
 tests/amdgpu/basic_tests.c   |  417 +++
 tests/kms/kms-steal-crtc.c   |3 
 tests/kms/kms-universal-planes.c |3 
 tests/kmstest/Makefile.am|6 
 tests/kmstest/main.c |   45 ++-
 tests/modetest/modetest.c|7 
 tests/proptest/proptest.c|2 
 tests/util/kms.c |2 
 tests/vbltest/vbltest.c  |7 
 vc4/Makefile.am  |   34 ++
 vc4/Makefile.sources |3 
 vc4/libdrm_vc4.pc.in |9 
 vc4/vc4_packet.h |  397 +
 vc4/vc4_qpu_defines.h|  274 ++
 xf86drm.c|3 
 xf86drmMode.c|   11 
 38 files changed, 1871 insertions(+), 130 deletions(-)

New commits:
commit d9c9309ebaac42de2dcdba23d0da558c03c73429
Author: Timo Aaltonen 
Date:   Tue Feb 16 10:20:17 2016 +0200

refresh patch, update changelog

diff --git a/debian/changelog b/debian/changelog
index d523a04..a5e4427 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdrm (2.4.67-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * patches: Refreshed.
+
+ -- Timo Aaltonen   Tue, 16 Feb 2016 10:05:33 +0200
+
 libdrm (2.4.66-2) unstable; urgency=medium
 
   * Update libdrm-exynos1.symbols and shlibs.
diff --git a/debian/patches/01_default_perms.diff 
b/debian/patches/01_default_perms.diff
index 8315ba9..cea04a4 100644
--- a/debian/patches/01_default_perms.diff
+++ b/debian/patches/01_default_perms.diff
@@ -1,7 +1,5 @@
-Index: libdrm/xf86drm.h
-===
 libdrm.orig/xf86drm.h
-+++ libdrm/xf86drm.h
+--- a/xf86drm.h
 b/xf86drm.h
 @@ -74,7 +74,7 @@ extern "C" {
  /* Default /dev/dri directory permissions 0755 */
  #define DRM_DEV_DIRMODE   \
@@ -9,5 +7,5 @@ Index: libdrm/xf86drm.h
 -#define DRM_DEV_MODE   (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP)
 +#define DRM_DEV_MODE   (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
  
- #define DRM_DIR_NAME  "/dev/dri"
- #define DRM_DEV_NAME  "%s/card%d"
+ #ifdef __OpenBSD__
+ #define DRM_DIR_NAME  "/dev"

commit d49efb55846c6ec96400061213b76ab867461c1a
Author: Rob Clark 
Date:   Mon Feb 15 13:42:51 2016 -0500

Bump version for release

Signed-off-by: Rob Clark 

diff --git a/configure.ac b/configure.ac
index 4eeebfb..ed07789 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 
 AC_PREREQ([2.63])
 AC_INIT([libdrm],
-[2.4.66],
+[2.4.67],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
 [libdrm])
 

commit 9b77443f6344791851a6c2067e4081b7f43618ea
Author: Rob Clark 
Date:   Wed Feb 10 12:27:33 2016 -0500

freedreno: add support for FD_MAX_FREQ

Only msm backend supports this.  Sorry, if you are using kgsl, no
time-elapsed query for you.

Signed-off-by: Rob Clark 

diff --git a/freedreno/freedreno_drmif.h b/freedreno/freedreno_drmif.h
index 5547e94..950fd63 100644
--- a/freedreno/freedreno_drmif.h
+++ b/freedreno/freedreno_drmif.h
@@ -50,6 +50,7 @@ enum fd_param_id {
FD_GMEM_SIZE,
FD_GPU_ID,
FD_CHIP_ID,
+   FD_MAX_FREQ,
 };
 
 /* bo flags: */
diff --git a/freedreno/kgsl/kgsl_pipe.c b/freedreno/kgsl/kgsl_pipe.c
index 58b3b4d..5569da0 100644
--- a/freedreno/kgsl/kgsl_pipe.c
+++ b/freedreno/kgsl/kgsl_pipe.c
@@ -50,6 +50,9 @@ static int kgsl_pipe_get_param(struct fd_pipe *pipe,
case FD_CHIP_ID:
*value = kgsl_pipe->devinfo.chip_id;
return 0;
+   case FD_MAX_FREQ:
+   /* unsupported on kgsl */
+   return -1;

libdrm: Changes to 'debian-unstable'

[Andreas Boll]

 .gitignore  |3 
 CleanSpec.mk|1 
 Makefile.am |3 
 amdgpu/amdgpu_bo.c  |   11 
 amdgpu/amdgpu_cs.c  |   14 
 amdgpu/amdgpu_vamgr.c   |8 
 configure.ac|8 
 debian/changelog|   11 
 debian/control  |3 
 debian/libdrm-intel1.symbols|2 
 debian/libdrm-nouveau2.symbols  |8 
 debian/libdrm2.symbols  |2 
 debian/rules|6 
 exynos/exynos-symbol-check  |3 
 exynos/exynos_drm.c |   76 ++
 exynos/exynos_drm.h |   12 
 exynos/exynos_drmif.h   |   26 
 exynos/exynos_fimg2d.c  |  548 +++-
 exynos/exynos_fimg2d.h  |   18 
 exynos/libdrm_exynos.pc.in  |2 
 freedreno/freedreno_bo.c|   26 
 freedreno/freedreno_priv.h  |1 
 freedreno/kgsl/kgsl_bo.c|1 
 freedreno/msm/msm_bo.c  |1 
 freedreno/msm/msm_ringbuffer.c  |4 
 include/drm/drm_fourcc.h|2 
 include/drm/i915_drm.h  |   59 +-
 include/drm/nouveau_drm.h   |1 
 include/drm/virtgpu_drm.h   |  167 ++
 intel/intel-symbol-check|2 
 intel/intel_bufmgr.c|   20 
 intel/intel_bufmgr.h|2 
 intel/intel_bufmgr_fake.c   |1 
 intel/intel_bufmgr_gem.c|  250 -
 intel/intel_bufmgr_priv.h   |   21 
 intel/intel_chipset.h   |   58 +-
 nouveau/Makefile.am |   11 
 nouveau/abi16.c |  162 +-
 nouveau/libdrm_nouveau.pc.in|2 
 nouveau/nouveau-symbol-check|8 
 nouveau/nouveau.c   |  574 +++--
 nouveau/nouveau.h   |  210 ---
 nouveau/nvif/cl0080.h   |   45 +
 nouveau/nvif/cl9097.h   |   44 +
 nouveau/nvif/class.h|  141 +
 nouveau/nvif/if0002.h   |   38 +
 nouveau/nvif/if0003.h   |   33 +
 nouveau/nvif/ioctl.h|  132 
 nouveau/nvif/unpack.h   |   28 +
 nouveau/private.h   |8 
 nouveau/pushbuf.c   |7 
 radeon/radeon_surface.c |   17 
 tests/Makefile.am   |3 
 tests/drmdevice.c   |  112 
 tests/exynos/Makefile.am|   26 
 tests/exynos/exynos_fimg2d_event.c  |  326 
 tests/exynos/exynos_fimg2d_perf.c   |  327 
 tests/exynos/exynos_fimg2d_test.c   |  134 -
 tests/kms/Makefile.am   |   36 +
 tests/kms/kms-steal-crtc.c  |  161 ++
 tests/kms/kms-universal-planes.c|  358 +
 tests/kms/libkms-test-crtc.c|   47 +
 tests/kms/libkms-test-device.c  |  218 
 tests/kms/libkms-test-framebuffer.c |  157 +
 tests/kms/libkms-test-plane.c   |  139 +
 tests/kms/libkms-test-screen.c  |   92 +++
 tests/kms/libkms-test.h |  120 
 tests/modeprint/Makefile.am |1 
 tests/modeprint/modeprint.c |2 
 tests/modetest/Android.mk   |1 
 tests/modetest/Makefile.am  |8 
 tests/modetest/buffers.c|  961 
 tests/modetest/buffers.h|   12 
 tests/modetest/cursor.c |4 
 tests/modetest/modetest.c   |  120 
 tests/proptest/Android.mk   |   13 
 tests/proptest/Makefile.am  |   10 
 tests/proptest/Makefile.sources |2 
 tests/proptest/proptest.c   |  104 +--
 tests/util/Android.mk   |   39 +
 tests/util/Makefile.am  |   13 
 tests/util/Makefile.sources |8 
 tests/util/common.h |   33 +
 tests/util/format.c |  120 
 tests/util/format.h |   65 ++
 tests/util/kms.c|  177 ++
 tests/util/kms.h|   35 +
 tests/util/pattern.c|  870 
 tests/util/pattern.h|   39 +
 tests/vbltest/Makefile.am   |4 
 tests/vbltest/vbltest.c |   55 --
 util_math.h |1 
 xf86atomic.h|2 
 xf86drm.c   |  508 +++
 xf86drm.h   |3 
 xf86drmMode.c   |   17 
 96 files changed, 6396 insertions(+), 1928 deletions(-)

New commits:
commit 7ef55d6fa30e3f3feff963e4fbcbf35ed37fd4c6
Author: Andreas Boll 
Date:   Fri Jan 15 10:41:25 2016 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 5e7a9b4..80c3075 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.66-1) 

libdrm: Changes to 'debian-unstable'

[Andreas Boll]

 debian/changelog  |6 ++
 debian/libdrm-exynos1.symbols |3 +++
 debian/rules  |2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit fe4b09241b7ca6497487cef2e501aa232749d7e3
Author: Andreas Boll 
Date:   Fri Jan 15 12:08:18 2016 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 70bae1f..d523a04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libdrm (2.4.66-2) UNRELEASED; urgency=medium
+libdrm (2.4.66-2) unstable; urgency=medium
 
   * Update libdrm-exynos1.symbols and shlibs.
 
- -- Andreas Boll   Fri, 15 Jan 2016 12:05:41 +0100
+ -- Andreas Boll   Fri, 15 Jan 2016 12:08:05 +0100
 
 libdrm (2.4.66-1) unstable; urgency=medium
 

commit 2916fb5b7aece95cc17d9c33bb7b7821f18d3427
Author: Andreas Boll 
Date:   Fri Jan 15 12:05:46 2016 +0100

Update libdrm-exynos1.symbols and shlibs.

diff --git a/debian/changelog b/debian/changelog
index 80c3075..70bae1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.66-2) UNRELEASED; urgency=medium
+
+  * Update libdrm-exynos1.symbols and shlibs.
+
+ -- Andreas Boll   Fri, 15 Jan 2016 12:05:41 +0100
+
 libdrm (2.4.66-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/libdrm-exynos1.symbols b/debian/libdrm-exynos1.symbols
index 46b445b..8d78b07 100644
--- a/debian/libdrm-exynos1.symbols
+++ b/debian/libdrm-exynos1.symbols
@@ -8,14 +8,17 @@ libdrm_exynos.so.1 libdrm-exynos1 #MINVER#
  exynos_bo_map@Base 0
  exynos_device_create@Base 0
  exynos_device_destroy@Base 0
+ exynos_handle_event@Base 2.4.66
  exynos_prime_fd_to_handle@Base 0
  exynos_prime_handle_to_fd@Base 0
  exynos_vidi_connection@Base 0
  g2d_blend@Base 0
+ g2d_config_event@Base 2.4.66
  g2d_copy@Base 0
  g2d_copy_with_scale@Base 0
  g2d_exec@Base 0
  g2d_fini@Base 0
  g2d_init@Base 0
+ g2d_move@Base 2.4.66
  g2d_scale_and_blend@Base 2.4.60
  g2d_solid_fill@Base 0
diff --git a/debian/rules b/debian/rules
index e10c5fd..2dd69bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -115,7 +115,7 @@ endif
dh_makeshlibs -plibdrm-amdgpu1 -V'libdrm-amdgpu1 (>= 2.4.63)' -- -c4
 ifeq ($(ARM), yes)
dh_makeshlibs -plibdrm-omap1 -V'libdrm-omap1 (>= 2.4.38)' -- -c4
-   dh_makeshlibs -plibdrm-exynos1 -V'libdrm-exynos1 (>= 2.4.60)' -- -c4
+   dh_makeshlibs -plibdrm-exynos1 -V'libdrm-exynos1 (>= 2.4.66)' -- -c4
dh_makeshlibs -plibdrm-tegra0 -V'libdrm-tegra0' -- -c4
 endif
 ifeq ($(FREEDRENO), yes)

libdrm: Changes to 'debian-unstable'

[Timo Aaltonen]

 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 6cafc359ad8df4c809d4a4761ea036bcc2300b49
Author: Timo Aaltonen 
Date:   Mon Oct 26 10:29:19 2015 +0200

release to unstable

diff --git a/debian/changelog b/debian/changelog
index eea3177..9246650 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-libdrm (2.4.65-1) UNRELEASED; urgency=medium
+libdrm (2.4.65-1) unstable; urgency=medium
 
+  [ Andreas Boll ]
   * New upstream release.
   * Update debian/upstream/signing-key.asc.
   * Update symbols file and bump shlibs for libdrm2.
@@ -7,7 +8,7 @@ libdrm (2.4.65-1) UNRELEASED; urgency=medium
   * Fix Vcs-* fields.
   * Add upstream url.
 
- -- Andreas Boll   Mon, 31 Aug 2015 17:41:21 +0200
+ -- Timo Aaltonen   Mon, 26 Oct 2015 10:22:57 +0200
 
 libdrm (2.4.64-1) unstable; urgency=medium
 

libdrm: Changes to 'debian-unstable'

[Timo Aaltonen]

 debian/changelog |8 ++--
 debian/control   |6 +++---
 debian/rules |   22 +-
 3 files changed, 26 insertions(+), 10 deletions(-)

New commits:
commit 5308e42d1999ca890a0759785320c6b1672391e7
Author: Timo Aaltonen 
Date:   Mon Oct 26 21:51:31 2015 +0200

release to unstable

diff --git a/debian/changelog b/debian/changelog
index 5f1ffa1..91e445e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.65-2) UNRELEASED; urgency=medium
+libdrm (2.4.65-2) unstable; urgency=medium
 
   [ Andreas Boll ]
   * Update libdrm-freedreno1.symbols and shlibs.
@@ -7,7 +7,7 @@ libdrm (2.4.65-2) UNRELEASED; urgency=medium
   [ Fathi Boudra ]
   * Enable freedreno build on arm64 architecture.
 
- -- Andreas Boll   Mon, 26 Oct 2015 12:41:34 +0100
+ -- Timo Aaltonen   Mon, 26 Oct 2015 21:40:43 +0200
 
 libdrm (2.4.65-1) unstable; urgency=medium
 

commit b5b6e5c7b0887f6dd57d29d7e01b8525b7f0477a
Author: Timo Aaltonen 
Date:   Mon Oct 26 21:40:37 2015 +0200

Enable freedreno build on arm64 architecture.

diff --git a/debian/changelog b/debian/changelog
index fe11ef7..5f1ffa1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 libdrm (2.4.65-2) UNRELEASED; urgency=medium
 
+  [ Andreas Boll ]
   * Update libdrm-freedreno1.symbols and shlibs.
   * Drop Debian revision from new symbols in libdrm2.symbols.
 
+  [ Fathi Boudra ]
+  * Enable freedreno build on arm64 architecture.
+
  -- Andreas Boll   Mon, 26 Oct 2015 12:41:34 +0100
 
 libdrm (2.4.65-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 0d580f4..7ceca71 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Depends:
  libdrm-nouveau2 (= ${binary:Version}) [linux-any],
  libdrm-amdgpu1 (= ${binary:Version}),
  libdrm-omap1 (= ${binary:Version}) [any-arm],
- libdrm-freedreno1 (= ${binary:Version}) [any-arm],
+ libdrm-freedreno1 (= ${binary:Version}) [any-arm arm64],
  libdrm-exynos1 (= ${binary:Version}) [any-arm],
  libdrm-tegra0 (= ${binary:Version}) [any-arm],
  ${misc:Depends},
@@ -213,7 +213,7 @@ Description: Userspace interface to omap-specific kernel 
DRM services -- debuggi
  This package provides the debugging symbols for the libdrm-omap1 package.
 
 Package: libdrm-freedreno1
-Architecture: any-arm
+Architecture: any-arm arm64
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
@@ -229,7 +229,7 @@ Description: Userspace interface to msm/kgsl kernel DRM 
services -- runtime
 Package: libdrm-freedreno1-dbg
 Section: debug
 Priority: extra
-Architecture: any-arm
+Architecture: any-arm arm64
 Depends:
  libdrm-freedreno1 (= ${binary:Version}),
  ${misc:Depends},
diff --git a/debian/rules b/debian/rules
index 708bfb8..df9fe67 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,22 +42,30 @@ else
confflags += --disable-intel
 endif
 
-# Omap and freedreno are only on arm
+# Exynos/Omap/Tegra are only on arm
 ifneq (,$(filter arm,$(DEB_HOST_ARCH_CPU)))
ARM = yes
 endif
 ifeq ($(ARM), yes)
-   confflags += --enable-freedreno --enable-freedreno-kgsl
confflags += --enable-exynos-experimental-api
confflags += --enable-omap-experimental-api
confflags += --enable-tegra-experimental-api
 else
-   confflags += --disable-freedreno
confflags += --disable-exynos-experimental-api
confflags += --disable-omap-experimental-api
confflags += --disable-tegra-experimental-api
 endif
 
+# Freedreno is on arm and arm64
+ifneq (,$(filter arm arm64,$(DEB_HOST_ARCH_CPU)))
+   FREEDRENO = yes
+endif
+ifeq ($(FREEDRENO), yes)
+   confflags += --enable-freedreno --enable-freedreno-kgsl
+else
+   confflags += --disable-freedreno
+endif
+
 ###
 ### Actual build
 ###
@@ -87,10 +95,12 @@ endif
dh_strip -plibdrm-amdgpu1 --dbg-package=libdrm-amdgpu1-dbg
 ifeq ($(ARM), yes)
dh_strip -plibdrm-omap1 --dbg-package=libdrm-omap1-dbg
-   dh_strip -plibdrm-freedreno1 --dbg-package=libdrm-freedreno1-dbg
dh_strip -plibdrm-exynos1 --dbg-package=libdrm-exynos1-dbg
dh_strip -plibdrm-tegra0 --dbg-package=libdrm-tegra0-dbg
 endif
+ifeq ($(FREEDRENO), yes)
+   dh_strip -plibdrm-freedreno1 --dbg-package=libdrm-freedreno1-dbg
+endif
dh_strip -s --remaining-packages
 
 override_dh_makeshlibs:
@@ -105,10 +115,12 @@ endif
dh_makeshlibs -plibdrm-amdgpu1 -V'libdrm-amdgpu1 (>= 2.4.63)' -- -c4
 ifeq ($(ARM), yes)
dh_makeshlibs -plibdrm-omap1 -V'libdrm-omap1 (>= 2.4.38)' -- -c4
-   dh_makeshlibs -plibdrm-freedreno1 -V'libdrm-freedreno1 (>= 2.4.65)' -- 
-c4
dh_makeshlibs -plibdrm-exynos1 -V'libdrm-exynos1 (>= 2.4.60)' -- -c4
dh_makeshlibs -plibdrm-tegra0 -V'libdrm-tegra0' -- -c4
 endif
+ifeq ($(FREEDRENO), yes)
+   dh_makeshlibs -plibdrm-freedreno1 -V'libdrm-freedreno1 (>= 2.4.57)' -- 
-c4
+endif
 
 %:
dh $@ 

libdrm: Changes to 'debian-unstable'

[Andreas Boll]

 debian/changelog |7 +++
 debian/libdrm-freedreno1.symbols |1 +
 debian/libdrm2.symbols   |4 ++--
 debian/rules |2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 655a5b2d6f9d04e99328dd0cb6cc1c657414fb50
Author: Andreas Boll 
Date:   Mon Oct 26 12:45:32 2015 +0100

Drop Debian revision from new symbols in libdrm2.symbols.

diff --git a/debian/changelog b/debian/changelog
index fe0ec19..fe11ef7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libdrm (2.4.65-2) UNRELEASED; urgency=medium
 
   * Update libdrm-freedreno1.symbols and shlibs.
+  * Drop Debian revision from new symbols in libdrm2.symbols.
 
  -- Andreas Boll   Mon, 26 Oct 2015 12:41:34 +0100
 
diff --git a/debian/libdrm2.symbols b/debian/libdrm2.symbols
index 2d86bd4..b98200c 100644
--- a/debian/libdrm2.symbols
+++ b/debian/libdrm2.symbols
@@ -42,7 +42,7 @@ libdrm.so.2 libdrm2 #MINVER#
  drmFree@Base 2.3.1
  drmFreeBufs@Base 2.3.1
  drmFreeBusid@Base 2.3.1
- drmFreeDevices@Base 2.4.65-1
+ drmFreeDevices@Base 2.4.65
  drmFreeReservedContextList@Base 2.3.1
  drmFreeVersion@Base 2.3.1
  drmGetBufInfo@Base 2.3.1
@@ -53,7 +53,7 @@ libdrm.so.2 libdrm2 #MINVER#
  drmGetContextPrivateMapping@Base 2.3.1
  drmGetContextTag@Base 2.3.1
  drmGetDeviceNameFromFd@Base 2.4.16
- drmGetDevices@Base 2.4.65-1
+ drmGetDevices@Base 2.4.65
  drmGetEntry@Base 2.3.1
  drmGetHashTable@Base 2.3.1
  drmGetInterruptFromBusID@Base 2.3.1

commit 5f57d05b2cee163cd7a229d6107033bb74c3b82f
Author: Andreas Boll 
Date:   Mon Oct 26 12:41:41 2015 +0100

Update libdrm-freedreno1.symbols and shlibs.

diff --git a/debian/changelog b/debian/changelog
index 9246650..fe0ec19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.65-2) UNRELEASED; urgency=medium
+
+  * Update libdrm-freedreno1.symbols and shlibs.
+
+ -- Andreas Boll   Mon, 26 Oct 2015 12:41:34 +0100
+
 libdrm (2.4.65-1) unstable; urgency=medium
 
   [ Andreas Boll ]
diff --git a/debian/libdrm-freedreno1.symbols b/debian/libdrm-freedreno1.symbols
index efb91a9..5a4f465 100644
--- a/debian/libdrm-freedreno1.symbols
+++ b/debian/libdrm-freedreno1.symbols
@@ -14,6 +14,7 @@ libdrm_freedreno.so.1 libdrm-freedreno1 #MINVER#
  fd_bo_ref@Base 0
  fd_bo_size@Base 0
  fd_device_del@Base 0
+ fd_device_fd@Base 2.4.65
  fd_device_new@Base 0
  fd_device_new_dup@Base 0
  fd_device_ref@Base 0
diff --git a/debian/rules b/debian/rules
index bd93023..708bfb8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -105,7 +105,7 @@ endif
dh_makeshlibs -plibdrm-amdgpu1 -V'libdrm-amdgpu1 (>= 2.4.63)' -- -c4
 ifeq ($(ARM), yes)
dh_makeshlibs -plibdrm-omap1 -V'libdrm-omap1 (>= 2.4.38)' -- -c4
-   dh_makeshlibs -plibdrm-freedreno1 -V'libdrm-freedreno1 (>= 2.4.64)' -- 
-c4
+   dh_makeshlibs -plibdrm-freedreno1 -V'libdrm-freedreno1 (>= 2.4.65)' -- 
-c4
dh_makeshlibs -plibdrm-exynos1 -V'libdrm-exynos1 (>= 2.4.60)' -- -c4
dh_makeshlibs -plibdrm-tegra0 -V'libdrm-tegra0' -- -c4
 endif

libdrm: Changes to 'debian-unstable'

[Andreas Boll]

 Makefile.am  |2 
 amdgpu/Android.mk|   18 +
 amdgpu/Makefile.am   |   20 --
 amdgpu/Makefile.sources  |   14 +
 amdgpu/amdgpu_bo.c   |   11 -
 amdgpu/amdgpu_cs.c   |   13 -
 amdgpu/amdgpu_device.c   |2 
 amdgpu/amdgpu_internal.h |3 
 configure.ac |6 
 debian/changelog |5 
 debian/libdrm2.symbols   |2 
 debian/rules |2 
 debian/upstream/signing-key.asc  |   76 
 freedreno/freedreno-symbol-check |1 
 freedreno/freedreno_bo.c |   38 ++--
 freedreno/freedreno_device.c |5 
 freedreno/freedreno_drmif.h  |1 
 freedreno/freedreno_priv.h   |6 
 freedreno/freedreno_ringbuffer.h |2 
 freedreno/kgsl/kgsl_bo.c |2 
 freedreno/kgsl/kgsl_device.c |2 
 freedreno/kgsl/kgsl_pipe.c   |2 
 freedreno/kgsl/kgsl_ringbuffer.c |2 
 freedreno/msm/msm_bo.c   |2 
 freedreno/msm/msm_device.c   |2 
 freedreno/msm/msm_pipe.c |2 
 freedreno/msm/msm_ringbuffer.c   |2 
 include/drm/drm.h|1 
 include/drm/drm_fourcc.h |   93 +
 include/drm/drm_mode.h   |   11 +
 intel/intel_bufmgr_fake.c|2 
 intel/intel_bufmgr_gem.c |   31 +--
 intel/intel_decode.c |   10 -
 libkms/linux.c   |2 
 nouveau/abi16.c  |   13 +
 nouveau/nouveau.c|6 
 omap/omap_drm.c  |1 
 radeon/radeon_bo_gem.c   |   23 +-
 radeon/radeon_bo_int.h   |2 
 radeon/radeon_cs_gem.c   |   20 +-
 radeon/radeon_cs_int.h   |2 
 tests/Makefile.am|2 
 tests/amdgpu/amdgpu_test.c   |   32 ++-
 tests/amdgpu/basic_tests.c   |3 
 tests/amdgpu/cs_tests.c  |4 
 tests/amdgpu/uvd_messages.h  |   10 -
 tests/amdgpu/vce_ib.h|   24 +-
 tests/modetest/cursor.c  |   10 -
 tests/modetest/modetest.c|7 
 tests/vbltest/vbltest.c  |1 
 xf86drm.c|  368 ++-
 xf86drm.h|   34 +++
 xf86drmMode.c|4 
 53 files changed, 797 insertions(+), 162 deletions(-)

New commits:
commit b874d9877871d075425450cb9be219f940f476ea
Author: Andreas Boll 
Date:   Thu Oct 8 12:11:23 2015 +0200

Update symbols file and bump shlibs for libdrm2.

diff --git a/debian/changelog b/debian/changelog
index 238b625..eea3177 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libdrm (2.4.65-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Update debian/upstream/signing-key.asc.
+  * Update symbols file and bump shlibs for libdrm2.
   * Enable libdrm-amdgpu1 on kfreebsd-*.
   * Fix Vcs-* fields.
   * Add upstream url.
diff --git a/debian/libdrm2.symbols b/debian/libdrm2.symbols
index 8c65b19..2d86bd4 100644
--- a/debian/libdrm2.symbols
+++ b/debian/libdrm2.symbols
@@ -42,6 +42,7 @@ libdrm.so.2 libdrm2 #MINVER#
  drmFree@Base 2.3.1
  drmFreeBufs@Base 2.3.1
  drmFreeBusid@Base 2.3.1
+ drmFreeDevices@Base 2.4.65-1
  drmFreeReservedContextList@Base 2.3.1
  drmFreeVersion@Base 2.3.1
  drmGetBufInfo@Base 2.3.1
@@ -52,6 +53,7 @@ libdrm.so.2 libdrm2 #MINVER#
  drmGetContextPrivateMapping@Base 2.3.1
  drmGetContextTag@Base 2.3.1
  drmGetDeviceNameFromFd@Base 2.4.16
+ drmGetDevices@Base 2.4.65-1
  drmGetEntry@Base 2.3.1
  drmGetHashTable@Base 2.3.1
  drmGetInterruptFromBusID@Base 2.3.1
diff --git a/debian/rules b/debian/rules
index a00c59e..bd93023 100755
--- a/debian/rules
+++ b/debian/rules
@@ -94,7 +94,7 @@ endif
dh_strip -s --remaining-packages
 
 override_dh_makeshlibs:
-   dh_makeshlibs -plibdrm2 -V'libdrm2 (>= 2.4.62)' --add-udeb=libdrm2-udeb 
-- -c4
+   dh_makeshlibs -plibdrm2 -V'libdrm2 (>= 2.4.65)' --add-udeb=libdrm2-udeb 
-- -c4
 ifeq ($(INTEL), yes)
dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (>= 2.4.60)' -- -c4
 endif

commit dbde17499edfaa528c0dd02b9ef0d3cc96ca19e1
Author: Andreas Boll 
Date:   Thu Oct 8 11:57:21 2015 +0200

Update debian/upstream/signing-key.asc.

diff --git a/debian/changelog b/debian/changelog
index 2293f1b..238b625 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libdrm (2.4.65-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Update debian/upstream/signing-key.asc.
   * Enable libdrm-amdgpu1 on kfreebsd-*.
   * Fix Vcs-* fields.
   * Add upstream url.
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
index a99bceb..aaad3be 100644
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@@ -191,3 +191,79 @@ 
kLK/gqBFGHh/TO5DEl6X/TP380DYdazZpa31S+Ixwt+RkP9ZkvOWGMIG7Nf+G+r+
 Omj3BC4KcQ==
 =XQbm
 -END PGP PUBLIC KEY BLOCK-
+-BEGIN 

libdrm: Changes to 'debian-unstable'

[Andreas Boll]

 debian/changelog |2 ++
 debian/control   |5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 4796cd63bd8f56c1ce045b26d6c2f40f9bbf7f63
Author: Andreas Boll 
Date:   Wed Sep 2 12:08:22 2015 +0200

Add upstream url.

diff --git a/debian/changelog b/debian/changelog
index c2202e3..c535b80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libdrm (2.4.64-2) UNRELEASED; urgency=medium
 
   * Enable libdrm-amdgpu1 on kfreebsd-*.
   * Fix Vcs-* fields.
+  * Add upstream url.
 
  -- Andreas Boll   Mon, 31 Aug 2015 17:41:21 +0200
 
diff --git a/debian/control b/debian/control
index cc47a12..101a38d 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Standards-Version: 3.9.6
 Section: libs
 Vcs-Git: git://anonscm.debian.org/pkg-xorg/lib/libdrm.git
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-xorg/lib/libdrm.git
+Homepage: http://cgit.freedesktop.org/mesa/drm/
 
 Package: libdrm-dev
 Section: libdevel

commit 5f55b15983eaa3104aa29de1bd44f718b9e13c99
Author: Andreas Boll 
Date:   Wed Sep 2 12:07:12 2015 +0200

Fix Vcs-* fields.

diff --git a/debian/changelog b/debian/changelog
index a149f56..c2202e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libdrm (2.4.64-2) UNRELEASED; urgency=medium
 
   * Enable libdrm-amdgpu1 on kfreebsd-*.
+  * Fix Vcs-* fields.
 
  -- Andreas Boll   Mon, 31 Aug 2015 17:41:21 +0200
 
diff --git a/debian/control b/debian/control
index 0568f82..cc47a12 100644
--- a/debian/control
+++ b/debian/control
@@ -17,8 +17,8 @@ Build-Depends:
  libbsd-dev [kfreebsd-any],
 Standards-Version: 3.9.6
 Section: libs
-Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdrm
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libdrm.git
+Vcs-Git: git://anonscm.debian.org/pkg-xorg/lib/libdrm.git
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-xorg/lib/libdrm.git
 
 Package: libdrm-dev
 Section: libdevel

libdrm: Changes to 'debian-unstable'

[Andreas Boll]

 debian/control |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ea106f269b4b6b45213210103ed7115ef700b7c9
Author: Andreas Boll 
Date:   Wed Sep 2 13:25:16 2015 +0200

Use https for Vcs-* fields

diff --git a/debian/control b/debian/control
index 101a38d..0d580f4 100644
--- a/debian/control
+++ b/debian/control
@@ -17,8 +17,8 @@ Build-Depends:
  libbsd-dev [kfreebsd-any],
 Standards-Version: 3.9.6
 Section: libs
-Vcs-Git: git://anonscm.debian.org/pkg-xorg/lib/libdrm.git
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-xorg/lib/libdrm.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/lib/libdrm.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/lib/libdrm.git
 Homepage: http://cgit.freedesktop.org/mesa/drm/
 
 Package: libdrm-dev

libdrm: Changes to 'debian-unstable'

[Andreas Boll]

 debian/changelog |6 ++
 debian/control   |6 +++---
 debian/rules |7 +++
 3 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit 18ec34c9a4868f9472a0bfc9471655e20aecb144
Author: Andreas Boll 
Date:   Mon Aug 31 17:45:25 2015 +0200

Enable libdrm-amdgpu1 on kfreebsd-*.

diff --git a/debian/changelog b/debian/changelog
index 0d7031c..a149f56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.64-2) UNRELEASED; urgency=medium
+
+  * Enable libdrm-amdgpu1 on kfreebsd-*.
+
+ -- Andreas Boll   Mon, 31 Aug 2015 17:41:21 +0200
+
 libdrm (2.4.64-1) unstable; urgency=medium
 
   [ Robert Hooker ]
diff --git a/debian/control b/debian/control
index 981523a..0568f82 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Depends:
  libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 
x32],
  libdrm-radeon1 (= ${binary:Version}),
  libdrm-nouveau2 (= ${binary:Version}) [linux-any],
- libdrm-amdgpu1 (= ${binary:Version}) [linux-any],
+ libdrm-amdgpu1 (= ${binary:Version}),
  libdrm-omap1 (= ${binary:Version}) [any-arm],
  libdrm-freedreno1 (= ${binary:Version}) [any-arm],
  libdrm-exynos1 (= ${binary:Version}) [any-arm],
@@ -305,7 +305,7 @@ Description: Userspace interface to tegra-specific kernel 
DRM services -- debugg
  This package provides the debugging symbols for the libdrm-tegra0 package.
 
 Package: libdrm-amdgpu1
-Architecture: linux-any
+Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
@@ -321,7 +321,7 @@ Description: Userspace interface to amdgpu-specific kernel 
DRM services -- runti
 Package: libdrm-amdgpu1-dbg
 Section: debug
 Priority: extra
-Architecture: linux-any
+Architecture: any
 Depends:
  libdrm-amdgpu1 (= ${binary:Version}),
  ${misc:Depends},
diff --git a/debian/rules b/debian/rules
index dee3894..a00c59e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,7 @@ DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture 
-qDEB_HOST_ARCH_CPU)
 
 confflags = \
--enable-radeon \
+   --enable-amdgpu \
--disable-libkms \
$()
 
@@ -18,13 +19,11 @@ ifeq (linux, $(DEB_HOST_ARCH_OS))
confflags += --enable-udev
confflags += --enable-vmwgfx
confflags += --enable-nouveau
-   confflags += --enable-amdgpu
NOUVEAU = yes
 else
confflags += --disable-udev
confflags += --disable-vmwgfx
confflags += --disable-nouveau
-   confflags += --disable-amdgpu
NOUVEAU = no
# kfreebsd mangles freebsd's sys/types.h
confflags += CFLAGS="$(shell pkg-config --cflags libbsd-overlay)"
@@ -83,9 +82,9 @@ ifeq ($(INTEL), yes)
 endif
 ifeq ($(NOUVEAU), yes)
dh_strip -plibdrm-nouveau2 --dbg-package=libdrm-nouveau2-dbg
-   dh_strip -plibdrm-amdgpu1 --dbg-package=libdrm-amdgpu1-dbg
 endif
dh_strip -plibdrm-radeon1 --dbg-package=libdrm-radeon1-dbg
+   dh_strip -plibdrm-amdgpu1 --dbg-package=libdrm-amdgpu1-dbg
 ifeq ($(ARM), yes)
dh_strip -plibdrm-omap1 --dbg-package=libdrm-omap1-dbg
dh_strip -plibdrm-freedreno1 --dbg-package=libdrm-freedreno1-dbg
@@ -101,9 +100,9 @@ ifeq ($(INTEL), yes)
 endif
 ifeq ($(NOUVEAU), yes)
dh_makeshlibs -plibdrm-nouveau2 -V'libdrm-nouveau2 (>= 2.4.38)' -- -c4
-   dh_makeshlibs -plibdrm-amdgpu1 -V'libdrm-amdgpu1 (>= 2.4.63)' -- -c4
 endif
dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (>= 2.4.39)' -- -c4
+   dh_makeshlibs -plibdrm-amdgpu1 -V'libdrm-amdgpu1 (>= 2.4.63)' -- -c4
 ifeq ($(ARM), yes)
dh_makeshlibs -plibdrm-omap1 -V'libdrm-omap1 (>= 2.4.38)' -- -c4
dh_makeshlibs -plibdrm-freedreno1 -V'libdrm-freedreno1 (>= 2.4.64)' -- 
-c4

libdrm: Changes to 'debian-unstable'

[Robert Hooker]

 amdgpu/amdgpu.h  |5 +
 amdgpu/amdgpu_device.c   |   33 +++-
 amdgpu/amdgpu_internal.h |   13 +--
 amdgpu/amdgpu_vamgr.c|   63 +++
 configure.ac |2 
 debian/changelog |7 +
 debian/libdrm-freedreno1.symbols |1 
 debian/rules |2 
 freedreno/freedreno-symbol-check |1 
 freedreno/freedreno_drmif.h  |3 
 freedreno/freedreno_pipe.c   |8 +-
 freedreno/freedreno_priv.h   |2 
 freedreno/kgsl/kgsl_pipe.c   |3 
 freedreno/msm/msm_bo.c   |6 -
 freedreno/msm/msm_pipe.c |5 -
 freedreno/msm/msm_priv.h |   21 -
 freedreno/msm/msm_ringbuffer.c   |  155 +--
 tests/amdgpu/amdgpu_test.c   |5 +
 tests/amdgpu/basic_tests.c   |5 +
 tests/amdgpu/bo_tests.c  |5 +
 tests/amdgpu/cs_tests.c  |5 +
 tests/amdgpu/vce_tests.c |6 +
 tests/modetest/modetest.c|   94 ---
 xf86drmMode.c|   12 ---
 24 files changed, 326 insertions(+), 136 deletions(-)

New commits:
commit 50949b57acc5860b036410683b69a98e12e3fffc
Author: Robert Hooker sarv...@ubuntu.com
Date:   Tue Aug 18 16:40:35 2015 -0400

Bump symbols and shlibs for freedreno

diff --git a/debian/changelog b/debian/changelog
index c1df6aa..e9214e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libdrm (2.4.64-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Bump symbols file and shlibs for libdrm-freedreno1.
 
  -- Robert Hooker sarv...@ubuntu.com  Tue, 18 Aug 2015 16:05:01 -0400
 
diff --git a/debian/libdrm-freedreno1.symbols b/debian/libdrm-freedreno1.symbols
index b7602f9..efb91a9 100644
--- a/debian/libdrm-freedreno1.symbols
+++ b/debian/libdrm-freedreno1.symbols
@@ -21,6 +21,7 @@ libdrm_freedreno.so.1 libdrm-freedreno1 #MINVER#
  fd_pipe_get_param@Base 0
  fd_pipe_new@Base 0
  fd_pipe_wait@Base 0
+ fd_pipe_wait_timeout@Base 2.4.64
  fd_ringbuffer_del@Base 0
  fd_ringbuffer_emit_reloc_ring@Base 0
  fd_ringbuffer_flush@Base 0
diff --git a/debian/rules b/debian/rules
index ec465df..dee3894 100755
--- a/debian/rules
+++ b/debian/rules
@@ -106,7 +106,7 @@ endif
dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (= 2.4.39)' -- -c4
 ifeq ($(ARM), yes)
dh_makeshlibs -plibdrm-omap1 -V'libdrm-omap1 (= 2.4.38)' -- -c4
-   dh_makeshlibs -plibdrm-freedreno1 -V'libdrm-freedreno1 (= 2.4.57)' -- 
-c4
+   dh_makeshlibs -plibdrm-freedreno1 -V'libdrm-freedreno1 (= 2.4.64)' -- 
-c4
dh_makeshlibs -plibdrm-exynos1 -V'libdrm-exynos1 (= 2.4.60)' -- -c4
dh_makeshlibs -plibdrm-tegra0 -V'libdrm-tegra0' -- -c4
 endif

commit 564ab8aa8535474c295406154c1626529b518da4
Author: Robert Hooker sarv...@ubuntu.com
Date:   Tue Aug 18 16:38:41 2015 -0400

Bump changelog.

diff --git a/debian/changelog b/debian/changelog
index 6f71a39..c1df6aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.64-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Robert Hooker sarv...@ubuntu.com  Tue, 18 Aug 2015 16:05:01 -0400
+
 libdrm (2.4.63-1) unstable; urgency=medium
 
   [ Robert Hooker ]

commit ab2fadabde3829b1ec56bd4756165dd9bd281488
Author: Rob Clark robcl...@freedesktop.org
Date:   Tue Aug 18 11:56:50 2015 -0400

Bump version for release

Signed-off-by: Rob Clark robcl...@freedesktop.org

diff --git a/configure.ac b/configure.ac
index e2a2f16..f07507b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 
 AC_PREREQ([2.63])
 AC_INIT([libdrm],
-[2.4.63],
+[2.4.64],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
 [libdrm])
 

commit 04a118d800280c88aed5cb4a5f29fdfb5a38e36b
Author: Rob Clark robcl...@freedesktop.org
Date:   Tue Aug 18 10:53:36 2015 -0400

freedreno: update freedreno-symbol-check

Signed-off-by: Rob Clark robcl...@freedesktop.org

diff --git a/freedreno/freedreno-symbol-check b/freedreno/freedreno-symbol-check
index 7115448..e593df4 100755
--- a/freedreno/freedreno-symbol-check
+++ b/freedreno/freedreno-symbol-check
@@ -32,6 +32,7 @@ fd_pipe_del
 fd_pipe_get_param
 fd_pipe_new
 fd_pipe_wait
+fd_pipe_wait_timeout
 fd_ringbuffer_del
 fd_ringbuffer_emit_reloc_ring
 fd_ringbuffer_flush

commit 5e5a3c48b83fb3929e57cb4e7261624a327137f3
Author: Thierry Reding tred...@nvidia.com
Date:   Wed Apr 9 09:00:49 2014 +0200

libdrm: Make indentation consistent

Use tabs and spaces consistently to align function arguments on
subsequent lines with those of the first line.

Acked-by: Laurent Pinchart laurent.pinch...@ideasonboard.com
Signed-off-by: Thierry Reding tred...@nvidia.com

diff --git a/xf86drmMode.c b/xf86drmMode.c
index 23348d7..9b70ce8 100644
--- a/xf86drmMode.c
+++ b/xf86drmMode.c
@@ -249,7 +249,7 @@ err_allocs:
 }
 
 int drmModeAddFB(int fd, uint32_t 

libdrm: Changes to 'debian-unstable'

[Timo Aaltonen]

 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit beab4cbefddbc68f4693d5e75c42060ff6568bd4
Author: Timo Aaltonen tjaal...@debian.org
Date:   Wed Aug 19 07:53:59 2015 +0300

release to unstable

diff --git a/debian/changelog b/debian/changelog
index e9214e1..0d7031c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-libdrm (2.4.64-1) UNRELEASED; urgency=medium
+libdrm (2.4.64-1) unstable; urgency=medium
 
+  [ Robert Hooker ]
   * New upstream release.
   * Bump symbols file and shlibs for libdrm-freedreno1.
 
- -- Robert Hooker sarv...@ubuntu.com  Tue, 18 Aug 2015 16:05:01 -0400
+ -- Timo Aaltonen tjaal...@debian.org  Wed, 19 Aug 2015 07:52:50 +0300
 
 libdrm (2.4.63-1) unstable; urgency=medium
 

libdrm: Changes to 'debian-unstable'

[Timo Aaltonen]

 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 144187a69df06534c334b3e4f6a2ce8b2b957661
Author: Timo Aaltonen tjaal...@debian.org
Date:   Sun Aug 16 00:54:25 2015 +0300

release to unstable

diff --git a/debian/changelog b/debian/changelog
index 9bd4434..6f71a39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-libdrm (2.4.63-1) UNRELEASED; urgency=medium
+libdrm (2.4.63-1) unstable; urgency=medium
 
+  [ Robert Hooker ]
   * New upstream release.
 - Drop Fix-headers-inclusion-in-xf86drmMode.c.diff, upstream.
   * Add new libdrm-amdgpu1 package.
 
- -- Robert Hooker sarv...@ubuntu.com  Fri, 14 Aug 2015 13:15:14 -0400
+ -- Timo Aaltonen tjaal...@debian.org  Sat, 15 Aug 2015 18:55:57 +0300
 
 libdrm (2.4.62-1) unstable; urgency=medium
 

libdrm: Changes to 'debian-unstable'

[Robert Hooker]

 .gitignore |2 
 Makefile.am|6 
 Makefile.sources   |5 
 amdgpu/Makefile.am |   57 
 amdgpu/amdgpu-symbol-check |   51 
 amdgpu/amdgpu.h| 1178 +++
 amdgpu/amdgpu_bo.c |  705 
 amdgpu/amdgpu_cs.c |  372 ++
 amdgpu/amdgpu_device.c |  274 +
 amdgpu/amdgpu_gpu_info.c   |  310 ++
 amdgpu/amdgpu_internal.h   |  190 +
 amdgpu/amdgpu_vamgr.c  |  288 +
 amdgpu/libdrm_amdgpu.pc.in |   10 
 amdgpu/util_hash.c |  387 ++
 amdgpu/util_hash.h |  107 
 amdgpu/util_hash_table.c   |  262 +
 amdgpu/util_hash_table.h   |   73 
 configure.ac   |   46 
 debian/changelog   |8 
 debian/control |   32 
 debian/libdrm-amdgpu1.install  |1 
 debian/libdrm-amdgpu1.symbols  |   35 
 debian/patches/Fix-headers-inclusion-in-xf86drmMode.c.diff |   39 
 debian/patches/series  |1 
 debian/rules   |4 
 freedreno/Makefile.sources |3 
 freedreno/freedreno_bo.c   |6 
 freedreno/freedreno_priv.h |2 
 freedreno/kgsl/kgsl_bo.c   |1 
 freedreno/kgsl/kgsl_pipe.c |2 
 freedreno/list.h   |  137 
 freedreno/msm/msm_bo.c |1 
 include/drm/amdgpu_drm.h   |  645 
 intel/intel_bufmgr.h   |8 
 intel/intel_bufmgr_gem.c   |  414 --
 intel/test_decode.c|2 
 libkms/libkms.h|4 
 libkms/linux.c |4 
 man/Makefile.am|   11 
 omap/omap_drm.c|4 
 radeon/r600_pci_ids.h  |1 
 tests/Makefile.am  |   12 
 tests/amdgpu/Makefile.am   |   29 
 tests/amdgpu/amdgpu_test.c |  222 +
 tests/amdgpu/amdgpu_test.h |  236 +
 tests/amdgpu/basic_tests.c |  838 +
 tests/amdgpu/bo_tests.c|  181 +
 tests/amdgpu/cs_tests.c|  387 ++
 tests/amdgpu/frame.h   | 1949 +
 tests/amdgpu/uvd_messages.h|  813 +
 tests/amdgpu/vce_ib.h  |  318 ++
 tests/amdgpu/vce_tests.c   |  489 +++
 tests/kmstest/main.c   |1 
 tests/modeprint/modeprint.c|4 
 tests/name_from_fd.c   |2 
 tests/radeon/Makefile.am   |1 
 tests/radeon/list.h|  137 
 tests/radeon/rbo.h |2 
 util_double_list.h |  137 
 util_math.h|   33 
 xf86drm.c  |   28 
 xf86drm.h  |   11 
 xf86drmMode.c  |   30 
 xf86drmMode.h  |4 
 64 files changed, 10804 insertions(+), 748 deletions(-)

New commits:
commit d89c15de45d69133ad8b2f5c438c96e54a742155
Author: Robert Hooker sarv...@ubuntu.com
Date:   Fri Aug 14 13:43:14 2015 -0400

Update changelog

diff --git a/debian/changelog b/debian/changelog
index 45e4cb5..9bd4434 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libdrm (2.4.63-1) UNRELEASED; urgency=medium
 
   * New upstream release.
 - Drop Fix-headers-inclusion-in-xf86drmMode.c.diff, upstream.
+  * Add new libdrm-amdgpu1 package.
 
  -- Robert Hooker sarv...@ubuntu.com  Fri, 

libdrm: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog   |3 +
 debian/patches/01_default_perms.diff   |2 
 debian/patches/Fix-headers-inclusion-in-xf86drmMode.c.diff |   38 -
 3 files changed, 30 insertions(+), 13 deletions(-)

New commits:
commit fd4342150d3d34f74f98af7d1298edc640d2da5e
Author: Julien Cristau jcris...@debian.org
Date:   Thu Jul 2 20:51:34 2015 +0200

Fix kfreebsd patch that caused an FTBFS on Linux/x32

Only include sys/sysctl.h if configure detects it (closes: #787496).
Thanks, Thorsten Glaser.

diff --git a/debian/changelog b/debian/changelog
index d2756b9..022bb0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ libdrm (2.4.62-1) UNRELEASED; urgency=medium
 
   [ Julien Cristau ]
   * Update debian/upstream/signing-key.asc.
+  * Fix kfreebsd patch that caused an FTBFS on Linux/x32: only include
+sys/sysctl.h if configure detects it (closes: #787496).  Thanks,
+Thorsten Glaser.
 
  -- Sven Joachim svenj...@gmx.de  Fri, 08 May 2015 21:35:41 +0200
 
diff --git a/debian/patches/01_default_perms.diff 
b/debian/patches/01_default_perms.diff
index cdba93e..8315ba9 100644
--- a/debian/patches/01_default_perms.diff
+++ b/debian/patches/01_default_perms.diff
@@ -2,7 +2,7 @@ Index: libdrm/xf86drm.h
 ===
 --- libdrm.orig/xf86drm.h
 +++ libdrm/xf86drm.h
-@@ -70,7 +70,7 @@
+@@ -74,7 +74,7 @@ extern C {
  /* Default /dev/dri directory permissions 0755 */
  #define DRM_DEV_DIRMODE   \
(S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH)
diff --git a/debian/patches/Fix-headers-inclusion-in-xf86drmMode.c.diff 
b/debian/patches/Fix-headers-inclusion-in-xf86drmMode.c.diff
index 4489de5..980b7d0 100644
--- a/debian/patches/Fix-headers-inclusion-in-xf86drmMode.c.diff
+++ b/debian/patches/Fix-headers-inclusion-in-xf86drmMode.c.diff
@@ -3,23 +3,37 @@ From: Julien Cristau jcris...@debian.org
 Date: Sun, 26 Apr 2015 11:53:02 +0200
 Subject: [PATCH] Fix headers inclusion in xf86drmMode.c
 
-- add sys/sysctl.h to get sysctlbyname declaration on kFreeBSD

- xf86drmMode.c | 1 +
- 1 file changed, 1 insertion(+)
+Add sys/sysctl.h to get sysctlbyname declaration on kFreeBSD
 
-diff --git a/xf86drmMode.c b/xf86drmMode.c
-index f4b8d14..b7e0116 100644
 a/xf86drmMode.c
-+++ b/xf86drmMode.c
-@@ -46,6 +46,7 @@
+Updated by Thorsten “mirabilos” Glaser t.gla...@tarent.de
+to add autoconf check and only include sys/sysctl.h if it
+is detected by configure as it’s unusable on Linux/x32 (and
+others, e.g. other new architectures).
+
+Index: libdrm/xf86drmMode.c
+===
+--- libdrm.orig/xf86drmMode.c
 libdrm/xf86drmMode.c
+@@ -46,6 +46,9 @@
  #include stdint.h
  #include stdlib.h
  #include sys/ioctl.h
++#ifdef HAVE_SYS_SYSCTL_H
 +#include sys/sysctl.h
++#endif
  #include stdio.h
  #include stdbool.h
  
--- 
-2.1.4
-
+Index: libdrm/configure.ac
+===
+--- libdrm.orig/configure.ac
 libdrm/configure.ac
+@@ -53,7 +53,7 @@ AC_USE_SYSTEM_EXTENSIONS
+ AC_SYS_LARGEFILE
+ AC_FUNC_ALLOCA
+ 
+-AC_CHECK_HEADERS([sys/mkdev.h])
++AC_CHECK_HEADERS([sys/mkdev.h sys/sysctl.h])
+ 
+ # Initialize libtool
+ LT_PREREQ([2.2])


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1zajj5-hv...@moszumanska.debian.org

libdrm: Changes to 'debian-unstable'

[Julien Cristau]

 configure.ac |2 +-
 debian/changelog |6 --
 debian/control   |1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 26d70d817605b9ca95db733177a0d9fc20bf94e6
Author: Julien Cristau jcris...@debian.org
Date:   Thu Jul 2 21:05:01 2015 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 85afa8a..2487024 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.62-1) UNRELEASED; urgency=medium
+libdrm (2.4.62-1) unstable; urgency=medium
 
   [ Sven Joachim ]
   * New upstream release.
@@ -16,8 +16,9 @@ libdrm (2.4.62-1) UNRELEASED; urgency=medium
 sys/sysctl.h if configure detects it (closes: #787496).  Thanks,
 Thorsten Glaser.
   * Add build-dep on xutils-dev for xorg-macros.
+  * Cherry-pick upstream patch to let valgrind auto-detection work.
 
- -- Sven Joachim svenj...@gmx.de  Fri, 08 May 2015 21:35:41 +0200
+ -- Julien Cristau jcris...@debian.org  Thu, 02 Jul 2015 21:11:21 +0200
 
 libdrm (2.4.60-3) unstable; urgency=medium
 

commit 9be727b722764566225937660dc3e4a40d7c97ed
Author: Julien Cristau jcris...@debian.org
Date:   Thu Jul 2 21:10:07 2015 +0200

Add build-dep on xutils-dev for xorg-macros

diff --git a/debian/changelog b/debian/changelog
index 022bb0a..85afa8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ libdrm (2.4.62-1) UNRELEASED; urgency=medium
   * Fix kfreebsd patch that caused an FTBFS on Linux/x32: only include
 sys/sysctl.h if configure detects it (closes: #787496).  Thanks,
 Thorsten Glaser.
+  * Add build-dep on xutils-dev for xorg-macros.
 
  -- Sven Joachim svenj...@gmx.de  Fri, 08 May 2015 21:35:41 +0200
 
diff --git a/debian/control b/debian/control
index 8065c2a..cd39bab 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends:
  docbook-xsl,
  libx11-dev,
  pkg-config,
+ xutils-dev (= 1:7.6+2),
  libpthread-stubs0-dev,
  libudev-dev [linux-any],
  libpciaccess-dev,

commit 5dd3d82ed7b4dd5c97264b412c2eb1a72fc45ef9
Author: Emil Velikov emil.l.veli...@gmail.com
Date:   Tue Jun 30 14:01:14 2015 +0100

configure: default --enable-valgrind to auto

... as the help text says.

Reported-by: Jasper St. Pierre jstpie...@mecheye.net
Signed-off-by: Emil Velikov emil.l.veli...@gmail.com
(cherry picked from commit 676c806d0221a7ea375676b2eab514c426fcacd3)

diff --git a/configure.ac b/configure.ac
index 1456b90..001fd3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -406,7 +406,7 @@ AM_CONDITIONAL([HAVE_MANPAGES_STYLESHEET], [test 
x$HAVE_MANPAGES_STYLESHEET =
 AC_ARG_ENABLE(valgrind,
   [AS_HELP_STRING([--enable-valgrind],
  [Build libdrm with  valgrind support (default: 
auto)])],
- [VALGRIND=$enableval], [VALGRIND=yes])
+ [VALGRIND=$enableval], [VALGRIND=auto])
 PKG_CHECK_MODULES(VALGRIND, [valgrind], [have_valgrind=yes], 
[have_valgrind=no])
 AC_MSG_CHECKING([whether to enable Valgrind support])
 if test x$VALGRIND = xauto; then


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1zak0z-0005lz...@moszumanska.debian.org

libdrm: Changes to 'debian-unstable'

[Sven Joachim]

 configure.ac   |   18 
 debian/changelog   |8 
 debian/libdrm2.symbols |   10 
 debian/patches/Fix-headers-inclusion-in-xf86drmMode.c.diff |   29 -
 debian/rules   |2 
 debian/upstream/signing-key.asc|   52 ++
 exynos/exynos_fimg2d.c |   23 -
 include/drm/drm.h  |   10 
 include/drm/drm_mode.h |   37 +
 include/drm/nouveau_drm.h  |1 
 intel/intel_chipset.h  |   11 
 nouveau/abi16.c|3 
 nouveau/nouveau.h  |1 
 nouveau/pushbuf.c  |4 
 radeon/r600_pci_ids.h  |1 
 tests/exynos/exynos_fimg2d_test.c  |  112 -
 tests/kmstest/main.c   |1 
 tests/modetest/buffers.c   |   30 -
 tests/modetest/modetest.c  |   49 +-
 xf86drm.c  |   14 
 xf86drmMode.c  |  289 -
 xf86drmMode.h  |   24 +
 22 files changed, 534 insertions(+), 195 deletions(-)

New commits:
commit ba14218105057fe79c3b2a8f5c7b851e57aca1f4
Author: Sven Joachim svenj...@gmx.de
Date:   Wed Jul 1 17:23:02 2015 +0200

Close bug #789759

Fixed in commit 812e8fe6ce46d733c30207ee26c788c61f546294.

diff --git a/debian/changelog b/debian/changelog
index 6938ef8..d2756b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ libdrm (2.4.62-1) UNRELEASED; urgency=medium
 
   [ Sven Joachim ]
   * New upstream release.
+- nouveau: restore check that avoids multiple user bos per kernel bo
+  (Closes: #789759).
   * Update symbols file and bump shlibs for libdrm2.
   * Refresh the patch from 2.4.60-3 after upstream changes.
   * Remove duplicate Section fields from debian/control.

commit c30399694a21845bf0f36c29c97cd38351b96b88
Author: Sven Joachim svenj...@gmx.de
Date:   Wed Jul 1 17:17:30 2015 +0200

Update debian/upstream/signing-key.asc

Add Emil Velikov's key 2CEB490D.

diff --git a/debian/changelog b/debian/changelog
index 06c7d69..6938ef8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libdrm (2.4.62-1) UNRELEASED; urgency=medium
   * Update symbols file and bump shlibs for libdrm2.
   * Refresh the patch from 2.4.60-3 after upstream changes.
   * Remove duplicate Section fields from debian/control.
+  * Update debian/upstream/signing-key.asc.
   * Bump Standards-Version to 3.9.6, no changes needed.
 
   [ Julien Cristau ]
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
index 7e70a30..a99bceb 100644
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@@ -139,3 +139,55 @@ 
xjRzzOuOtaxMftMlZwRNXm1zh5CTzMOYpXeetPXrLwUOSF5VeN8AK//gGlbjZt1o
 iQyTzgz/F98QzHzNrRk8DdK4kxVkpvk=
 =G7Eh
 -END PGP PUBLIC KEY BLOCK-
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1
+
+mQINBFQDrA8BEACyGXUc6vSmNkwZdTTzX1vHRgIDWoppot56E5oOO+gM6ukyMDY7
+60FxKvmh704I8NqTfg3Rcs18fSOXeRj1gDG84MsU7QM3g6IQyxCA+IV7d2r/DPZE
+z7HxEIKFxGJw24swsQJy/iiZf/b8flqiJbx3Ye1LF7T5iw/gKDsN6eqzAtLKqw9I
+/4TBVE766nwmKNQZiw2jAFCs3lwfmNIm7ZaQNBpHTRabMTLMJiFFynLsa1eVsf9D
+R3eVXW4c2oHKZbxDvSWR2yz6XcQ9ldii89sUNeclnjSFNOt761P4zBNwcEX2GuQs
+JO/haw5FyrMJJexAbdUTtshZ7XvhDv/UCHtyqQBUw/vwYe8Rx79Hq/fOOUdMjWOW
+cDCzyYTmGdbEJYRHrENcsOhoti3IkOjgzw0UDyCHyjapFV1ZJT/Kz7rkMmsdNtoi
+1BVTLIdOvQmeXQtN2caZSN20wZWHdZnrz1/JOfOxpEsf2R78zavIfobReQdFoYMC
+jv4b49WB/Gytd5vneqk9yi9DEhCYw5uGxQgjIKC4AZPVtD//GY+iYiPe5dPwrhU1
+FyD3b9SgYxFE/uZlgbzBIV4akK11vC5Q+Co5PYzhnPPgd7cYLjr/ceMfGPkeWLCY
+OxZbXg92BZKKJnFHYx7FJ04WKS8SjzIn/qEzvy7SmPGxSCX6zdwn0fKZYQARAQAB
+tCdFbWlsIFZlbGlrb3YgPGVtaWwubC52ZWxpa292QGdtYWlsLmNvbT6JAjkEEwEC
+ACMFAlQDrA8CGwMHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIXgAAKCRDtrjewLOtJ
+DV/AEACd/RKvSzL0L4/9HYvFskjNR40NPFyQHyMaPg9eeblhfbnH7mWYXJ2MPGTR
+bgvQCr0zZ3R7u8E8Rxulwifbm20x0WhYOKkDuSROjroRqvDhxfuLtXtBKqfVGw6T
+0rMEOOWdqGhql4yuVpqGbgHa5ZfFvQi2EtT40QDdD052adzWeT96aFQB6Gf3CRMf
+a4y7hawbUV10XL3BUljUcyh+SJv9lPclW09WNE+tuCmdIqoP927BSjXwh2GR6dM0
+z0aDf3wOxRc9S8q34jS+xN8hsXmYFAqkn0YkVIQ0M0PaQ89ltcyonbG6rZ+1rNgx
+tiLEpfOZpzr7LowVsw9R6ky/pvhBHfVIM4aT17hbi2XfnMihmt/T1SZqb36+aYFt
+j8Bc/o9I5crPXwOP4in3heY2ZmDWeGkPSRNix0VLQHL0HzOxjMAEm+y5ROLDo7Z/
+sGOebYxMYPIK5mJzrKhk737FEI57cvUSRXzbjmV3CIOIJbaNULWFXkCHRhdyk8mh
+sVzKkl7IDiWPBj1RC5r0EXmrjUzK8QfzrTWiOa6z9WIkZ4sSs0bz14Q4pZR2qi8L
+KLVjCNf/FusqCTgbZU06x1S/75XJwcsFENWkWYPEaxxzQiCs1rVzG8SnrOjcyc5F

libdrm: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog|4 +
 debian/upstream/signing-key.asc |  111 
 2 files changed, 115 insertions(+)

New commits:
commit 5b9caa1c34cd8facae69d2aa12a0e58fc3db98ef
Author: Julien Cristau jcris...@debian.org
Date:   Fri May 8 23:11:29 2015 +0200

Update debian/upstream/signing-key.asc.

diff --git a/debian/changelog b/debian/changelog
index 469ae41..848e9e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 libdrm (2.4.61-1) UNRELEASED; urgency=medium
 
+  [ Sven Joachim ]
   * New upstream version.
   * Update symbols file and bump shlibs for libdrm2.
   * Remove duplicate Section fields from debian/control.
   * Bump Standards-Version to 3.9.6, no changes needed.
 
+  [ Julien Cristau ]
+  * Update debian/upstream/signing-key.asc.
+
  -- Sven Joachim svenj...@gmx.de  Fri, 08 May 2015 21:35:41 +0200
 
 libdrm (2.4.60-3) unstable; urgency=medium
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
index 2909249..7e70a30 100644
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@@ -28,3 +28,114 @@ 
rqioCg9cFWfg7fz/Zd5zawGxsrDaf+aLz5nC9k0ZlHO+pr6ble4RimjUTkcKeYWC
 Tn3/2yC6tAdk4vsMhKznlLTI4ZQnW/7rUVUBV2H2jI0XPWVr7gV0WQ==
 =lale
 -END PGP PUBLIC KEY BLOCK-
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1
+
+mQINBE6N4qMBEACtDFIAwKCQQlJmWDBChO+cPd/7f+6xt0onsFYwjTImhCM6VfjP
+Sk6V+o/tv6JO5hbuNIUW3hiwz4nZSAxrEtHAeTBL+XbXMQX/b3tKzXylYlHfp0md
+R444ErwOMqcp9ch5P6kCbATPNsu/7yWnJSzfdQXybz3HPbMeweI8Xcz6m2zfawRA
+Wg8h66s1ZLjspG4ZwEuShrmERrVDoq+1UaKq2stgngGBC/K9I9hBcGp3fLHWIMb8
+Kpzc4prmyZkZV6iy0B0nGrcRMdookb1NgFGNm1u+IJiSeQnvb6q4Sq5SGSu/hNUZ
+8KJxI1JSq10MFqmgwOXz4E7KeC7F0dHMVWcI03CZ0Y6tQN4Lk2iD67JECLmfwW+c
+70osNfO9d4XVcenwoZ3tL/UCnN9nxQtZ8zm5typh+J0MDcE8vZtiT4zbt9hSG2gZ
+2QNYNl3Rt+Kj3oI2AiTXxyhcjYqWUl14m6ydafkG27JhfbEWzUvV/Gujxibo8P3J
+4CRgMgryI+fJmJSbmyzT0LiHQKuGjTRNMLnroIDG8dC0KCuZO3pOvhWpCwHYZ+n5
+0AwRmwPrzvA/dmpy8sHoi0Dyxns+qi98Mu8Y+FCOnP2Pe4D31PwX9/uu0+WTW2S0
+ak9vfAiNcCzzaL5OnEVDtfe7os8hD6RGr53u4He67Jh6RgzpJ4WK//PFPQARAQAB
+tB5EYXZlIEFpcmxpZSA8YWlybGllZEBsaW51eC5pZT6JAj4EEwECACgFAk6N8t4C
+GwMFCQlmAYAGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEAx081l5xIa+D/gP
+/A/stssubkOP1b6zE3KrX5oN/4FirEXLnk2gc6o8hX0H4QhNGD6KDzJidu71t0Rk
+VzcH+U59mTMfuaOD8iP+YLYgi0UQ4Eg1ZDUxO2cjNa33IDyDDtih5VX3hZ7hI8er
+jSD17ftYWXGinsMaMQ0VYmwZIIgyUxU3nAPEQ8taNio6sOnaHVgMBX0k5glgFZje
+R9rO45I5W72hTeJhPK4/AtOn9weyl6CJ5nEGosgFzxw5RHa/O4tim+TmpWIvuJvu
+7mAq8vtpMUuT10k2ClYQTM6/O+zmJgnWVFCoz0lBYQ+hPuAY084zoEegDBH6svPj
+gkEV1kkqFzEkLI/fv506p5J0hzsqznDMK1f8K35wkuZCULck97x43rOR0syXvVow
+oqQ81/NZMuV1O5XVGCMd/O8Av7OoqPuMCPWacJPttyvl0JOt7CZ31JwtucnNa0wH
+bTMVlCPFQhGlalIEM6zI+m7N80nZf2Xmi15mDrjS8Iig6E2pE3sWqW3NMQcmI5Hf
+FVO37+QOSvlD+GWq/j5/Z19bEkzVZB3AmnF5YSAgqMlp2jsEPjSXqL1wP0FI2WX0
+x0XOpa/y3QNBE315lcckAN8xEgXAuGusry4+r/3lIPkShvx9hgqnXfkgczFckh1N
+Lp7ixw+TpiZyV369QsstM+MXZ0h2cfKD3zxNIWCWb828tCBEYXZpZCBBaXJsaWUg
+PGFpcmxpZWRAZ21haWwuY29tPokCPgQTAQIAKAUCTo3iowIbAwUJCWYBgAYLCQgH
+AwIGFQgCCQoLBBYCAwECHgECF4AACgkQDHTzWXnEhr71/A//dCkrvjfEa7dsn1sp
+DdoDbzwKl0POGRZ1SI9jg1AO7+2cbx9rnVtCvIUNUVx3G2qOCvowci9F4W+X64R4
+VS9TACZnw81F79DTr8/SznKgH9qG3enfWEgVuOKBmXXjom1/SzmHYp+HWZYhb5cF
+WBy68a4V2AUlteXEY61pN/6nES7spZbkaG/VGYws9YGvbBbSbV2c9tklV84f9Otb
+PHLTyxkVjYZx5KLTeM1W9pCDyd9IbvJinL0nZYUeUeY65j25KYOT4Fh46xBpEhQl
+cdBb7ZEjDXsdaxYk4m0S3mtuvXAHLRZ7hSoY0oqnNyvGpWlgCtFyNbI/zIUGFPoi
+cwlH1WLGkqk5V3mYdy2b36gOKsjKwjCu2RLCPP6eTjQhGLCcKLgITr+gxedluyKL
+sKtqCJ/7r4Wg4yeg5+ieplOKQeUeZigowH+C/J4o5PomltsBgX6bCbMzvzXA2plQ
+4ott2SucQD1grnLsmdzem3IvBa48wk7oEpaDS9+C0lkXpKlEQAu9GP6gysByv017
+h6RfmZyTw0IjDiw1C/jr3NKuoBs9C2k2doJBDutPhrz+zf13+iGDKxIKCeqB+LJr
+zQEvBRhxsE6zdFj2EwNHW2PryhCOR9uXAhkX4Ix2SNWpRWH/vBZ/IXQZ3xCep2m0
+xbZsef0nCqIQE51pl2z6kOi+HKK0IURhdmlkIEFpcmxpZSA8YWlybGllZEByZWRo
+YXQuY29tPokCPgQTAQIAKAUCTo3y9gIbAwUJCWYBgAYLCQgHAwIGFQgCCQoLBBYC
+AwECHgECF4AACgkQDHTzWXnEhr5L2w/9HBh/5jp/cAOd/sGIxyMNtrahuq1AaB4j
+F4Rx2kOb/5vfi9J70VWRE1F6MI2NSbPM0nYBSu+hwEH06yxeMhbD9bYOv+3ZBh07
+NyYdDVCPLPclH2C6kFkbMXooiq63YEYmmDlb6am25BIjJZE40FUX9QBpFBIWRyaW
+UpTymLWk8NvQOqmzRn5tuS2HkUu8e+iLZjWCoH+hv6+R3RQ0V8WbrHR+XL+GXcoL
++vgnV1FKVZoqRozBmkNBW3JpWQEfQhH75DbEfQpZAuU2n+u0alXJoNFCX/BxpCNg
+iCfptPnUynZkey/gwBw+uw+9dieKSuIC4pCJnJlCv1Gr9qXPdkWHWAlgTuiwQs44
+YNvh2XY1L4qpgeXIo+E5mvdTqYEERMrp//Z+ab8LCRCwLpO7ME0OiJ1fcLGNXP/0
+//wtzWawwd1b0LPJcn87YEwjoEFVhs6+R8jA7/m4DoppOfqxfmohAYXV7GDhvx2i
+g8iB6YBfQnbM2u+OVf59dlQ5PJjWTn5yntPBRGNAPSbqTvoJmgamBnNll6L8EiRh
+1P5xF8Bnqo8BQ3TTXh+6nhSiG5qK8IHXKchQtQgGvHW0QyR/JsSh+qJ0/QDqBCAa
+7EdOzKcTykCkQO5dtROfW6Aialsdc2tlSL40LcKG9tUBZRBWTo5nt2lWv4JigeEw
+6aTRI8znoOu5Ag0ETo3iowEQAKfQTaRf3oDRhF5ZY2GeDEwNVKQh3KesFojkM5CB
+FvCdQiPWFzNkx1tblO2i6WDjR96FCeiC7Z4TwQlDD8l/hSvpugbs48yb4ABOG3AK
+1ygj40GMHIz0+NqFjjfqwfig2d99w8VdRSf2BaeZUjxqNQfmm0FQ4hsoHy43Wm5d
+j9ScjXGi1xBDcAxWwRhU/7fhCC4Jkr6Bly/NNaBLEQwzwegtBw6K9cPqmc/kG0yX
+lRCbNdMl0agCh1xg4xMb/ak57nX5DV/WrkvBQrQOUxtazi/9EZ7dvoFno2sQD/qp

libdrm: Changes to 'debian-unstable'

[Julien Cristau]

 .gitignore |5 
 Makefile.am|   34 +
 Makefile.sources   |1 
 autogen.sh |   16 
 configure.ac   |  139 +++-
 debian/changelog   |   36 +
 debian/control |   33 +
 debian/libdrm-exynos1.symbols  |1 
 debian/libdrm-intel1.symbols   |2 
 debian/libdrm-tegra0.install   |1 
 debian/libdrm-tegra0.symbols   |   15 
 debian/libdrm2.symbols |7 
 debian/patches/Fix-headers-inclusion-in-xf86drmMode.c.diff |   42 +
 debian/patches/series  |1 
 debian/rules   |   19 
 debian/source/local-options|1 
 debian/upstream/signing-key.asc|   30 +
 debian/watch   |1 
 exynos/Makefile.am |3 
 exynos/exynos_drm.c|   19 
 exynos/exynos_drm.h|   40 -
 exynos/exynos_fimg2d.c |  253 ++--
 exynos/exynos_fimg2d.h |  328 +++
 exynos/fimg2d.h|  325 ---
 exynos/fimg2d_reg.h|2 
 freedreno/Android.mk   |3 
 freedreno/Makefile.am  |3 
 freedreno/Makefile.sources |   16 
 freedreno/freedreno_bo.c   |7 
 freedreno/freedreno_device.c   |   10 
 include/drm/drm_mode.h |   20 
 include/drm/i915_drm.h |2 
 include/drm/tegra_drm.h|  200 +++
 intel/Android.mk   |2 
 intel/intel_bufmgr.h   |3 
 intel/intel_bufmgr_gem.c   |  129 ++--
 intel/intel_chipset.h  |   43 +
 intel/intel_decode.c   |4 
 intel/test_decode.c|5 
 libdrm.h   |2 
 libkms/exynos.c|7 
 nouveau/Android.mk |3 
 nouveau/bufctx.c   |6 
 nouveau/nouveau.c  |  117 +---
 radeon/Android.mk  |3 
 radeon/radeon_surface.c|6 
 tegra/.gitignore   |1 
 tegra/Makefile.am  |   23 
 tegra/libdrm_tegra.pc.in   |   11 
 tegra/private.h|   51 +
 tegra/tegra.c  |  345 
 tegra/tegra.h  |   60 ++
 tests/Makefile.am  |   58 --
 tests/auth.c   |1 
 tests/dristat.c|7 
 tests/drmstat.c|2 
 tests/exynos/Makefile.am   |1 
 tests/exynos/exynos_fimg2d_test.c  |  187 +-
 tests/gem_basic.c  |  102 ---
 tests/gem_flink.c  |  137 
 tests/gem_mmap.c   |  136 
 tests/gem_readwrite.c  |  139 
 tests/getclient.c  |1 
 tests/getstats.c   |3 
 tests/kmstest/Makefile.am  |1 
 tests/kmstest/main.c   |5 
 tests/lock.c   |1 
 tests/modeprint/Makefile.am|1 
 tests/modeprint/modeprint.c|   18 
 tests/modetest/Android.mk  |2 
 tests/modetest/Makefile.am |3 
 tests/modetest/buffers.c   |  219 ++-
 

libdrm: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 5ce3d800a29b04a28569d952c09f952c37fe0673
Author: Julien Cristau jcris...@debian.org
Date:   Sun Oct 5 15:53:16 2014 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index c4a24c8..ccdb686 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-libdrm (2.4.58-1) UNRELEASED; urgency=medium
+libdrm (2.4.58-1) unstable; urgency=medium
 
+  [ Andreas Boll ]
   * New upstream release.
 - 03_hide_symbols.diff dropped, upstream.
   * Update libdrm-intel1.symbols and shlibs.
 
- -- Andreas Boll andreas.boll@gmail.com  Thu, 02 Oct 2014 16:22:13 +0200
+ -- Julien Cristau jcris...@debian.org  Sun, 05 Oct 2014 15:53:13 +0200
 
 libdrm (2.4.56-1) unstable; urgency=medium
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xammb-0004tv...@moszumanska.debian.org

libdrm: Changes to 'debian-unstable'

[Andreas Boll]

 debian/changelog |6 ++
 debian/libdrm-freedreno1.symbols |2 ++
 debian/rules |2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit e1a59228c5c426a681cf656fdddf52dfd82c7132
Author: Andreas Boll andreas.boll@gmail.com
Date:   Sun Oct 5 18:49:05 2014 +0200

Update libdrm-freedreno1.symbols and shlibs.

diff --git a/debian/changelog b/debian/changelog
index ccdb686..66c4208 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.58-2) UNRELEASED; urgency=medium
+
+  * Update libdrm-freedreno1.symbols and shlibs.
+
+ -- Andreas Boll andreas.boll@gmail.com  Sun, 05 Oct 2014 18:48:05 +0200
+
 libdrm (2.4.58-1) unstable; urgency=medium
 
   [ Andreas Boll ]
diff --git a/debian/libdrm-freedreno1.symbols b/debian/libdrm-freedreno1.symbols
index 618a0a0..b7602f9 100644
--- a/debian/libdrm-freedreno1.symbols
+++ b/debian/libdrm-freedreno1.symbols
@@ -2,6 +2,8 @@ libdrm_freedreno.so.1 libdrm-freedreno1 #MINVER#
  fd_bo_cpu_fini@Base 0
  fd_bo_cpu_prep@Base 0
  fd_bo_del@Base 0
+ fd_bo_dmabuf@Base 2.4.57
+ fd_bo_from_dmabuf@Base 2.4.57
  fd_bo_from_fbdev@Base 0
  fd_bo_from_handle@Base 0
  fd_bo_from_name@Base 0
diff --git a/debian/rules b/debian/rules
index 48d5f70..c723001 100755
--- a/debian/rules
+++ b/debian/rules
@@ -98,7 +98,7 @@ endif
dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (= 2.4.39)' -- -c4
 ifeq ($(ARM), yes)
dh_makeshlibs -plibdrm-omap1 -V'libdrm-omap1 (= 2.4.38)' -- -c4
-   dh_makeshlibs -plibdrm-freedreno1 -V'libdrm-freedreno1' -- -c4
+   dh_makeshlibs -plibdrm-freedreno1 -V'libdrm-freedreno1 (= 2.4.57)' -- 
-c4
dh_makeshlibs -plibdrm-exynos1 -V'libdrm-exynos1' -- -c4
 endif
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xap00-0006ag...@moszumanska.debian.org

libdrm: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit efa46b370c85683183ee6480a9ede5baa45197df
Author: Julien Cristau jcris...@debian.org
Date:   Sun Oct 5 19:00:59 2014 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 66c4208..080583c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-libdrm (2.4.58-2) UNRELEASED; urgency=medium
+libdrm (2.4.58-2) unstable; urgency=medium
 
-  * Update libdrm-freedreno1.symbols and shlibs.
+  [ Andreas Boll ]
+  * Update libdrm-freedreno1.symbols and shlibs (fixes FTBFS).
 
- -- Andreas Boll andreas.boll@gmail.com  Sun, 05 Oct 2014 18:48:05 +0200
+ -- Julien Cristau jcris...@debian.org  Sun, 05 Oct 2014 19:00:32 +0200
 
 libdrm (2.4.58-1) unstable; urgency=medium
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xapir-00042m...@moszumanska.debian.org

libdrm: Changes to 'debian-unstable'

[Andreas Boll]

 Android.mk  |   63 
 CleanSpec.mk|3 
 Makefile.am |   29 
 Makefile.sources|   32 
 configure.ac|  194 +-
 debian/changelog|8 
 debian/libdrm-intel1.symbols|1 
 debian/patches/03_hide_symbols.diff | 2389 
 debian/patches/series   |1 
 debian/rules|2 
 exynos/Makefile.am  |1 
 exynos/exynos_drm.c |   37 
 exynos/exynos_fimg2d.c  |   19 
 freedreno/Android.mk|   30 
 freedreno/Makefile.am   |   27 
 freedreno/Makefile.sources  |   24 
 freedreno/freedreno_bo.c|   77 -
 freedreno/freedreno_device.c|   12 
 freedreno/freedreno_drmif.h |2 
 freedreno/freedreno_pipe.c  |   15 
 freedreno/freedreno_priv.h  |   10 
 freedreno/freedreno_ringbuffer.c|   42 
 freedreno/kgsl/kgsl_bo.c|   10 
 freedreno/kgsl/kgsl_device.c|4 
 freedreno/kgsl/kgsl_pipe.c  |4 
 freedreno/kgsl/kgsl_ringbuffer.c|8 
 freedreno/msm/msm_bo.c  |4 
 freedreno/msm/msm_device.c  |4 
 freedreno/msm/msm_pipe.c|4 
 freedreno/msm/msm_ringbuffer.c  |4 
 include/Makefile.am |1 
 include/drm/Makefile.am |   44 
 include/drm/i810_drm.h  |  281 
 include/drm/i830_drm.h  |  342 -
 intel/Android.mk|   55 
 intel/Makefile.am   |   20 
 intel/Makefile.sources  |   14 
 intel/intel_bufmgr.c|  107 +
 intel/intel_bufmgr.h|5 
 intel/intel_bufmgr_fake.c   |   31 
 intel/intel_bufmgr_gem.c|  339 -
 intel/intel_bufmgr_priv.h   |   12 
 intel/intel_decode.c|   19 
 intel/test_decode.c |9 
 libdrm.h|   89 +
 libkms/Android.mk   |   53 
 libkms/Makefile.am  |   25 
 libkms/Makefile.sources |   23 
 libkms/api.c|2 
 libkms/dumb.c   |   13 
 libkms/exynos.c |5 
 libkms/intel.c  |   11 
 libkms/linux.c  |   18 
 libkms/nouveau.c|   11 
 libkms/radeon.c |   13 
 libkms/vmwgfx.c |   11 
 nouveau/Android.mk  |   30 
 nouveau/Makefile.am |   14 
 nouveau/Makefile.sources|9 
 nouveau/abi16.c |4 
 nouveau/bufctx.c|   10 
 nouveau/nouveau.c   |   46 
 nouveau/private.h   |1 
 nouveau/pushbuf.c   |   20 
 omap/Makefile.am|1 
 omap/omap_drm.c |   46 
 radeon/Android.mk   |   30 
 radeon/Makefile.am  |   25 
 radeon/Makefile.sources |   19 
 radeon/r600_pci_ids.h   |7 
 radeon/radeon_bo.c  |   46 
 radeon/radeon_bo_gem.c  |   31 
 radeon/radeon_cs.c  |   50 
 radeon/radeon_cs_gem.c  |9 
 radeon/radeon_cs_space.c|   18 
 radeon/radeon_surface.c |   25 
 tests/dristat.c |4 
 tests/drmstat.c |2 
 tests/modetest/Android.mk   |   14 
 tests/modetest/Makefile.am  |9 
 tests/modetest/Makefile.sources |6 
 tests/modetest/buffers.c|2 
 tests/modetest/cursor.c |2 
 tests/modetest/modetest.c   |4 
 tests/vbltest/vbltest.c |2 
 xf86atomic.h|9 
 xf86drm.c   |8 
 xf86drmMode.c   |2 
 88 files changed, 1524 insertions(+), 3594 deletions(-)

New commits:
commit 40063fa85ee6a4fc52e153c9ba268634a3872096
Author: Andreas Boll andreas.boll@gmail.com
Date:   Thu Oct 2 16:54:08 2014 +0200

Update libdrm-intel1.symbols and shlibs.

diff --git a/debian/changelog b/debian/changelog
index 48be0e3..c4a24c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libdrm (2.4.58-1) UNRELEASED; urgency=medium
 
   * New upstream release.
 - 03_hide_symbols.diff dropped, upstream.
+  * Update libdrm-intel1.symbols and shlibs.
 
  -- Andreas Boll andreas.boll@gmail.com  Thu, 02 Oct 2014 16:22:13 +0200
 
diff --git a/debian/libdrm-intel1.symbols b/debian/libdrm-intel1.symbols
index c1d5e7c..5f07bbf 100644
--- a/debian/libdrm-intel1.symbols
+++ b/debian/libdrm-intel1.symbols
@@ -2,6 +2,7 @@ libdrm_intel.so.1 libdrm-intel1 #MINVER#
  drm_intel_bo_alloc@Base 2.4.1
  drm_intel_bo_alloc_for_render@Base 2.4.5
  drm_intel_bo_alloc_tiled@Base 

libdrm: Changes to 'debian-unstable'

[Maarten Bernardus Lankhorst]

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 61c5e631c09cdeb835524856637e6f63fa100193
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Aug 6 12:44:30 2014 +0200

release to unstable

diff --git a/debian/changelog b/debian/changelog
index e42e156..685ce39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdrm (2.4.56-1) UNRELEASED; urgency=medium
+libdrm (2.4.56-1) unstable; urgency=medium
 
   * New upstream release.
   * Enable building freedreno and exynos on arm. (Closes: #741509)
   * Add a squashed patch from upstream to hide all private symbols.
 - 03_hide_symbols.diff
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Fri, 25 Jul 2014 
10:24:34 +0200
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 06 Aug 2014 
12:15:26 +0200
 
 libdrm (2.4.54-1) unstable; urgency=medium
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xezkc-000264...@moszumanska.debian.org

libdrm: Changes to 'debian-unstable'

[Maarten Lankhorst]

 debian/control |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 69c196490681aea46d339252af86d7a1c42af5c3
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 30 10:41:48 2014 +0200

fix copy paste in description with some more copy paste

diff --git a/debian/control b/debian/control
index 5b99f21..67f2a2e 100644
--- a/debian/control
+++ b/debian/control
@@ -213,11 +213,11 @@ Depends:
  ${misc:Depends},
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
-Description: Userspace interface to omap-specific kernel DRM services -- 
runtime
- This library implements the userspace interface to the omap-specific kernel
- DRM services.  DRM stands for Direct Rendering Manager, which is the
- kernelspace portion of the Direct Rendering Infrastructure (DRI). The DRI is
- currently used on Linux to provide hardware-accelerated OpenGL drivers.
+Description: Userspace interface to msm/kgsl-specific kernel DRM services -- 
runtime
+ This library implements the userspace interface to the kernel DRM services.
+ DRM stands for Direct Rendering Manager, which is the kernelspace portion
+ of the Direct Rendering Infrastructure (DRI). The DRI is currently used on
+ Linux to provide hardware-accelerated OpenGL drivers.
 
 Package: libdrm-freedreno1-dbg
 Section: debug
@@ -227,7 +227,7 @@ Depends:
  libdrm-freedreno1 (= ${binary:Version}),
  ${misc:Depends},
 Multi-Arch: same
-Description: Userspace interface to omap-specific kernel DRM services -- 
debugging symbols
+Description: Userspace interface to msm/kgsl-specific kernel DRM services -- 
debugging symbols
  This library implements the userspace interface to the kernel DRM services.
  DRM stands for Direct Rendering Manager, which is the kernelspace portion
  of the Direct Rendering Infrastructure (DRI). The DRI is currently used on
@@ -243,11 +243,11 @@ Depends:
  ${misc:Depends},
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
-Description: Userspace interface to omap-specific kernel DRM services -- 
runtime
- This library implements the userspace interface to the omap-specific kernel
- DRM services.  DRM stands for Direct Rendering Manager, which is the
- kernelspace portion of the Direct Rendering Infrastructure (DRI). The DRI is
- currently used on Linux to provide hardware-accelerated OpenGL drivers.
+Description: Userspace interface to exynos-specific kernel DRM services -- 
runtime
+ This library implements the userspace interface to the kernel DRM services.
+ DRM stands for Direct Rendering Manager, which is the kernelspace portion
+ of the Direct Rendering Infrastructure (DRI). The DRI is currently used on
+ Linux to provide hardware-accelerated OpenGL drivers.
 
 Package: libdrm-exynos1-dbg
 Section: debug
@@ -257,7 +257,7 @@ Depends:
  libdrm-exynos1 (= ${binary:Version}),
  ${misc:Depends},
 Multi-Arch: same
-Description: Userspace interface to omap-specific kernel DRM services -- 
debugging symbols
+Description: Userspace interface to exynos-specific kernel DRM services -- 
debugging symbols
  This library implements the userspace interface to the kernel DRM services.
  DRM stands for Direct Rendering Manager, which is the kernelspace portion
  of the Direct Rendering Infrastructure (DRI). The DRI is currently used on


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xcpsd-000830...@moszumanska.debian.org

libdrm: Changes to 'debian-unstable'

[Maarten Lankhorst]

 configure.ac   |2 
 debian/changelog   |4 -
 debian/libdrm-freedreno1.lintian-overrides |1 
 debian/libdrm-freedreno1.symbols   |4 -
 debian/libdrm-intel1.symbols   |6 -
 debian/libdrm-nouveau2.symbols |7 --
 debian/libdrm-radeon1.lintian-overrides|1 
 debian/libdrm-radeon1.symbols  |   19 -
 debian/patches/03_hide_symbols.diff|   98 +
 debian/patches/series  |1 
 include/drm/qxl_drm.h  |2 
 radeon/radeon_surface.c|2 
 12 files changed, 105 insertions(+), 42 deletions(-)

New commits:
commit abba37f34253ffe0ed2c6e5833f5e0f35f413fd3
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 30 11:42:20 2014 +0200

bump version

diff --git a/debian/changelog b/debian/changelog
index 90e937b..3cb47be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.55-1) UNRELEASED; urgency=medium
+libdrm (2.4.56-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Enable building freedreno and exynos on arm. (Closes: #741509)

commit c8e6bc23d5baaa59739d33d0019a10097425ce59
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 30 11:40:02 2014 +0200

Add a patch to hide all private symbols.

03_hide_symbols.diff

diff --git a/debian/changelog b/debian/changelog
index f899150..90e937b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ libdrm (2.4.55-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Enable building freedreno and exynos on arm. (Closes: #741509)
+  * Add a patch to hide all private symbols.
+- 03_hide_symbols.diff
 
  -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Fri, 25 Jul 2014 
10:24:34 +0200
 
diff --git a/debian/libdrm-freedreno1.lintian-overrides 
b/debian/libdrm-freedreno1.lintian-overrides
deleted file mode 100644
index 2efb4e6..000
--- a/debian/libdrm-freedreno1.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libdrm-freedreno1: symbols-declares-dependency-on-other-package 
libdrm-freedreno-private
diff --git a/debian/libdrm-freedreno1.symbols b/debian/libdrm-freedreno1.symbols
index 751d8e4..4321a4f 100644
--- a/debian/libdrm-freedreno1.symbols
+++ b/debian/libdrm-freedreno1.symbols
@@ -1,8 +1,4 @@
 libdrm_freedreno.so.1 libdrm-freedreno1 #MINVER#
-| libdrm-freedreno-private
- is_kgsl_pipe@Base 0 1
- (regex)^msm_.*@Base 0 1
- (regex)^kgsl_.*@Base 0 1
  fd_bo_cpu_fini@Base 0
  fd_bo_cpu_prep@Base 0
  fd_bo_del@Base 0
diff --git a/debian/libdrm-intel1.symbols b/debian/libdrm-intel1.symbols
index d5c48aa..c1d5e7c 100644
--- a/debian/libdrm-intel1.symbols
+++ b/debian/libdrm-intel1.symbols
@@ -67,9 +67,3 @@ libdrm_intel.so.1 libdrm-intel1 #MINVER#
  drm_intel_get_pipe_from_crtc_id@Base 2.4.11
  drm_intel_get_reset_stats@Base 2.4.48
  drm_intel_reg_read@Base 2.4.38
- drm_mmAllocMem@Base 2.4.1
- drm_mmDestroy@Base 2.4.1
- drm_mmDumpMemInfo@Base 2.4.1
- drm_mmFindBlock@Base 2.4.1
- drm_mmFreeMem@Base 2.4.1
- drm_mmInit@Base 2.4.1
diff --git a/debian/libdrm-nouveau2.symbols b/debian/libdrm-nouveau2.symbols
index 278ee55..bd64f4b 100644
--- a/debian/libdrm-nouveau2.symbols
+++ b/debian/libdrm-nouveau2.symbols
@@ -1,12 +1,5 @@
 libdrm_nouveau.so.2 libdrm-nouveau2 #MINVER#
 | libdrm-nouveau-private
- abi16_bo_info@Base 0 1
- abi16_bo_init@Base 0 1
- abi16_chan_nv04@Base 0 1
- abi16_chan_nvc0@Base 0 1
- abi16_chan_nve0@Base 0 1
- abi16_engobj@Base 0 1
- abi16_ntfy@Base 0 1
  nouveau_bo_map@Base 2.4.34
  nouveau_bo_name_get@Base 2.4.34
  nouveau_bo_name_ref@Base 2.4.34
diff --git a/debian/libdrm-radeon1.lintian-overrides 
b/debian/libdrm-radeon1.lintian-overrides
deleted file mode 100644
index 0e452e0..000
--- a/debian/libdrm-radeon1.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libdrm-radeon1: symbols-declares-dependency-on-other-package 
libdrm-radeon-private
diff --git a/debian/libdrm-radeon1.symbols b/debian/libdrm-radeon1.symbols
index e9578a6..5a763a4 100644
--- a/debian/libdrm-radeon1.symbols
+++ b/debian/libdrm-radeon1.symbols
@@ -1,23 +1,4 @@
 libdrm_radeon.so.1 libdrm-radeon1 #MINVER#
-| libdrm-radeon-private
- bof_array@Base 0 1
- bof_array_append@Base 0 1
- bof_array_get@Base 0 1
- bof_array_size@Base 0 1
- bof_blob@Base 0 1
- bof_blob_size@Base 0 1
- bof_blob_value@Base 0 1
- bof_decref@Base 0 1
- bof_dump_file@Base 0 1
- bof_incref@Base 0 1
- bof_int32@Base 0 1
- bof_int32_value@Base 0 1
- bof_load_file@Base 0 1
- bof_object@Base 0 1
- bof_object_get@Base 0 1
- bof_object_set@Base 0 1
- bof_print@Base 0 1
- bof_string@Base 0 1
  radeon_bo_debug@Base 2.4.17
  radeon_bo_get_handle@Base 2.4.17
  radeon_bo_get_src_domain@Base 2.4.17
diff --git a/debian/patches/03_hide_symbols.diff 
b/debian/patches/03_hide_symbols.diff
new file mode 100644
index 000..71a01f7
--- /dev/null
+++ b/debian/patches/03_hide_symbols.diff
@@ -0,0 

libdrm: Changes to 'debian-unstable'

[Maarten Lankhorst]

 debian/control   |4 ++--
 debian/patches/02_fix_qxl_drm_h.diff |   33 -
 debian/patches/series|1 -
 3 files changed, 2 insertions(+), 36 deletions(-)

New commits:
commit 3d9b1e691680272bb49a445bbfc0713f05b67f62
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 30 12:09:10 2014 +0200

fix too long description for freedreno

diff --git a/debian/control b/debian/control
index 67f2a2e..7110c19 100644
--- a/debian/control
+++ b/debian/control
@@ -213,7 +213,7 @@ Depends:
  ${misc:Depends},
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
-Description: Userspace interface to msm/kgsl-specific kernel DRM services -- 
runtime
+Description: Userspace interface to msm/kgsl kernel DRM services -- runtime
  This library implements the userspace interface to the kernel DRM services.
  DRM stands for Direct Rendering Manager, which is the kernelspace portion
  of the Direct Rendering Infrastructure (DRI). The DRI is currently used on
@@ -227,7 +227,7 @@ Depends:
  libdrm-freedreno1 (= ${binary:Version}),
  ${misc:Depends},
 Multi-Arch: same
-Description: Userspace interface to msm/kgsl-specific kernel DRM services -- 
debugging symbols
+Description: Userspace interface to msm/kgsl kernel DRM services -- debugging 
symbols
  This library implements the userspace interface to the kernel DRM services.
  DRM stands for Direct Rendering Manager, which is the kernelspace portion
  of the Direct Rendering Infrastructure (DRI). The DRI is currently used on

commit 8004a0512617bc74f62b43d2fd599469ee4a4625
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 30 11:44:36 2014 +0200

drop upstreamed patch

diff --git a/debian/patches/02_fix_qxl_drm_h.diff 
b/debian/patches/02_fix_qxl_drm_h.diff
deleted file mode 100644
index 4018ca7..000
--- a/debian/patches/02_fix_qxl_drm_h.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-From 1d048a8f2caec10eb0c9647f0554a60be619602d Mon Sep 17 00:00:00 2001
-From: Andreas Boll andreas.boll@gmail.com
-Date: Mon, 5 May 2014 23:28:23 +0200
-Subject: [PATCH libdrm] libdrm: Fix drm.h include in qxl drm header file
-
-Use drm.h instead of drm/drm.h as used in the other header files.
-Fixes xserver-xorg-video-qxl build with KMS support on Debian, where this
-file is installed in /usr/include/libdrm.
-
-Fixes Debian bug #746807
-
-Reported-by: Bastian Blank wa...@debian.org
-Signed-off-by: Andreas Boll andreas.boll@gmail.com

- include/drm/qxl_drm.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/drm/qxl_drm.h b/include/drm/qxl_drm.h
-index 5d7de70..1e331a8 100644
 a/include/drm/qxl_drm.h
-+++ b/include/drm/qxl_drm.h
-@@ -25,7 +25,7 @@
- #define QXL_DRM_H
- 
- #include stddef.h
--#include drm/drm.h
-+#include drm.h
- 
- /* Please note that modifications to all structs defined here are
-  * subject to backwards-compatibility constraints.
--- 
-1.9.2
-
diff --git a/debian/patches/series b/debian/patches/series
index eb3793b..c9175c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01_default_perms.diff
-02_fix_qxl_drm_h.diff
 03_hide_symbols.diff
\ No newline at end of file


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xcqow-0002c7...@moszumanska.debian.org

libdrm: Changes to 'debian-unstable'

[Maarten Lankhorst]

 debian/control |  108 +++--
 1 file changed, 60 insertions(+), 48 deletions(-)

New commits:
commit cdc8731e6283274db1caf124312175a6c2d30f9d
Author: Fabio Pedretti fabio@libero.it
Date:   Wed Jul 30 15:43:21 2014 +0200

debian/control: consolidate packages description

diff --git a/debian/control b/debian/control
index 7110c19..6eb075f 100644
--- a/debian/control
+++ b/debian/control
@@ -96,10 +96,11 @@ Depends:
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: Userspace interface to intel-specific kernel DRM services -- 
runtime
- This library implements the userspace interface to the intel-specific kernel
- DRM services.  DRM stands for Direct Rendering Manager, which is the
- kernelspace portion of the Direct Rendering Infrastructure (DRI). The DRI is
- currently used on Linux to provide hardware-accelerated OpenGL drivers.
+ This library implements the userspace interface to the kernel DRM
+ services.  DRM stands for Direct Rendering Manager, which is the
+ kernelspace portion of the Direct Rendering Infrastructure (DRI).
+ The DRI is currently used on Linux to provide hardware-accelerated
+ OpenGL drivers.
 
 Package: libdrm-intel1-dbg
 Section: debug
@@ -110,10 +111,11 @@ Depends:
  ${misc:Depends},
 Multi-Arch: same
 Description: Userspace interface to intel-specific kernel DRM services -- 
debugging symbols
- This library implements the userspace interface to the kernel DRM services.
- DRM stands for Direct Rendering Manager, which is the kernelspace portion
- of the Direct Rendering Infrastructure (DRI). The DRI is currently used on
- Linux to provide hardware-accelerated OpenGL drivers.
+ This library implements the userspace interface to the kernel DRM
+ services.  DRM stands for Direct Rendering Manager, which is the
+ kernelspace portion of the Direct Rendering Infrastructure (DRI).
+ The DRI is currently used on Linux to provide hardware-accelerated
+ OpenGL drivers.
  .
  This package provides the debugging symbols for the libdrm-intel1 package.
 
@@ -125,10 +127,11 @@ Depends: ${shlibs:Depends},
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: Userspace interface to nouveau-specific kernel DRM services -- 
runtime
- This library implements the userspace interface to the nouveau-specific kernel
- DRM services. DRM stands for Direct Rendering Manager, which is the
- kernelspace portion of the Direct Rendering Infrastructure (DRI). The DRI is
- currently used on Linux to provide hardware-accelerated OpenGL drivers.
+ This library implements the userspace interface to the kernel DRM
+ services.  DRM stands for Direct Rendering Manager, which is the
+ kernelspace portion of the Direct Rendering Infrastructure (DRI).
+ The DRI is currently used on Linux to provide hardware-accelerated
+ OpenGL drivers.
 
 Package: libdrm-nouveau2-dbg
 Section: debug
@@ -138,10 +141,11 @@ Depends: libdrm-nouveau2 (= ${binary:Version}),
  ${misc:Depends},
 Multi-Arch: same
 Description: Userspace interface to nouveau-specific kernel DRM -- debugging 
symbols
- This library implements the userspace interface to the kernel DRM services.
- DRM stands for Direct Rendering Manager, which is the kernelspace portion
- of the Direct Rendering Infrastructure (DRI). The DRI is currently used on
- Linux to provide hardware-accelerated OpenGL drivers.
+ This library implements the userspace interface to the kernel DRM
+ services.  DRM stands for Direct Rendering Manager, which is the
+ kernelspace portion of the Direct Rendering Infrastructure (DRI).
+ The DRI is currently used on Linux to provide hardware-accelerated
+ OpenGL drivers.
  .
  This package provides the debugging symbols for the libdrm-nouveau2 package.
 
@@ -154,10 +158,11 @@ Depends:
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: Userspace interface to radeon-specific kernel DRM services -- 
runtime
- This library implements the userspace interface to the radeon-specific kernel
- DRM services.  DRM stands for Direct Rendering Manager, which is the
- kernelspace portion of the Direct Rendering Infrastructure (DRI). The DRI is
- currently used on Linux to provide hardware-accelerated OpenGL drivers.
+ This library implements the userspace interface to the kernel DRM
+ services.  DRM stands for Direct Rendering Manager, which is the
+ kernelspace portion of the Direct Rendering Infrastructure (DRI).
+ The DRI is currently used on Linux to provide hardware-accelerated
+ OpenGL drivers.
 
 Package: libdrm-radeon1-dbg
 Section: debug
@@ -168,10 +173,11 @@ Depends:
  ${misc:Depends},
 Multi-Arch: same
 Description: Userspace interface to radeon-specific kernel DRM services -- 
debugging symbols
- This library implements the userspace interface to the kernel DRM services.
- DRM stands for Direct Rendering Manager, which is the kernelspace portion
- of the Direct Rendering Infrastructure (DRI). The DRI is currently used on
- Linux to provide 

libdrm: Changes to 'debian-unstable'

[Maarten Lankhorst]

 debian/changelog |7 +++
 debian/control   |   62 +++
 debian/libdrm-exynos1.symbols|   20 
 debian/libdrm-freedreno1.install |1 
 debian/libdrm-freedreno1.lintian-overrides   |1 
 debian/libdrm-freedreno1.symbols |   40 +
 debian/patches/03_fix_exynos_test_ftbfs.diff |   23 ++
 debian/patches/series|1 
 debian/rules |   18 +--
 9 files changed, 168 insertions(+), 5 deletions(-)

New commits:
commit 2ad898100e88fff8076133b5c791a364b4bc29e0
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Fri Jul 25 11:43:50 2014 +0200

Add a patch to fix FTBFS with exynos.

diff --git a/debian/changelog b/debian/changelog
index abd3ac1..eac5e3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libdrm (2.4.54-2) UNRELEASED; urgency=medium
 
   * Enable building freedreno and exynos on arm. (Closes: #741509)
+  * Add a patch to fix FTBFS with exynos.
 
  -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Fri, 25 Jul 2014 
10:24:34 +0200
 
diff --git a/debian/patches/03_fix_exynos_test_ftbfs.diff 
b/debian/patches/03_fix_exynos_test_ftbfs.diff
new file mode 100644
index 000..b94545e
--- /dev/null
+++ b/debian/patches/03_fix_exynos_test_ftbfs.diff
@@ -0,0 +1,23 @@
+commit a328b02c1d0b2e19e3587221aa290f05e33baefe
+Author: Maarten Lankhorst maarten.lankho...@canonical.com
+Date:   Fri Jul 25 11:22:24 2014 +0200
+
+exynos: do not build fimg2d_test when building without libkms support.
+
+This prevents a build failure.
+
+Signed-off-by: Maarten Lankhorst maarten.lankho...@canonical.com
+
+--- a/tests/exynos/Makefile.am
 b/tests/exynos/Makefile.am
+@@ -4,8 +4,10 @@
+   -I $(top_srcdir)/exynos \
+   -I $(top_srcdir)
+ 
++if HAVE_LIBKMS
+ noinst_PROGRAMS = \
+   exynos_fimg2d_test
++endif
+ 
+ exynos_fimg2d_test_LDADD = \
+   $(top_builddir)/libdrm.la \
diff --git a/debian/patches/series b/debian/patches/series
index d2f7405..cc77303 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_default_perms.diff
 02_fix_qxl_drm_h.diff
+03_fix_exynos_test_ftbfs.diff

commit 99f0810d7b83a1a7eb07a1dfe61dd130a3e572f0
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Fri Jul 25 11:16:43 2014 +0200

build exynos on arm too

diff --git a/debian/changelog b/debian/changelog
index f7c19e7..abd3ac1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 libdrm (2.4.54-2) UNRELEASED; urgency=medium
 
-  * Enable building freedreno on arm. (Closes: #741509)
+  * Enable building freedreno and exynos on arm. (Closes: #741509)
 
  -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Fri, 25 Jul 2014 
10:24:34 +0200
 
diff --git a/debian/control b/debian/control
index 476be5a..5b99f21 100644
--- a/debian/control
+++ b/debian/control
@@ -29,6 +29,7 @@ Depends:
  libdrm-nouveau2 (= ${binary:Version}) [linux-any],
  libdrm-omap1 (= ${binary:Version}) [any-arm],
  libdrm-freedreno1 (= ${binary:Version}) [any-arm],
+ libdrm-exynos1 (= ${binary:Version}) [any-arm],
  ${misc:Depends},
 Multi-Arch: same
 Replaces:
@@ -233,3 +234,33 @@ Description: Userspace interface to omap-specific kernel 
DRM services -- debuggi
  Linux to provide hardware-accelerated OpenGL drivers.
  .
  This package provides the debugging symbols for the libdrm-freedreno1 package.
+
+Package: libdrm-exynos1
+Section: libs
+Architecture: any-arm
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: Userspace interface to omap-specific kernel DRM services -- 
runtime
+ This library implements the userspace interface to the omap-specific kernel
+ DRM services.  DRM stands for Direct Rendering Manager, which is the
+ kernelspace portion of the Direct Rendering Infrastructure (DRI). The DRI is
+ currently used on Linux to provide hardware-accelerated OpenGL drivers.
+
+Package: libdrm-exynos1-dbg
+Section: debug
+Priority: extra
+Architecture: any-arm
+Depends:
+ libdrm-exynos1 (= ${binary:Version}),
+ ${misc:Depends},
+Multi-Arch: same
+Description: Userspace interface to omap-specific kernel DRM services -- 
debugging symbols
+ This library implements the userspace interface to the kernel DRM services.
+ DRM stands for Direct Rendering Manager, which is the kernelspace portion
+ of the Direct Rendering Infrastructure (DRI). The DRI is currently used on
+ Linux to provide hardware-accelerated OpenGL drivers.
+ .
+ This package provides the debugging symbols for the libdrm-exynos1 package.
diff --git a/debian/libdrm-exynos1.symbols b/debian/libdrm-exynos1.symbols
new file mode 100644
index 000..445f2b4
--- /dev/null
+++ b/debian/libdrm-exynos1.symbols
@@ -0,0 +1,20 @@
+libdrm_exynos.so.1 libdrm-exynos1 #MINVER#
+ exynos_bo_create@Base 0
+ exynos_bo_destroy@Base 0

libdrm: Changes to 'debian-unstable'

[Maarten Lankhorst]

 debian/libdrm-exynos1.install |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e9ffcd2127923bfe159244daf86d6ecb89fd43e3
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Fri Jul 25 11:51:39 2014 +0200

add missing libdrm-exynos1.install

diff --git a/debian/libdrm-exynos1.install b/debian/libdrm-exynos1.install
new file mode 100644
index 000..ce2fbc9
--- /dev/null
+++ b/debian/libdrm-exynos1.install
@@ -0,0 +1 @@
+usr/lib/*/libdrm_exynos.so.1*


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xacac-0002zu...@moszumanska.debian.org

libdrm: Changes to 'debian-unstable'

[Maarten Lankhorst]

 configure.ac |2 -
 debian/changelog |4 +-
 debian/patches/03_fix_exynos_test_ftbfs.diff |   23 ---
 debian/patches/series|1 
 exynos/exynos_drm.c  |   52 ++-
 exynos/exynos_drmif.h|2 -
 exynos/exynos_fimg2d.c   |8 ++--
 exynos/fimg2d.h  |2 -
 freedreno/freedreno_drmif.h  |1 
 freedreno/kgsl/kgsl_pipe.c   |3 +
 freedreno/msm/msm_drm.h  |   12 ++
 freedreno/msm/msm_pipe.c |5 ++
 freedreno/msm/msm_priv.h |1 
 include/drm/drm.h|8 
 include/drm/i915_drm.h   |   19 +
 radeon/radeon_surface.c  |   18 -
 tests/exynos/Makefile.am |9 +++-
 tests/exynos/exynos_fimg2d_test.c|2 -
 tests/radeon/radeon_ttm.c|2 +
 xf86drm.c|   13 --
 xf86drmMode.h|4 ++
 21 files changed, 91 insertions(+), 100 deletions(-)

New commits:
commit bca5f71beba691ce4036e41cfb73ae65161e4c94
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Fri Jul 25 15:27:29 2014 +0200

bump changelog, and remove ftbfs patch, upstream

diff --git a/debian/changelog b/debian/changelog
index eac5e3e..f899150 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-libdrm (2.4.54-2) UNRELEASED; urgency=medium
+libdrm (2.4.55-1) UNRELEASED; urgency=medium
 
+  * New upstream release.
   * Enable building freedreno and exynos on arm. (Closes: #741509)
-  * Add a patch to fix FTBFS with exynos.
 
  -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Fri, 25 Jul 2014 
10:24:34 +0200
 
diff --git a/debian/patches/03_fix_exynos_test_ftbfs.diff 
b/debian/patches/03_fix_exynos_test_ftbfs.diff
deleted file mode 100644
index b94545e..000
--- a/debian/patches/03_fix_exynos_test_ftbfs.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-commit a328b02c1d0b2e19e3587221aa290f05e33baefe
-Author: Maarten Lankhorst maarten.lankho...@canonical.com
-Date:   Fri Jul 25 11:22:24 2014 +0200
-
-exynos: do not build fimg2d_test when building without libkms support.
-
-This prevents a build failure.
-
-Signed-off-by: Maarten Lankhorst maarten.lankho...@canonical.com
-
 a/tests/exynos/Makefile.am
-+++ b/tests/exynos/Makefile.am
-@@ -4,8 +4,10 @@
-   -I $(top_srcdir)/exynos \
-   -I $(top_srcdir)
- 
-+if HAVE_LIBKMS
- noinst_PROGRAMS = \
-   exynos_fimg2d_test
-+endif
- 
- exynos_fimg2d_test_LDADD = \
-   $(top_builddir)/libdrm.la \
diff --git a/debian/patches/series b/debian/patches/series
index cc77303..d2f7405 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01_default_perms.diff
 02_fix_qxl_drm_h.diff
-03_fix_exynos_test_ftbfs.diff

commit 6f15ca80815ae34d412c9fbdf526d69c45561a0f
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Fri Jul 25 15:08:23 2014 +0200

bump to version 2.4.55 for release

diff --git a/configure.ac b/configure.ac
index 1c78c45..a7be095 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 
 AC_PREREQ([2.63])
 AC_INIT([libdrm],
-[2.4.54],
+[2.4.55],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
 [libdrm])
 

commit a328b02c1d0b2e19e3587221aa290f05e33baefe
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Fri Jul 25 11:22:24 2014 +0200

exynos: do not build fimg2d_test when building without libkms support.

This prevents a build failure.

Signed-off-by: Maarten Lankhorst maarten.lankho...@canonical.com

diff --git a/tests/exynos/Makefile.am b/tests/exynos/Makefile.am
index 518f00b..92de4e4 100644
--- a/tests/exynos/Makefile.am
+++ b/tests/exynos/Makefile.am
@@ -4,6 +4,7 @@ AM_CFLAGS = \
-I $(top_srcdir)/exynos \
-I $(top_srcdir)
 
+if HAVE_LIBKMS
 if HAVE_INSTALL_TESTS
 bin_PROGRAMS = \
exynos_fimg2d_test
@@ -11,6 +12,7 @@ else
 noinst_PROGRAMS = \
exynos_fimg2d_test
 endif
+endif
 
 exynos_fimg2d_test_LDADD = \
$(top_builddir)/libdrm.la \

commit c0b34dca2632a774249cfa3b969c3f7ce9df33e1
Author: Thomas Klausner w...@netbsd.org
Date:   Tue Jul 15 19:22:55 2014 +0200

radeon: Add missing header includes.

unistd.h for close() and xf86drm.h for drmOpen().

Signed-off-by: Thomas Klausner w...@netbsd.org

diff --git a/tests/radeon/radeon_ttm.c b/tests/radeon/radeon_ttm.c
index 246fd99..ac3297a 100644
--- a/tests/radeon/radeon_ttm.c
+++ b/tests/radeon/radeon_ttm.c
@@ -25,7 +25,9 @@
  */
 #include stdio.h
 #include stdlib.h
+#include unistd.h
 #include rbo.h
+#include xf86drm.h
 
 /* allocate as many single page bo to try to starve the kernel
  * 

libdrm: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b4a23f2a83530101da959f4a63725a9033111af3
Author: Julien Cristau jcris...@debian.org
Date:   Sat May 10 15:38:22 2014 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 9d1639c..c06edd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-libdrm (2.4.54-1) UNRELEASED; urgency=medium
+libdrm (2.4.54-1) unstable; urgency=medium
 
+  [ Andreas Boll ]
   * New upstream release.
   * Add 02_fix_qxl_drm_h.diff (Closes: #746807).
 
- -- Andreas Boll andreas.boll@gmail.com  Mon, 05 May 2014 23:22:29 +0200
+ -- Julien Cristau jcris...@debian.org  Sat, 10 May 2014 15:38:16 +0200
 
 libdrm (2.4.53-1) unstable; urgency=medium
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wj7zg-0006yq...@moszumanska.debian.org

libdrm: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 61c22ccc41e8dcf8144b754b6b9a229ffec16142
Author: Julien Cristau jcris...@debian.org
Date:   Sun Apr 27 22:15:58 2014 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index d29bfb9..d441909 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-libdrm (2.4.53-1) UNRELEASED; urgency=medium
+libdrm (2.4.53-1) unstable; urgency=medium
 
+  [ Timo Aaltonen ]
   * New upstream release.
 - 02_kbsd_modeset.diff dropped, upstream
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Fri, 11 Apr 2014 18:41:57 +0300
+ -- Julien Cristau jcris...@debian.org  Sun, 27 Apr 2014 22:15:55 +0200
 
 libdrm (2.4.52-1) unstable; urgency=medium
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wevbe-0004hk...@moszumanska.debian.org

libdrm: Changes to 'debian-unstable'

[Maarten Lankhorst]

 Makefile.am  |2 
 configure.ac |2 
 debian/changelog |8 +
 freedreno/freedreno_device.c |   12 ++
 freedreno/freedreno_drmif.h  |1 
 freedreno/freedreno_priv.h   |2 
 include/drm/i915_drm.h   |  113 ---
 intel/intel_bufmgr.h |   12 +-
 intel/intel_bufmgr_gem.c |   47 -
 libkms/Makefile.am   |5 +
 libkms/exynos.c  |  207 +++
 libkms/internal.h|2 
 libkms/linux.c   |4 
 tests/kmstest/main.c |1 
 tests/modetest/modetest.c|   35 +--
 xf86drm.h|8 +
 xf86drmMode.c|   19 +++
 17 files changed, 444 insertions(+), 36 deletions(-)

New commits:
commit 928d846a2dacc41d8aaf4a2c54f82b5df8e48fb7
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Fri Jan 24 13:42:11 2014 +0100

release to unstable

diff --git a/debian/changelog b/debian/changelog
index f1b5fa8..952fe3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.52-1) UNRELEASED; urgency=medium
+libdrm (2.4.52-1) unstable; urgency=medium
 
   [ Julien Cristau ]
   * Remove Cyril Brulebois from Uploaders.
@@ -6,7 +6,7 @@ libdrm (2.4.52-1) UNRELEASED; urgency=medium
   [ Maarten Lankhorst ]
   * New upstream release.
 
- -- Julien Cristau jcris...@debian.org  Mon, 20 Jan 2014 13:51:56 +0100
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Fri, 24 Jan 2014 
13:41:57 +0100
 
 libdrm (2.4.51-1) unstable; urgency=medium
 

commit c963bfdc76ce02aa20210b3314422b101bb12239
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Fri Jan 24 13:40:35 2014 +0100

New upstream release.

diff --git a/debian/changelog b/debian/changelog
index 6b22b7f..f1b5fa8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
-libdrm (2.4.51-2) UNRELEASED; urgency=medium
+libdrm (2.4.52-1) UNRELEASED; urgency=medium
 
+  [ Julien Cristau ]
   * Remove Cyril Brulebois from Uploaders.
 
+  [ Maarten Lankhorst ]
+  * New upstream release.
+
  -- Julien Cristau jcris...@debian.org  Mon, 20 Jan 2014 13:51:56 +0100
 
 libdrm (2.4.51-1) unstable; urgency=medium

commit 46d451c9a9514df9de01df647a3f397c5b5d7d1a
Author: Kenneth Graunke kenn...@whitecape.org
Date:   Mon Jan 13 15:47:15 2014 -0800

Bump the version to 2.4.52

Signed-off-by: Kenneth Graunke kenn...@whitecape.org

diff --git a/configure.ac b/configure.ac
index d0d051a..969fb83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 
 AC_PREREQ([2.63])
 AC_INIT([libdrm],
-[2.4.51],
+[2.4.52],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
 [libdrm])
 

commit edf17dbdaa525fe3a9abbbfafa768c556cfd7af2
Author: Kenneth Graunke kenn...@whitecape.org
Date:   Mon Jan 13 14:14:36 2014 -0800

intel: Create a new drm_intel_bo offset64 field.

The existing 'offset' field is unfortunately typed as 'unsigned long',
which is unfortunately only 4 bytes with a 32-bit userspace.

Traditionally, the hardware has only supported 32-bit virtual addresses,
so even though the kernel uses a __u64, the value would always fit.

However, Broadwell supports 48-bit addressing.  So with a 64-bit kernel,
the card virtual address may be too large to fit in the 'offset' field.

Ideally, we would change the type of 'offset' to be a uint64_t---but
this would break the libdrm ABI.  Instead, we create a new 'offset64'
field to hold the full 64-bit value from the kernel, and store the
32-bit truncation in the existing 'offset' field, for compatibility.

Signed-off-by: Kenneth Graunke kenn...@whitecape.org
Reviewed-by: Eric Anholt e...@anholt.net
Reviewed-by: Ben Widawsky b...@bwidawsk.net
Reviewed-by: Ian Romanick ian.d.roman...@intel.com

diff --git a/intel/intel_bufmgr.h b/intel/intel_bufmgr.h
index 2eb9742..9383c72 100644
--- a/intel/intel_bufmgr.h
+++ b/intel/intel_bufmgr.h
@@ -61,9 +61,8 @@ struct _drm_intel_bo {
unsigned long align;
 
/**
-* Last seen card virtual address (offset from the beginning of the
-* aperture) for the object.  This should be used to fill relocation
-* entries when calling drm_intel_bo_emit_reloc()
+* Deprecated field containing (possibly the low 32-bits of) the last
+* seen virtual card address.  Use offset64 instead.
 */
unsigned long offset;
 
@@ -84,6 +83,13 @@ struct _drm_intel_bo {
 * MM-specific handle for accessing object
 */
int handle;
+
+   /**
+* Last seen card virtual address (offset from the beginning of the
+* aperture) for the object.  This should be used to fill relocation
+* entries when calling drm_intel_bo_emit_reloc()
+*/
+   uint64_t offset64;
 };
 
 enum aub_dump_bmp_format {
diff --git 

libdrm: Changes to 'debian-unstable'

[Maarten Lankhorst]

 ChangeLog   |   10 ++
 debian/changelog|8 
 radeon/radeon_surface.c |2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 12d21e30df0b497466ed1ac35ba4bc86bfe4a1c3
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Tue Nov 26 15:26:06 2013 +0100

release to unstable

diff --git a/debian/changelog b/debian/changelog
index 41875e4..46db1b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdrm (2.4.49-2) UNRELEASED; urgency=low
+libdrm (2.4.49-2) unstable; urgency=low
 
   * Cherry-pick a commit from upstream to fix a radeonsi regression.
 - c8a437f4c76: radeon: Update unaligned offset for 2D-1D tiling
   transition on SI
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 26 Nov 2013 
15:20:22 +0100
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 26 Nov 2013 
15:25:45 +0100
 
 libdrm (2.4.49-1) unstable; urgency=low
 

commit 76b99fc1966ecaca4bb1a1f3939c58440481b8da
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Tue Nov 26 15:24:20 2013 +0100

Add changelog entry.

diff --git a/ChangeLog b/ChangeLog
index 763bfac..dbac022 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+commit c8a437f4c76527b3c8385699ccee07f35fe3f166
+Author: Michel Dänzer michel.daen...@amd.com
+Date:   Tue Nov 26 18:16:03 2013 +0900
+
+radeon: Update unaligned offset for 2D-1D tiling transition on SI
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71983
+
+Tested-by: Arek Ruśniak arek.r...@gmail.com
+
 commit 7ddc98f92f92560e2b52287ae8cf816ca4a057de
 Author: Marek Olšák marek.ol...@amd.com
 Date:   Sat Nov 23 01:27:57 2013 +0100
diff --git a/debian/changelog b/debian/changelog
index 5521f67..41875e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libdrm (2.4.49-2) UNRELEASED; urgency=low
+
+  * Cherry-pick a commit from upstream to fix a radeonsi regression.
+- c8a437f4c76: radeon: Update unaligned offset for 2D-1D tiling
+  transition on SI
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 26 Nov 2013 
15:20:22 +0100
+
 libdrm (2.4.49-1) unstable; urgency=low
 
   * New upstream release.

commit c707ca1bf6603d67ea0903c8392e792cbc918a7d
Author: Michel Dänzer michel.daen...@amd.com
Date:   Tue Nov 26 18:16:03 2013 +0900

radeon: Update unaligned offset for 2D-1D tiling transition on SI

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71983

Tested-by: Arek Ruśniak arek.r...@gmail.com
(cherry picked from commit c8a437f4c76527b3c8385699ccee07f35fe3f166)

diff --git a/radeon/radeon_surface.c b/radeon/radeon_surface.c
index b528a48..dcbbfdc 100644
--- a/radeon/radeon_surface.c
+++ b/radeon/radeon_surface.c
@@ -1667,7 +1667,7 @@ static int si_surface_init_2d(struct 
radeon_surface_manager *surf_man,
 return si_surface_init_1d(surf_man, surf, level, bpe, tile_mode, 
offset, i);
 }
 /* level0 and first mipmap need to have alignment */
-aligned_offset = surf-bo_size;
+aligned_offset = offset = surf-bo_size;
 if ((i == 0)) {
 aligned_offset = ALIGN(aligned_offset, surf-bo_alignment);
 }


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vljdn-0005ul...@moszumanska.debian.org

libdrm: Changes to 'debian-unstable'

[Maarten Lankhorst]

 debian/changelog  |   11 +++
 debian/control|3 ++-
 nouveau/pushbuf.c |3 ++-
 3 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 2694c321dcd7bfad51acaa49961b7a86631e3b21
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Nov 7 14:14:46 2013 +0100

release to unstable

diff --git a/debian/changelog b/debian/changelog
index 5f59be1..80e961b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.46-4) UNRELEASED; urgency=low
+libdrm (2.4.46-4) unstable; urgency=low
 
   [ Colin Watson ]
   * Declare libdrm-dev Multi-Arch: same.
@@ -7,7 +7,7 @@ libdrm (2.4.46-4) UNRELEASED; urgency=low
   * Cherry-pick upstream patch to fix relocations for all cards nv50.
   * Do not require valgrind on armel.
 
- -- Colin Watson cjwat...@ubuntu.com  Wed, 23 Oct 2013 15:39:53 +0100
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Thu, 07 Nov 2013 
14:11:38 +0100
 
 libdrm (2.4.46-3) unstable; urgency=low
 

commit a25b7599158d8484d5008dfd483df40664853ca5
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Nov 7 14:11:34 2013 +0100

Do not require valgrind on armel.

diff --git a/debian/changelog b/debian/changelog
index a5e3731..5f59be1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libdrm (2.4.46-4) UNRELEASED; urgency=low
 
   [ Maarten Lankhorst ]
   * Cherry-pick upstream patch to fix relocations for all cards nv50.
+  * Do not require valgrind on armel.
 
  -- Colin Watson cjwat...@ubuntu.com  Wed, 23 Oct 2013 15:39:53 +0100
 
diff --git a/debian/control b/debian/control
index 4612e5a..59f4b7c 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
  libpthread-stubs0-dev,
  libudev-dev [linux-any],
  libpciaccess-dev,
- valgrind [amd64 armel armhf i386 mips mipsel powerpc s390x],
+ valgrind [amd64 armhf i386 mips mipsel powerpc s390x],
  libbsd-dev [kfreebsd-any],
 Standards-Version: 3.9.4
 Section: libs

commit 776fe9ad51becb058578599a4315a63acb8987e2
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Nov 7 13:57:57 2013 +0100

Declare libdrm-dev Multi-Arch: same.

Add changelog entry documenting cherry-pick from upstream.

diff --git a/debian/changelog b/debian/changelog
index 637ea0c..a5e3731 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libdrm (2.4.46-4) UNRELEASED; urgency=low
+
+  [ Colin Watson ]
+  * Declare libdrm-dev Multi-Arch: same.
+
+  [ Maarten Lankhorst ]
+  * Cherry-pick upstream patch to fix relocations for all cards nv50.
+
+ -- Colin Watson cjwat...@ubuntu.com  Wed, 23 Oct 2013 15:39:53 +0100
+
 libdrm (2.4.46-3) unstable; urgency=low
 
   * Make drmCheckModesettingSupported work on FreeBSD.  Thanks, Christoph
diff --git a/debian/control b/debian/control
index 4963e82..4612e5a 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,7 @@ Depends:
  libdrm-nouveau2 (= ${binary:Version}) [linux-any],
  libdrm-omap1 (= ${binary:Version}) [any-arm],
  ${misc:Depends},
+Multi-Arch: same
 Replaces:
  linux-libc-dev ( 2.6.32-10)
 Description: Userspace interface to kernel DRM services -- development files

commit eade8716a576a2bfe14714a1140ee7ac5b4364d3
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Nov 7 13:30:19 2013 +0100

nouveau: prevent undefined behavior in nouveau_pushbuf_reloc with gcc-4.8

Reported-by: ronald...@gmail.com
Bisected-by (gcc): Andreas Radke a.ra...@arcor.de
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71116
Signed-off-by: Maarten Lankhorst maarten.lankho...@canonical.com

diff --git a/nouveau/pushbuf.c b/nouveau/pushbuf.c
index 0fd0c47..4f77881 100644
--- a/nouveau/pushbuf.c
+++ b/nouveau/pushbuf.c
@@ -739,7 +739,8 @@ void
 nouveau_pushbuf_reloc(struct nouveau_pushbuf *push, struct nouveau_bo *bo,
  uint32_t data, uint32_t flags, uint32_t vor, uint32_t tor)
 {
-   *push-cur++ = pushbuf_krel(push, bo, data, flags, vor, tor);
+   *push-cur = pushbuf_krel(push, bo, data, flags, vor, tor);
+   push-cur++;
 }
 
 int


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vepf7-0008mq...@vasks.debian.org

libdrm: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog|8 +
 debian/control  |   23 --
 debian/libkms1.install  |1 
 debian/libkms1.lintian-overrides|1 
 debian/libkms1.symbols  |   16 --
 debian/patches/02_kbsd_modeset.diff |   57 
 debian/patches/series   |1 
 debian/rules|   15 ++---
 8 files changed, 70 insertions(+), 52 deletions(-)

New commits:
commit e765ea2e4b838046a0c4305d36e145c046fba263
Author: Julien Cristau jcris...@debian.org
Date:   Thu Sep 19 21:25:01 2013 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 6656887..637ea0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdrm (2.4.46-3) UNRELEASED; urgency=low
+libdrm (2.4.46-3) unstable; urgency=low
 
   * Make drmCheckModesettingSupported work on FreeBSD.  Thanks, Christoph
 Egger!
   * Stop building libkms.
 
- -- Julien Cristau jcris...@debian.org  Thu, 19 Sep 2013 21:13:52 +0200
+ -- Julien Cristau jcris...@debian.org  Thu, 19 Sep 2013 21:24:52 +0200
 
 libdrm (2.4.46-2) unstable; urgency=low
 

commit 28fa67827c16338311f2857d56c395a7202b9781
Author: Julien Cristau jcris...@debian.org
Date:   Thu Sep 19 21:24:16 2013 +0200

Stop building libkms.

diff --git a/debian/changelog b/debian/changelog
index a7f2f7a..6656887 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libdrm (2.4.46-3) UNRELEASED; urgency=low
 
   * Make drmCheckModesettingSupported work on FreeBSD.  Thanks, Christoph
 Egger!
+  * Stop building libkms.
 
  -- Julien Cristau jcris...@debian.org  Thu, 19 Sep 2013 21:13:52 +0200
 
diff --git a/debian/control b/debian/control
index f4d0605..4963e82 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,6 @@ Depends:
  libdrm-radeon1 (= ${binary:Version}),
  libdrm-nouveau2 (= ${binary:Version}) [linux-any],
  libdrm-omap1 (= ${binary:Version}) [any-arm],
- libkms1 (= ${binary:Version}) [linux-any],
  ${misc:Depends},
 Replaces:
  linux-libc-dev ( 2.6.32-10)
@@ -174,28 +173,6 @@ Description: Userspace interface to radeon-specific kernel 
DRM services -- debug
  .
  This package provides the debugging symbols for the libdrm-radeon1 package.
 
-Package: libkms1
-Section: libs
-Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Description: Userspace interface to kernel DRM buffer management
- This library implements a unified userspace interface to the different buffer
- management interfaces of the kernel DRM hardware drivers.
-
-Package: libkms1-dbg
-Section: debug
-Priority: extra
-Architecture: linux-any
-Depends: libkms1 (= ${binary:Version}), ${misc:Depends}
-Multi-Arch: same
-Description: Userspace interface to kernel DRM buffer management -- debugging 
symbols
- This library implements a unified userspace interface to the different buffer
- management interfaces of the kernel DRM hardware drivers.
- .
- This package provides the debugging symbols for the libkms1 package.
-
 Package: libdrm-omap1
 Section: libs
 Architecture: any-arm
diff --git a/debian/libkms1.install b/debian/libkms1.install
deleted file mode 100644
index 84efd1f..000
--- a/debian/libkms1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libkms.so.1*
diff --git a/debian/libkms1.lintian-overrides b/debian/libkms1.lintian-overrides
deleted file mode 100644
index 0617799..000
--- a/debian/libkms1.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-symbols-declares-dependency-on-other-package libkms-private
diff --git a/debian/libkms1.symbols b/debian/libkms1.symbols
deleted file mode 100644
index 2c2828d..000
--- a/debian/libkms1.symbols
+++ /dev/null
@@ -1,16 +0,0 @@
-libkms.so.1 libkms1 #MINVER#
-| libkms-private
- dumb_create@Base 0 1
- intel_create@Base 0 1
- kms_bo_create@Base 0
- kms_bo_destroy@Base 0
- kms_bo_get_prop@Base 0
- kms_bo_map@Base 0
- kms_bo_unmap@Base 0
- kms_create@Base 0
- kms_destroy@Base 0
- kms_get_prop@Base 0
- linux_create@Base 0 1
- nouveau_create@Base 0 1
- radeon_create@Base 2.4.24 1
- vmwgfx_create@Base 0 1
diff --git a/debian/rules b/debian/rules
index 02fa657..3041981 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,20 +8,19 @@
 DEB_HOST_ARCH_OS  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
-confflags = --enable-radeon
+confflags = \
+   --enable-radeon \
+   --disable-libkms \
+   $()
 
 # Linux vs. the rest:
 ifeq (linux, $(DEB_HOST_ARCH_OS))
confflags += --enable-udev
-   confflags += --enable-libkms
-   LIBKMS = yes
confflags += --enable-vmwgfx
confflags += --enable-nouveau
NOUVEAU = yes
 else
confflags += --disable-udev
-   confflags += --disable-libkms
-   LIBKMS = no
confflags += --disable-vmwgfx
confflags += --disable-nouveau
NOUVEAU 

libdrm: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |6 ++
 debian/control   |7 ---
 debian/rules |   12 
 3 files changed, 14 insertions(+), 11 deletions(-)

New commits:
commit a3c1f3f83b56a64d6664175c1450b92b616cf26b
Author: Julien Cristau jcris...@debian.org
Date:   Wed Aug 21 21:05:51 2013 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 150d9b6..cb88c30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libdrm (2.4.46-2) UNRELEASED; urgency=low
+libdrm (2.4.46-2) unstable; urgency=low
 
   * Build libdrm-radeon1 on kfreebsd (closes: #684593).
 
- -- Julien Cristau jcris...@debian.org  Wed, 21 Aug 2013 19:34:05 +0200
+ -- Julien Cristau jcris...@debian.org  Wed, 21 Aug 2013 21:05:44 +0200
 
 libdrm (2.4.46-1) unstable; urgency=low
 

commit 4985c2c50f3eda50ffb1664c55dcee9e97b9252c
Author: Julien Cristau jcris...@debian.org
Date:   Wed Aug 21 19:36:04 2013 +0200

Build libdrm-radeon1 on kfreebsd.

Recent FreeBSD kernels should have radeon kms.

diff --git a/debian/changelog b/debian/changelog
index 004df80..150d9b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.46-2) UNRELEASED; urgency=low
+
+  * Build libdrm-radeon1 on kfreebsd (closes: #684593).
+
+ -- Julien Cristau jcris...@debian.org  Wed, 21 Aug 2013 19:34:05 +0200
+
 libdrm (2.4.46-1) unstable; urgency=low
 
   [ Sven Joachim ]
diff --git a/debian/control b/debian/control
index 6729001..f4d0605 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends:
  libudev-dev [linux-any],
  libpciaccess-dev,
  valgrind [amd64 armel armhf i386 mips mipsel powerpc s390x],
+ libbsd-dev [kfreebsd-any],
 Standards-Version: 3.9.4
 Section: libs
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdrm
@@ -25,7 +26,7 @@ Architecture: any
 Depends:
  libdrm2 (= ${binary:Version}),
  libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 
x32],
- libdrm-radeon1 (= ${binary:Version}) [linux-any],
+ libdrm-radeon1 (= ${binary:Version}),
  libdrm-nouveau2 (= ${binary:Version}) [linux-any],
  libdrm-omap1 (= ${binary:Version}) [any-arm],
  libkms1 (= ${binary:Version}) [linux-any],
@@ -145,7 +146,7 @@ Description: Userspace interface to nouveau-specific kernel 
DRM -- debugging sym
 
 Package: libdrm-radeon1
 Section: libs
-Architecture: linux-any
+Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
@@ -160,7 +161,7 @@ Description: Userspace interface to radeon-specific kernel 
DRM services -- runti
 Package: libdrm-radeon1-dbg
 Section: debug
 Priority: extra
-Architecture: linux-any
+Architecture: any
 Depends:
  libdrm-radeon1 (= ${binary:Version}),
  ${misc:Depends},
diff --git a/debian/rules b/debian/rules
index d57b013..02fa657 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,8 @@
 DEB_HOST_ARCH_OS  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
+confflags = --enable-radeon
+
 # Linux vs. the rest:
 ifeq (linux, $(DEB_HOST_ARCH_OS))
confflags += --enable-udev
@@ -16,8 +18,6 @@ ifeq (linux, $(DEB_HOST_ARCH_OS))
confflags += --enable-vmwgfx
confflags += --enable-nouveau
NOUVEAU = yes
-   confflags += --enable-radeon
-   RADEON = yes
 else
confflags += --disable-udev
confflags += --disable-libkms
@@ -25,8 +25,8 @@ else
confflags += --disable-vmwgfx
confflags += --disable-nouveau
NOUVEAU = no
-   confflags += --disable-radeon
-   RADEON = no
+   # kfreebsd mangles freebsd's sys/types.h
+   confflags += CFLAGS=$(shell pkg-config --cflags libbsd-overlay)
 endif
 
 # Intel is only on x86:
@@ -76,9 +76,7 @@ endif
 ifeq ($(NOUVEAU), yes)
dh_strip -plibdrm-nouveau2 --dbg-package=libdrm-nouveau2-dbg
 endif
-ifeq ($(RADEON), yes)
dh_strip -plibdrm-radeon1 --dbg-package=libdrm-radeon1-dbg
-endif
 ifeq ($(OMAP), yes)
dh_strip -plibdrm-omap1 --dbg-package=libdrm-omap1-dbg
 endif
@@ -95,9 +93,7 @@ endif
 ifeq ($(NOUVEAU), yes)
dh_makeshlibs -plibdrm-nouveau2 -V'libdrm-nouveau2 (= 2.4.38)' -- -c4
 endif
-ifeq ($(RADEON), yes)
dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (= 2.4.39)' -- -c4
-endif
 ifeq ($(OMAP), yes)
dh_makeshlibs -plibdrm-omap1 -V'libdrm-omap1 (= 2.4.38)' -- -c4
 endif


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vcdoe-ho...@vasks.debian.org

libdrm: Changes to 'debian-unstable'

[Maarten Lankhorst]

 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 6f4c77ae722c1c0f9ef32cb28e07b56fc38158b0
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon Aug 5 13:49:52 2013 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 7e8a0c9..004df80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-libdrm (2.4.46-1) UNRELEASED; urgency=low
+libdrm (2.4.46-1) unstable; urgency=low
 
+  [ Sven Joachim ]
   * New upstream release.
   * Bump libdrm2's and libdrm-intel1's symbols and shlibs.
   * Build libdrm-intel1 on x32 (Closes: #712515).
   * Disable silent rules.
 
- -- Sven Joachim svenj...@gmx.de  Sun, 16 Jun 2013 20:40:09 +0200
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Mon, 05 Aug 2013 
13:44:46 +0200
 
 libdrm (2.4.45-3) unstable; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1v6kw8-00034t...@vasks.debian.org

libdrm: Changes to 'debian-unstable'

[Sven Joachim]

 ChangeLog|  159 +++
 configure.ac |2 
 debian/changelog |5 -
 debian/control   |2 
 debian/libdrm-intel1.symbols |1 
 debian/libdrm2.symbols   |1 
 debian/rules |6 -
 freedreno/freedreno_bo.c |   67 +++-
 freedreno/freedreno_device.c |   61 ++
 freedreno/freedreno_drmif.h  |1 
 freedreno/freedreno_priv.h   |   13 +++
 freedreno/freedreno_ringbuffer.c |7 +
 include/drm/drm.h|1 
 include/drm/drm_mode.h   |   13 +++
 intel/intel_aub.h|   76 +-
 intel/intel_bufmgr.h |3 
 intel/intel_bufmgr_gem.c |   27 ++
 intel/intel_chipset.h|  101 ++--
 radeon/r600_pci_ids.h|   26 ++
 radeon/radeon_bo_gem.c   |4 
 radeon/radeon_surface.c  |3 
 tests/modetest/buffers.c |   26 +-
 xf86drmMode.c|   15 +++
 xf86drmMode.h|1 
 24 files changed, 552 insertions(+), 69 deletions(-)

New commits:
commit 7c957cd1c7baef6136bd81eedefb3c8503cf0dbf
Author: Sven Joachim svenj...@gmx.de
Date:   Tue Jul 2 17:16:20 2013 +0200

Use Package-Type rather than XC-Package-Type for the udeb

As recommended by lintian.

diff --git a/debian/control b/debian/control
index 873ce22..6729001 100644
--- a/debian/control
+++ b/debian/control
@@ -59,7 +59,7 @@ Description: Userspace interface to kernel DRM services -- 
runtime
  This package provides the runtime environment for libdrm.
 
 Package: libdrm2-udeb
-XC-Package-Type: udeb
+Package-Type: udeb
 Section: debian-installer
 Architecture: any
 Depends:

commit 3b6be4f49acd7114358bd459b0d0eebd3f47c5eb
Author: Sven Joachim svenj...@gmx.de
Date:   Tue Jul 2 17:13:49 2013 +0200

Disable silent rules

diff --git a/debian/changelog b/debian/changelog
index 4020e37..7e8a0c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libdrm (2.4.46-1) UNRELEASED; urgency=low
   * New upstream release.
   * Bump libdrm2's and libdrm-intel1's symbols and shlibs.
   * Build libdrm-intel1 on x32 (Closes: #712515).
+  * Disable silent rules.
 
  -- Sven Joachim svenj...@gmx.de  Sun, 16 Jun 2013 20:40:09 +0200
 
diff --git a/debian/rules b/debian/rules
index b331970..d57b013 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,7 +56,7 @@ endif
 ###
 
 override_dh_auto_configure:
-   dh_auto_configure -- --enable-static=yes $(confflags)
+   dh_auto_configure -- --disable-silent-rules --enable-static=yes 
$(confflags)
 
 override_dh_auto_test:
dh_auto_test || echo Test suite failure, but keeping on anyway

commit e85b238c0825f72dd79cffb8f24531b5ec9fa099
Author: Sven Joachim svenj...@gmx.de
Date:   Tue Jul 2 17:04:59 2013 +0200

Bump libdrm2's and libdrm-intel1's symbols and shlibs

diff --git a/debian/changelog b/debian/changelog
index 46c8fb0..4020e37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libdrm (2.4.46-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump libdrm2's and libdrm-intel1's symbols and shlibs.
   * Build libdrm-intel1 on x32 (Closes: #712515).
 
  -- Sven Joachim svenj...@gmx.de  Sun, 16 Jun 2013 20:40:09 +0200
diff --git a/debian/libdrm-intel1.symbols b/debian/libdrm-intel1.symbols
index 8f5b9fe..a0b9440 100644
--- a/debian/libdrm-intel1.symbols
+++ b/debian/libdrm-intel1.symbols
@@ -41,6 +41,7 @@ libdrm_intel.so.1 libdrm-intel1 #MINVER#
  drm_intel_bufmgr_gem_get_devid@Base 2.4.32
  drm_intel_bufmgr_gem_init@Base 2.4.1
  drm_intel_bufmgr_gem_set_aub_dump@Base 2.4.32
+ drm_intel_bufmgr_gem_set_aub_filename@Base 2.4.46
  drm_intel_bufmgr_gem_set_aub_annotations@Base 2.4.34
  drm_intel_bufmgr_gem_set_vma_cache_size@Base 2.4.29
  drm_intel_bufmgr_set_debug@Base 2.4.1
diff --git a/debian/libdrm2.symbols b/debian/libdrm2.symbols
index c4047c4..563184f 100644
--- a/debian/libdrm2.symbols
+++ b/debian/libdrm2.symbols
@@ -110,6 +110,7 @@ libdrm.so.2 libdrm2 #MINVER#
  drmModePageFlip@Base 2.4.17
  drmModeRmFB@Base 2.4.3
  drmModeSetCrtc@Base 2.4.3
+ drmModeSetCursor2@Base 2.4.46
  drmModeSetCursor@Base 2.4.3
  drmModeSetPlane@Base 2.4.30
  drmMsg@Base 2.4.1
diff --git a/debian/rules b/debian/rules
index 78ea6f7..b331970 100755
--- a/debian/rules
+++ b/debian/rules
@@ -88,9 +88,9 @@ endif
dh_strip -s --remaining-packages
 
 override_dh_makeshlibs:
-   dh_makeshlibs -plibdrm2 -V'libdrm2 (= 2.4.38)' --add-udeb=libdrm2-udeb 
-- -c4
+   dh_makeshlibs -plibdrm2 -V'libdrm2 (= 2.4.46)' --add-udeb=libdrm2-udeb 
-- -c4
 ifeq ($(INTEL), yes)
-   dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (= 2.4.38)' -- -c4
+   dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (= 2.4.46)' -- -c4
 endif
 ifeq ($(NOUVEAU), yes)
dh_makeshlibs -plibdrm-nouveau2 -V'libdrm-nouveau2 (= 2.4.38)' -- 

libdrm: Changes to 'debian-unstable'

[Sven Joachim]

 debian/changelog |6 ++
 debian/control   |6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit f519a4852b093c73473f846352a5e69b69de3123
Author: Sven Joachim svenj...@gmx.de
Date:   Sun Jun 16 20:42:15 2013 +0200

Build libdrm-intel1 on x32

diff --git a/debian/changelog b/debian/changelog
index 5c001a9..3b2fa20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.45-4) UNRELEASED; urgency=low
+
+  * Build libdrm-intel1 on x32 (Closes: #712515).
+
+ -- Sven Joachim svenj...@gmx.de  Sun, 16 Jun 2013 20:40:09 +0200
+
 libdrm (2.4.45-3) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index ec12408..873ce22 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Section: libdevel
 Architecture: any
 Depends:
  libdrm2 (= ${binary:Version}),
- libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
+ libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 
x32],
  libdrm-radeon1 (= ${binary:Version}) [linux-any],
  libdrm-nouveau2 (= ${binary:Version}) [linux-any],
  libdrm-omap1 (= ${binary:Version}) [any-arm],
@@ -87,7 +87,7 @@ Description: Userspace interface to kernel DRM services -- 
debugging symbols
 
 Package: libdrm-intel1
 Section: libs
-Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 x32
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
@@ -102,7 +102,7 @@ Description: Userspace interface to intel-specific kernel 
DRM services -- runtim
 Package: libdrm-intel1-dbg
 Section: debug
 Priority: extra
-Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 x32
 Depends:
  libdrm-intel1 (= ${binary:Version}),
  ${misc:Depends},


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1uohwd-0006jn...@vasks.debian.org

libdrm: Changes to 'debian-unstable'

[Sven Joachim]

 0 files changed

New commits:
commit e3013e8b96ee530475fb0df3e0e92684f405873f
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jan 6 12:47:04 2013 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 6b967e1..ce42af2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdrm (2.4.40-1~deb7u2) UNRELEASED; urgency=low
+libdrm (2.4.40-1~deb7u2) sid; urgency=low
 
   * Fix FTBFS on kfreebsd:
 - fix missing ETIME (cherry-picked from upstream)
 - work around missing O_CLOEXEC
 
- -- Julien Cristau jcris...@debian.org  Sun, 06 Jan 2013 12:44:49 +0100
+ -- Julien Cristau jcris...@debian.org  Sun, 06 Jan 2013 12:46:52 +0100
 
 libdrm (2.4.40-1~deb7u1) sid; urgency=low
 

commit 112d146e15c65aa5df60df9e618af155d97b6621
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jan 6 12:45:36 2013 +0100

Fix FTBFS on kfreebsd

diff --git a/debian/changelog b/debian/changelog
index 653e7e9..6b967e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libdrm (2.4.40-1~deb7u2) UNRELEASED; urgency=low
+
+  * Fix FTBFS on kfreebsd:
+- fix missing ETIME (cherry-picked from upstream)
+- work around missing O_CLOEXEC
+
+ -- Julien Cristau jcris...@debian.org  Sun, 06 Jan 2013 12:44:49 +0100
+
 libdrm (2.4.40-1~deb7u1) sid; urgency=low
 
   * Revert nouveau to the 2.4.33 state (ie before the rewrite).
diff --git a/debian/patches/intel-cloexec-kbsd.diff 
b/debian/patches/intel-cloexec-kbsd.diff
new file mode 100644
index 000..6772721
--- /dev/null
+++ b/debian/patches/intel-cloexec-kbsd.diff
@@ -0,0 +1,30 @@
+From 5488edc26442124dc8e8498336982e34a2ddb3e7 Mon Sep 17 00:00:00 2001
+From: Julien Cristau jcris...@debian.org
+Date: Sun, 6 Jan 2013 12:42:18 +0100
+Subject: [PATCH] intel: work around the lack of O_CLOEXEC definition on
+ kfreebsd
+
+Provide our own instead, per
+http://svnweb.freebsd.org/base/head/sys/sys/fcntl.h?r1=21r2=219998pathrev=21
+---
+ intel/intel_bufmgr_gem.c |4 
+ 1 file changed, 4 insertions(+)
+
+diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
+index 512bc6f..bc035af 100644
+--- a/intel/intel_bufmgr_gem.c
 b/intel/intel_bufmgr_gem.c
+@@ -2470,6 +2470,10 @@ drm_intel_bo_gem_create_from_prime(drm_intel_bufmgr 
*bufmgr, int prime_fd, int s
+   return bo_gem-bo;
+ }
+ 
++/* XXX hack for kfreebsd */
++#if !defined(O_CLOEXEC)  defined(__FreeBSD_kernel__)
++#define O_CLOEXEC 0x0010
++#endif
+ int
+ drm_intel_bo_gem_export_to_prime(drm_intel_bo *bo, int *prime_fd)
+ {
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index c20e4b9..a21307d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_default_perms.diff
 03_build_against_librt.diff
 revert-nouveau-rewrite.diff
+intel-cloexec-kbsd.diff

commit 26dca5adf4f9e7bc333db348cd173c57771f76f8
Author: David Shao davs...@gmail.com
Date:   Sat Nov 10 00:24:56 2012 -0500

intel: Fix missing ETIME on BSD operating systems

Originally posted to Free Desktop bug #52549 by David Shao.
Resolves Gentoo Bug #433403.
Commit message by Richard Yao.

Reviewed-by: Richard Yao r...@gentoo.org
Reviewed-by: Kenneth Graunke kenn...@whitecape.org
References: https://bugs.freedesktop.org/show_bug.cgi?id=52549

Signed-off-by: Ben Widawsky b...@bwidawsk.net
(cherry picked from commit 7d42b49c0cf19dbb4531cd84efae51f95db2eea1)

diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index 8d45839..512bc6f 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -54,6 +54,9 @@
 #include stdbool.h
 
 #include errno.h
+#ifndef ETIME
+#define ETIME ETIMEDOUT
+#endif
 #include libdrm_lists.h
 #include intel_bufmgr.h
 #include intel_bufmgr_priv.h

commit ed71378a89bd417f451fdd4bfeb7225a39bc4539
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jan 5 22:50:43 2013 +0100

Fix upload target

diff --git a/debian/changelog b/debian/changelog
index 79fa48b..653e7e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.40-1~deb7u1) experimental; urgency=low
+libdrm (2.4.40-1~deb7u1) sid; urgency=low
 
   * Revert nouveau to the 2.4.33 state (ie before the rewrite).
   * Revert addition of libdrm2-udeb.

commit a523d34a401239ea24a85593c71ed22eeea4d878
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jan 5 22:28:56 2013 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index fe51436..79fa48b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdrm (2.4.40-1~deb7u1) UNRELEASED; urgency=low
+libdrm (2.4.40-1~deb7u1) experimental; urgency=low
 
   * Revert nouveau to the 2.4.33 state (ie before the rewrite).
   * Revert addition of libdrm2-udeb.
   * Bump libdrm2 shlibs to 2.4.38.
 
- -- Julien Cristau jcris...@debian.org  Tue, 25 Dec 2012 13:08:50 +0100
+ -- Julien Cristau jcris...@debian.org  Sat, 05 Jan 2013 22:28:45 +0100
 
 libdrm (2.4.40-1) 

libdrm: Changes to 'debian-unstable'

[Emilio Pozuelo Monfort]

Rebased ref, commits from common ancestor:
commit 396f92661c9d32085912cbae56849570d344dd1f
Author: Emilio Pozuelo Monfort po...@debian.org
Date:   Thu Jun 6 23:15:33 2013 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 33c8206..5c001a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-libdrm (2.4.45-3) UNRELEASED; urgency=low
+libdrm (2.4.45-3) unstable; urgency=low
+
+  * Team upload.
 
   * debian/patches/03_build_against_librt.diff:
 + Removed, no longer needed with our current glibc version.
   Thanks to Julien Cristau for pointing it out.
+  * Upload to unstable.
 
  -- Emilio Pozuelo Monfort po...@debian.org  Thu, 06 Jun 2013 23:13:12 +0200
 

commit 82ab991c5f25a6a4a33e72b9606ff79d7e1c4338
Author: Emilio Pozuelo Monfort po...@debian.org
Date:   Thu Jun 6 23:14:08 2013 +0200

Remove 03_build_against_librt.diff

diff --git a/debian/changelog b/debian/changelog
index c0c519a..33c8206 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libdrm (2.4.45-3) UNRELEASED; urgency=low
+
+  * debian/patches/03_build_against_librt.diff:
++ Removed, no longer needed with our current glibc version.
+  Thanks to Julien Cristau for pointing it out.
+
+ -- Emilio Pozuelo Monfort po...@debian.org  Thu, 06 Jun 2013 23:13:12 +0200
+
 libdrm (2.4.45-2) experimental; urgency=low
 
   [ Sven Joachim ]
diff --git a/debian/patches/03_build_against_librt.diff 
b/debian/patches/03_build_against_librt.diff
deleted file mode 100644
index 565b6c4..000
--- a/debian/patches/03_build_against_librt.diff
+++ /dev/null
@@ -1,11 +0,0 @@
 a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -10,6 +10,8 @@ check_PROGRAMS = \
-   dristat \
-   drmstat
- 
-+dristat_LDADD = $(CLOCK_LIB)
-+
- SUBDIRS = modeprint
- 
- if HAVE_LIBKMS
diff --git a/debian/patches/series b/debian/patches/series
index 2e425c0..8ca2297 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01_default_perms.diff
-03_build_against_librt.diff

commit 687b4feafcf2696727eb62c0d781ec0de42c723e
Author: Julien Cristau jcris...@debian.org
Date:   Thu May 30 10:03:45 2013 +0200

Upload to experimental

diff --git a/debian/changelog b/debian/changelog
index 04a89c4..c0c519a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-libdrm (2.4.45-2) UNRELEASED; urgency=low
+libdrm (2.4.45-2) experimental; urgency=low
 
+  [ Sven Joachim ]
   * Only build-depend on valgrind on architectures where
 valgrind is actually available.
 
- -- Sven Joachim svenj...@gmx.de  Fri, 17 May 2013 17:56:43 +0200
+ -- Julien Cristau jcris...@debian.org  Thu, 30 May 2013 10:03:37 +0200
 
 libdrm (2.4.45-1) experimental; urgency=low
 

commit c3b713090840df937677c0827aa76ca798ea9ff3
Author: Sven Joachim svenj...@gmx.de
Date:   Fri May 17 18:00:06 2013 +0200

Make valgrind build-dependency archictecture specific

diff --git a/debian/changelog b/debian/changelog
index fdc788c..04a89c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdrm (2.4.45-2) UNRELEASED; urgency=low
+
+  * Only build-depend on valgrind on architectures where
+valgrind is actually available.
+
+ -- Sven Joachim svenj...@gmx.de  Fri, 17 May 2013 17:56:43 +0200
+
 libdrm (2.4.45-1) experimental; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 8175dfc..ec12408 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
  libpthread-stubs0-dev,
  libudev-dev [linux-any],
  libpciaccess-dev,
- valgrind,
+ valgrind [amd64 armel armhf i386 mips mipsel powerpc s390x],
 Standards-Version: 3.9.4
 Section: libs
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdrm

commit 157efcb996b5e5e366947ebd3cdd69f96a7c129f
Author: Emilio Pozuelo Monfort po...@debian.org
Date:   Thu May 16 00:17:04 2013 +0200

Upload 2.4.45 to experimental

diff --git a/debian/changelog b/debian/changelog
index 99ca0fc..fdc788c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-libdrm (2.4.45-1) UNRELEASED; urgency=low
+libdrm (2.4.45-1) experimental; urgency=low
+
+  * Team upload.
 
   [ Julien Cristau ]
   * Bump libdrm2 shlibs to 2.4.38.
@@ -11,7 +13,10 @@ libdrm (2.4.45-1) UNRELEASED; urgency=low
   [ Timo Aaltonen ]
   * control: Bump policy to 3.9.4, no changes.
 
- -- Julien Cristau jcris...@debian.org  Tue, 25 Dec 2012 13:17:28 +0100
+  [ Emilio Pozuelo Monfort ]
+  * Upload to experimental.
+
+ -- Emilio Pozuelo Monfort po...@debian.org  Thu, 16 May 2013 00:09:59 +0200
 
 libdrm (2.4.40-1) experimental; urgency=low
 

commit ef470fa9bd9a65897788519f67d4b8fa20750c60
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed May 15 21:57:50 2013 +0200

bump changelogs

diff --git a/ChangeLog b/ChangeLog
index 74b1902..51c7a9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,119 @@
+commit 63aeae123848d0bfbc0a35102cb9717cf496eab6
+Author: Marek Olšák mar...@gmail.com
+Date:   Wed 

libdrm: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog   |8 
 debian/patches/intel-cloexec-kbsd.diff |   30 ++
 debian/patches/series  |1 +
 intel/intel_bufmgr_gem.c   |3 +++
 4 files changed, 42 insertions(+)

New commits:
commit e3013e8b96ee530475fb0df3e0e92684f405873f
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jan 6 12:47:04 2013 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 6b967e1..ce42af2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdrm (2.4.40-1~deb7u2) UNRELEASED; urgency=low
+libdrm (2.4.40-1~deb7u2) sid; urgency=low
 
   * Fix FTBFS on kfreebsd:
 - fix missing ETIME (cherry-picked from upstream)
 - work around missing O_CLOEXEC
 
- -- Julien Cristau jcris...@debian.org  Sun, 06 Jan 2013 12:44:49 +0100
+ -- Julien Cristau jcris...@debian.org  Sun, 06 Jan 2013 12:46:52 +0100
 
 libdrm (2.4.40-1~deb7u1) sid; urgency=low
 

commit 112d146e15c65aa5df60df9e618af155d97b6621
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jan 6 12:45:36 2013 +0100

Fix FTBFS on kfreebsd

diff --git a/debian/changelog b/debian/changelog
index 653e7e9..6b967e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libdrm (2.4.40-1~deb7u2) UNRELEASED; urgency=low
+
+  * Fix FTBFS on kfreebsd:
+- fix missing ETIME (cherry-picked from upstream)
+- work around missing O_CLOEXEC
+
+ -- Julien Cristau jcris...@debian.org  Sun, 06 Jan 2013 12:44:49 +0100
+
 libdrm (2.4.40-1~deb7u1) sid; urgency=low
 
   * Revert nouveau to the 2.4.33 state (ie before the rewrite).
diff --git a/debian/patches/intel-cloexec-kbsd.diff 
b/debian/patches/intel-cloexec-kbsd.diff
new file mode 100644
index 000..6772721
--- /dev/null
+++ b/debian/patches/intel-cloexec-kbsd.diff
@@ -0,0 +1,30 @@
+From 5488edc26442124dc8e8498336982e34a2ddb3e7 Mon Sep 17 00:00:00 2001
+From: Julien Cristau jcris...@debian.org
+Date: Sun, 6 Jan 2013 12:42:18 +0100
+Subject: [PATCH] intel: work around the lack of O_CLOEXEC definition on
+ kfreebsd
+
+Provide our own instead, per
+http://svnweb.freebsd.org/base/head/sys/sys/fcntl.h?r1=21r2=219998pathrev=21
+---
+ intel/intel_bufmgr_gem.c |4 
+ 1 file changed, 4 insertions(+)
+
+diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
+index 512bc6f..bc035af 100644
+--- a/intel/intel_bufmgr_gem.c
 b/intel/intel_bufmgr_gem.c
+@@ -2470,6 +2470,10 @@ drm_intel_bo_gem_create_from_prime(drm_intel_bufmgr 
*bufmgr, int prime_fd, int s
+   return bo_gem-bo;
+ }
+ 
++/* XXX hack for kfreebsd */
++#if !defined(O_CLOEXEC)  defined(__FreeBSD_kernel__)
++#define O_CLOEXEC 0x0010
++#endif
+ int
+ drm_intel_bo_gem_export_to_prime(drm_intel_bo *bo, int *prime_fd)
+ {
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index c20e4b9..a21307d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_default_perms.diff
 03_build_against_librt.diff
 revert-nouveau-rewrite.diff
+intel-cloexec-kbsd.diff

commit 26dca5adf4f9e7bc333db348cd173c57771f76f8
Author: David Shao davs...@gmail.com
Date:   Sat Nov 10 00:24:56 2012 -0500

intel: Fix missing ETIME on BSD operating systems

Originally posted to Free Desktop bug #52549 by David Shao.
Resolves Gentoo Bug #433403.
Commit message by Richard Yao.

Reviewed-by: Richard Yao r...@gentoo.org
Reviewed-by: Kenneth Graunke kenn...@whitecape.org
References: https://bugs.freedesktop.org/show_bug.cgi?id=52549

Signed-off-by: Ben Widawsky b...@bwidawsk.net
(cherry picked from commit 7d42b49c0cf19dbb4531cd84efae51f95db2eea1)

diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index 8d45839..512bc6f 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -54,6 +54,9 @@
 #include stdbool.h
 
 #include errno.h
+#ifndef ETIME
+#define ETIME ETIMEDOUT
+#endif
 #include libdrm_lists.h
 #include intel_bufmgr.h
 #include intel_bufmgr_priv.h


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1trovq-qt...@vasks.debian.org

libdrm: Changes to 'debian-unstable'

[Julien Cristau]

 .gitignore  |4 
 ChangeLog   | 1387 
 Makefile.am |6 
 autogen.sh  |2 
 configure.ac|   88 
 debian/changelog|   29 
 debian/control  |2 
 debian/libdrm-dev.install   |1 
 debian/libdrm-intel1.symbols|8 
 debian/libdrm-omap1.symbols |4 
 debian/libdrm-radeon1.symbols   |2 
 debian/libdrm2.symbols  |5 
 debian/patches/02_build_libkms_against_in_tree_drm.diff |   17 
 debian/patches/revert-nouveau-rewrite.diff  | 4935 
 debian/patches/series   |2 
 debian/rules|   16 
 exynos/Makefile.am  |   22 
 exynos/exynos_drm.c |  396 +
 exynos/exynos_drm.h |  148 
 exynos/exynos_drmif.h   |   88 
 exynos/libdrm_exynos.pc.in  |   11 
 include/drm/drm.h   |   22 
 include/drm/drm_mode.h  |   25 
 include/drm/i915_drm.h  |   71 
 intel/Makefile.am   |2 
 intel/intel_bufmgr.h|   24 
 intel/intel_bufmgr_gem.c|  364 +
 intel/intel_bufmgr_priv.h   |5 
 intel/intel_chipset.h   |   79 
 intel/intel_decode.c|  106 
 intel/test_decode.c |2 
 intel/tests/gen7-3d.batch-ref.txt   |4 
 libdrm_lists.h  |   29 
 libkms/Makefile.am  |2 
 man/Makefile.am |   11 
 man/drmAvailable.man|   25 
 man/drmHandleEvent.man  |   45 
 man/drmModeGetResources.man |   79 
 nouveau/Makefile.am |   36 
 nouveau/abi16.c |  195 
 nouveau/bufctx.c|  170 
 nouveau/libdrm_nouveau.pc.in|2 
 nouveau/nouveau.c   |  527 +
 nouveau/nouveau.h   |  215 
 nouveau/nouveau_bo.c|  549 -
 nouveau/nouveau_bo.h|  104 
 nouveau/nouveau_channel.c   |  142 
 nouveau/nouveau_channel.h   |   57 
 nouveau/nouveau_device.c|  198 
 nouveau/nouveau_device.h|   33 
 nouveau/nouveau_drmif.h |   58 
 nouveau/nouveau_grobj.c |  148 
 nouveau/nouveau_grobj.h |   48 
 nouveau/nouveau_notifier.c  |  148 
 nouveau/nouveau_notifier.h  |   63 
 nouveau/nouveau_private.h   |  136 
 nouveau/nouveau_pushbuf.c   |  344 -
 nouveau/nouveau_pushbuf.h   |  162 
 nouveau/nouveau_reloc.c |  154 
 nouveau/nouveau_reloc.h |   32 
 nouveau/nouveau_resource.c  |  124 
 nouveau/nouveau_resource.h  |   51 
 nouveau/nv04_pushbuf.h  |   66 
 nouveau/nvc0_pushbuf.h  |   92 
 nouveau/private.h   |  122 
 nouveau/pushbuf.c   |  773 ++
 omap/omap_drm.c |  199 
 omap/omap_drm.h |   36 
 omap/omap_drmif.h   |4 
 radeon/Makefile.am  |2 
 radeon/r600_pci_ids.h   |   83 
 radeon/radeon_bo_gem.c  |   48 
 radeon/radeon_bo_gem.h  |4 
 radeon/radeon_cs_gem.c  |2 
 radeon/radeon_surface.c |  460 +
 radeon/radeon_surface.h |2 
 tests/modetest/Makefile.am

libdrm: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ed71378a89bd417f451fdd4bfeb7225a39bc4539
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jan 5 22:50:43 2013 +0100

Fix upload target

diff --git a/debian/changelog b/debian/changelog
index 79fa48b..653e7e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.40-1~deb7u1) experimental; urgency=low
+libdrm (2.4.40-1~deb7u1) sid; urgency=low
 
   * Revert nouveau to the 2.4.33 state (ie before the rewrite).
   * Revert addition of libdrm2-udeb.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1trbhq-0002jq...@vasks.debian.org

libdrm: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog|6 ++
 debian/control  |   30 ++
 debian/libdrm-omap1.install |1 +
 debian/libdrm-omap1.symbols |   15 +++
 debian/rules|   18 ++
 5 files changed, 70 insertions(+)

New commits:
commit 36df178e70012887b63cc5c9322c622fca63778c
Author: Sebastian Reichel s...@debian.org
Date:   Thu Jun 21 22:38:00 2012 +0200

Build libdrm_omap

diff --git a/debian/changelog b/debian/changelog
index a8131f0..1fdd013 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.33-1.1) unstable; urgency=low
+
+  * Build libdrm_omap (closes: #667572).
+
+ -- Sebastian Reichel s...@debian.org  Sun, 06 May 2012 00:55:13 +0200
+
 libdrm (2.4.33-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 71d057b..a841ee0 100644
--- a/debian/control
+++ b/debian/control
@@ -182,3 +182,33 @@ Description: Userspace interface to kernel DRM buffer 
management -- debugging sy
  management interfaces of the kernel DRM hardware drivers.
  .
  This package provides the debugging symbols for the libkms1 package.
+
+Package: libdrm-omap1
+Section: libs
+Architecture: armel armhf
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: Userspace interface to omap-specific kernel DRM services -- 
runtime
+ This library implements the userspace interface to the omap-specific kernel
+ DRM services.  DRM stands for Direct Rendering Manager, which is the
+ kernelspace portion of the Direct Rendering Infrastructure (DRI). The DRI is
+ currently used on Linux to provide hardware-accelerated OpenGL drivers.
+
+Package: libdrm-omap1-dbg
+Section: debug
+Priority: extra
+Architecture: armel armhf
+Depends:
+ libdrm-omap1 (= ${binary:Version}),
+ ${misc:Depends},
+Multi-Arch: same
+Description: Userspace interface to omap-specific kernel DRM services -- 
debugging symbols
+ This library implements the userspace interface to the kernel DRM services.
+ DRM stands for Direct Rendering Manager, which is the kernelspace portion
+ of the Direct Rendering Infrastructure (DRI). The DRI is currently used on
+ Linux to provide hardware-accelerated OpenGL drivers.
+ .
+ This package provides the debugging symbols for the libdrm-omap1 package.
diff --git a/debian/libdrm-omap1.install b/debian/libdrm-omap1.install
new file mode 100644
index 000..b775d44
--- /dev/null
+++ b/debian/libdrm-omap1.install
@@ -0,0 +1 @@
+usr/lib/*/libdrm_omap.so.1*
diff --git a/debian/libdrm-omap1.symbols b/debian/libdrm-omap1.symbols
new file mode 100644
index 000..5ad0f17
--- /dev/null
+++ b/debian/libdrm-omap1.symbols
@@ -0,0 +1,15 @@
+libdrm_omap.so.1 libdrm-omap1 #MINVER#
+ omap_bo_cpu_fini@Base 2.4.33
+ omap_bo_cpu_prep@Base 2.4.33
+ omap_bo_del@Base 2.4.33
+ omap_bo_from_name@Base 2.4.33
+ omap_bo_get_name@Base 2.4.33
+ omap_bo_handle@Base 2.4.33
+ omap_bo_map@Base 2.4.33
+ omap_bo_new@Base 2.4.33
+ omap_bo_new_tiled@Base 2.4.33
+ omap_bo_size@Base 2.4.33
+ omap_device_del@Base 2.4.33
+ omap_device_new@Base 2.4.33
+ omap_get_param@Base 2.4.33
+ omap_set_param@Base 2.4.33
diff --git a/debian/rules b/debian/rules
index 4c296ea..a4d4880 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,6 +41,18 @@ else
confflags += --disable-intel
 endif
 
+# Omap is only on arm
+ifneq (,$(filter arm,$(DEB_HOST_ARCH_CPU)))
+ifneq (,$(filter linux,$(DEB_HOST_ARCH_OS)))
+   OMAP = yes
+endif
+endif
+ifeq ($(OMAP), yes)
+   confflags += --enable-omap-experimental-api
+else
+   confflags += --disable-omap-experimental-api
+endif
+
 ###
 ### Actual build
 ###
@@ -69,6 +81,9 @@ endif
 ifeq ($(RADEON), yes)
dh_strip -plibdrm-radeon1 --dbg-package=libdrm-radeon1-dbg
 endif
+ifeq ($(OMAP), yes)
+   dh_strip -plibdrm-omap1 --dbg-package=libdrm-omap1-dbg
+endif
 ifeq ($(LIBKMS), yes)
dh_strip -p libkms1 --dbg-package=libkms1-dbg
 endif
@@ -85,6 +100,9 @@ endif
 ifeq ($(RADEON), yes)
dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (= 2.4.31)' -- -c4
 endif
+ifeq ($(OMAP), yes)
+   dh_makeshlibs -plibdrm-omap1 -V'libdrm-omap1' -- -c4
+endif
 ifeq ($(LIBKMS), yes)
dh_makeshlibs -plibkms1 -V'libkms1' -- -c4
 endif


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1shoc2-0005nc...@vasks.debian.org

libdrm: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit ab88407d4876def2f598d3d09a422ac4bf9681c9
Author: Julien Cristau jcris...@debian.org
Date:   Thu Jun 21 22:39:40 2012 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 1fdd013..b33d740 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-libdrm (2.4.33-1.1) unstable; urgency=low
+libdrm (2.4.33-2) unstable; urgency=low
 
+  [ Sebastian Reichel ]
   * Build libdrm_omap (closes: #667572).
 
- -- Sebastian Reichel s...@debian.org  Sun, 06 May 2012 00:55:13 +0200
+ -- Julien Cristau jcris...@debian.org  Thu, 21 Jun 2012 22:39:22 +0200
 
 libdrm (2.4.33-1) unstable; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1shota-re...@vasks.debian.org

libdrm: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |7 +++
 debian/control   |5 +++--
 debian/rules |2 --
 3 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 6c5543b4a06cacabc1f32d24b232f53af57bd586
Author: Julien Cristau jcris...@debian.org
Date:   Thu Jun 21 23:22:25 2012 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 495814f..6408491 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdrm (2.4.33-3) UNRELEASED; urgency=low
+libdrm (2.4.33-3) unstable; urgency=low
 
   * Add missing dependency on libdrm-omap1 to libdrm-dev (thanks, Robert
 Hooker!).  Make some arm matching a bit simpler.
 
- -- Julien Cristau jcris...@debian.org  Thu, 21 Jun 2012 23:18:11 +0200
+ -- Julien Cristau jcris...@debian.org  Thu, 21 Jun 2012 23:22:22 +0200
 
 libdrm (2.4.33-2) unstable; urgency=low
 

commit e9174e7feed583098844d846f5955095d8c06bec
Author: Julien Cristau jcris...@debian.org
Date:   Thu Jun 21 23:21:58 2012 +0200

Add missing dependency on libdrm-omap1 to libdrm-dev

Thanks, Robert Hooker, for noticing.
Also make some arm matching a bit simpler, arm means linux so no need to
check both.

diff --git a/debian/changelog b/debian/changelog
index b33d740..495814f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdrm (2.4.33-3) UNRELEASED; urgency=low
+
+  * Add missing dependency on libdrm-omap1 to libdrm-dev (thanks, Robert
+Hooker!).  Make some arm matching a bit simpler.
+
+ -- Julien Cristau jcris...@debian.org  Thu, 21 Jun 2012 23:18:11 +0200
+
 libdrm (2.4.33-2) unstable; urgency=low
 
   [ Sebastian Reichel ]
diff --git a/debian/control b/debian/control
index a841ee0..5b5d9f6 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Depends:
  libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
  libdrm-radeon1 (= ${binary:Version}) [linux-any],
  libdrm-nouveau1a (= ${binary:Version}) [linux-any],
+ libdrm-omap1 (= ${binary:Version}) [any-arm],
  libkms1 (= ${binary:Version}) [linux-any],
  ${misc:Depends},
 Replaces:
@@ -185,7 +186,7 @@ Description: Userspace interface to kernel DRM buffer 
management -- debugging sy
 
 Package: libdrm-omap1
 Section: libs
-Architecture: armel armhf
+Architecture: any-arm
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
@@ -200,7 +201,7 @@ Description: Userspace interface to omap-specific kernel 
DRM services -- runtime
 Package: libdrm-omap1-dbg
 Section: debug
 Priority: extra
-Architecture: armel armhf
+Architecture: any-arm
 Depends:
  libdrm-omap1 (= ${binary:Version}),
  ${misc:Depends},
diff --git a/debian/rules b/debian/rules
index a4d4880..44926b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,10 +43,8 @@ endif
 
 # Omap is only on arm
 ifneq (,$(filter arm,$(DEB_HOST_ARCH_CPU)))
-ifneq (,$(filter linux,$(DEB_HOST_ARCH_OS)))
OMAP = yes
 endif
-endif
 ifeq ($(OMAP), yes)
confflags += --enable-omap-experimental-api
 else


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1shp14-000653...@vasks.debian.org

libdrm: Changes to 'debian-unstable'

[Cyril Brulebois]

 ChangeLog |   39 +
 Makefile.am   |6 
 configure.ac  |   14 +-
 debian/changelog  |6 
 intel/intel_chipset.h |   28 +++-
 omap/Makefile.am  |   22 +++
 omap/libdrm_omap.pc.in|   11 +
 omap/omap_drm.c   |  310 ++
 omap/omap_drm.h   |  125 ++
 omap/omap_drmif.h |   61 +
 radeon/r600_pci_ids.h |8 +
 radeon/radeon_surface.c   |1 
 tests/modetest/modetest.c |2 
 13 files changed, 625 insertions(+), 8 deletions(-)

New commits:
commit 8cf983d5823c4813a5ff47ad426e2d162be92c1a
Author: Cyril Brulebois k...@debian.org
Date:   Mon Apr 2 01:28:29 2012 +

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index c413302..a8131f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libdrm (2.4.33-1) UNRELEASED; urgency=low
+libdrm (2.4.33-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Cyril Brulebois k...@debian.org  Mon, 02 Apr 2012 01:26:50 +
+ -- Cyril Brulebois k...@debian.org  Mon, 02 Apr 2012 01:28:22 +
 
 libdrm (2.4.32-1) unstable; urgency=low
 

commit e8973ce55e82d7311c4df10561966906ef886a97
Author: Cyril Brulebois k...@debian.org
Date:   Mon Apr 2 01:27:03 2012 +

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index 60b0b2d..b36beb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,42 @@
+commit a3c34f56b94d4d47cadcd9814c2684c11f800e7d
+Author: Alex Deucher alexdeuc...@gmail.com
+Date:   Wed Mar 28 17:17:36 2012 -0400
+
+configure: Bump version for 2.4.33
+
+Signed-off-by: Alex Deucher alexdeuc...@gmail.com
+
+commit ef1b958cc831df3d33a366d1db2db2c88187229e
+Author: Rob Clark r...@ti.com
+Date:   Wed Mar 28 14:39:43 2012 -0500
+
+omap: add omapdrm support
+
+This adds libdrm_omap helper layer (as used by xf86-video-omap,
+omapdrmtest, etc).
+
+Signed-off-by: Rob Clark r...@ti.com
+Reviewed-by: Alex Deucher alexander.deuc...@amd.com
+[danvet: pushed for Rob, he doesn't yet have commit access.]
+Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch
+
+commit 617213357e94299a5e9a3cb1342de55de949d156
+Author: Kenneth Graunke kenn...@whitecape.org
+Date:   Mon Mar 19 13:55:19 2012 -0700
+
+intel: Add some PCI IDs for Haswell.
+
+Signed-off-by: Kenneth Graunke kenn...@whitecape.org
+Reviewed-by: Eugeni Dodonov eugeni.dodo...@intel.com
+
+commit c50cc24690938db53cd91ae9ff2fa0958693f80d
+Author: Alex Deucher alexander.deuc...@amd.com
+Date:   Tue Feb 14 11:32:17 2012 -0500
+
+radeon: add TN surface support
+
+Signed-off-by: Alex Deucher alexander.deuc...@amd.com
+
 commit 51c3e7d7335ecdf572968db7d3eed661e8a61810
 Author: Eric Anholt e...@anholt.net
 Date:   Fri Mar 16 16:11:10 2012 -0700
diff --git a/debian/changelog b/debian/changelog
index 45ad062..c413302 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.33-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Cyril Brulebois k...@debian.org  Mon, 02 Apr 2012 01:26:50 +
+
 libdrm (2.4.32-1) unstable; urgency=low
 
   [ Robert Hooker ]

commit a3c34f56b94d4d47cadcd9814c2684c11f800e7d
Author: Alex Deucher alexdeuc...@gmail.com
Date:   Wed Mar 28 17:17:36 2012 -0400

configure: Bump version for 2.4.33

Signed-off-by: Alex Deucher alexdeuc...@gmail.com

diff --git a/configure.ac b/configure.ac
index 921dcbd..1ba7eba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 
 AC_PREREQ([2.63])
 AC_INIT([libdrm],
-[2.4.32],
+[2.4.33],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
 [libdrm])
 

commit ef1b958cc831df3d33a366d1db2db2c88187229e
Author: Rob Clark r...@ti.com
Date:   Wed Mar 28 14:39:43 2012 -0500

omap: add omapdrm support

This adds libdrm_omap helper layer (as used by xf86-video-omap,
omapdrmtest, etc).

Signed-off-by: Rob Clark r...@ti.com
Reviewed-by: Alex Deucher alexander.deuc...@amd.com
[danvet: pushed for Rob, he doesn't yet have commit access.]
Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch

diff --git a/Makefile.am b/Makefile.am
index a4d07f4..4f625a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,7 +41,11 @@ if HAVE_RADEON
 RADEON_SUBDIR = radeon
 endif
 
-SUBDIRS = . $(LIBKMS_SUBDIR) $(INTEL_SUBDIR) $(NOUVEAU_SUBDIR) 
$(RADEON_SUBDIR) tests include
+if HAVE_OMAP
+OMAP_SUBDIR = omap
+endif
+
+SUBDIRS = . $(LIBKMS_SUBDIR) $(INTEL_SUBDIR) $(NOUVEAU_SUBDIR) 
$(RADEON_SUBDIR) $(OMAP_SUBDIR) tests include
 
 libdrm_la_LTLIBRARIES = libdrm.la
 libdrm_ladir = $(libdir)
diff --git a/configure.ac b/configure.ac
index ff2c840..921dcbd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,6 +83,10 @@ AC_ARG_ENABLE(nouveau-experimental-api,
  [Enable support for nouveau's experimental API (default: 
disabled)]),
  [NOUVEAU=$enableval], [NOUVEAU=no])
 

libdrm: Changes to 'debian-unstable'

[Cyril Brulebois]

 ChangeLog |  248 +++
 configure.ac  |   17 
 debian/changelog  |   11 
 debian/libdrm-intel1.symbols  |4 
 debian/rules  |2 
 include/drm/drm_fourcc.h  |6 
 intel/Makefile.am |2 
 intel/intel_aub.h |  123 +++
 intel/intel_bufmgr.h  |   19 
 intel/intel_bufmgr_gem.c  |  514 ++-
 intel/intel_decode.c  |  253 +--
 intel/tests/gen7-3d.batch |binary
 intel/tests/gen7-3d.batch-ref.txt | 1290 --
 radeon/radeon_cs_space.c  |   15 
 radeon/radeon_surface.c   |   14 
 xf86drmMode.h |5 
 16 files changed, 1286 insertions(+), 1237 deletions(-)

New commits:
commit 7921097578a7d1688fc4d92cb2338b1463824c57
Author: Cyril Brulebois k...@debian.org
Date:   Mon Mar 19 19:56:24 2012 +

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 2371913..45ad062 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.32-1) UNRELEASED; urgency=low
+libdrm (2.4.32-1) unstable; urgency=low
 
   [ Robert Hooker ]
   * New upstream release (2.4.31).
@@ -9,7 +9,7 @@ libdrm (2.4.32-1) UNRELEASED; urgency=low
   * New upstream release (2.4.32).
   * Bump libdrm-intel1's symbols and shlibs accordingly.
 
- -- Cyril Brulebois k...@debian.org  Mon, 19 Mar 2012 19:33:21 +
+ -- Cyril Brulebois k...@debian.org  Mon, 19 Mar 2012 19:56:12 +
 
 libdrm (2.4.30-1) unstable; urgency=low
 

commit 7d6eca41f92c247e0be2b1562c833e6ef410977f
Author: Cyril Brulebois k...@debian.org
Date:   Mon Mar 19 19:56:08 2012 +

Bump libdrm-intel1's symbols and shlibs accordingly.

diff --git a/debian/changelog b/debian/changelog
index 7b7ed8d..2371913 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ libdrm (2.4.32-1) UNRELEASED; urgency=low
 
   [ Cyril Brulebois ]
   * New upstream release (2.4.32).
+  * Bump libdrm-intel1's symbols and shlibs accordingly.
 
  -- Cyril Brulebois k...@debian.org  Mon, 19 Mar 2012 19:33:21 +
 
diff --git a/debian/libdrm-intel1.symbols b/debian/libdrm-intel1.symbols
index c4af4d2..a381740 100644
--- a/debian/libdrm-intel1.symbols
+++ b/debian/libdrm-intel1.symbols
@@ -36,7 +36,9 @@ libdrm_intel.so.1 libdrm-intel1 #MINVER#
  drm_intel_bufmgr_fake_set_last_dispatch@Base 2.4.1
  drm_intel_bufmgr_gem_enable_fenced_relocs@Base 2.4.20
  drm_intel_bufmgr_gem_enable_reuse@Base 2.4.1
+ drm_intel_bufmgr_gem_get_devid@Base 2.4.32
  drm_intel_bufmgr_gem_init@Base 2.4.1
+ drm_intel_bufmgr_gem_set_aub_dump@Base 2.4.32
  drm_intel_bufmgr_gem_set_vma_cache_size@Base 2.4.29
  drm_intel_bufmgr_set_debug@Base 2.4.1
  drm_intel_decode@Base 2.4.30
@@ -46,9 +48,11 @@ libdrm_intel.so.1 libdrm-intel1 #MINVER#
  drm_intel_decode_set_dump_past_end@Base 2.4.30
  drm_intel_decode_set_head_tail@Base 2.4.30
  drm_intel_decode_set_output_file@Base 2.4.30
+ drm_intel_gem_bo_aub_dump_bmp@Base 2.4.32
  drm_intel_gem_bo_clear_relocs@Base 2.4.27
  drm_intel_gem_bo_get_reloc_count@Base 2.4.27
  drm_intel_gem_bo_map_gtt@Base 2.4.3
+ drm_intel_gem_bo_map_unsynchronized@Base 2.4.32
  drm_intel_gem_bo_start_gtt_access@Base 2.4.3
  drm_intel_gem_bo_unmap_gtt@Base 2.4.9
  drm_intel_get_aperture_sizes@Base 2.4.26
diff --git a/debian/rules b/debian/rules
index 7857963..4c296ea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,7 +77,7 @@ endif
 override_dh_makeshlibs:
dh_makeshlibs -plibdrm2 -V'libdrm2 (= 2.4.31)' -- -c4
 ifeq ($(INTEL), yes)
-   dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (= 2.4.30)' -- -c4
+   dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (= 2.4.32)' -- -c4
 endif
 ifeq ($(NOUVEAU), yes)
dh_makeshlibs -plibdrm-nouveau1a -V'libdrm-nouveau1a (= 2.4.23)' -- -c4

commit 12ae11b0ca3895ec6dadd684cf57ce600f796786
Author: Cyril Brulebois k...@debian.org
Date:   Mon Mar 19 19:33:53 2012 +

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index 4d5e8df..60b0b2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,251 @@
+commit 51c3e7d7335ecdf572968db7d3eed661e8a61810
+Author: Eric Anholt e...@anholt.net
+Date:   Fri Mar 16 16:11:10 2012 -0700
+
+configure: Bump version for 2.4.32.
+
+commit 5de5b7484a3a41554e16c02a544a45db5516b031
+Author: Eric Anholt e...@anholt.net
+Date:   Tue Mar 13 16:49:53 2012 -0700
+
+intel: Quiet two more valgrind complaints with recent changes.
+
+These are more cases where valgrind doesn't understand what gets read
+or written by our ioctls.
+
+commit 9d18ad254afc2afc41a919b86cd51ea40cfd8f0b
+Author: Eric Anholt e...@anholt.net
+Date:   Fri Mar 2 10:27:55 2012 -0800
+
+intel: Add per-dword decode of gen7 3DPRIMITIVE.
+
+commit 9b87fd9a3df8c59461bc90b4620526d10f9b5771
+Author: Eric Anholt e...@anholt.net
+Date:   Fri Mar 2 10:18:51 2012 -0800
+
+intel: Move the gen4-6 3DPRIMITIVE handling out of the switch 

libdrm: Changes to 'debian-unstable'

[Robert Hooker]

 ChangeLog  |  309 +
 configure.ac   |7 
 debian/changelog   |8 
 debian/libdrm-radeon1.symbols  |4 
 debian/libdrm2.symbols |1 
 debian/rules   |4 
 include/drm/i915_drm.h |   37 
 include/drm/radeon_drm.h   |   24 
 intel/Makefile.am  |1 
 intel/intel_bufmgr_gem.c   |   20 
 intel/intel_decode.c   | 1501 +
 intel/tests/gen7-2d-copy.batch |binary
 intel/tests/gen7-2d-copy.batch-ref.txt |   14 
 intel/tests/gen7-2d-copy.batch.sh  |1 
 intel/tests/gen7-3d.batch-ref.txt  | 1922 ++---
 radeon/Makefile.am |5 
 radeon/r600_pci_ids.h  |  271 
 radeon/radeon_surface.c|  995 +
 radeon/radeon_surface.h|  114 +
 xf86drmMode.c  |   21 
 xf86drmMode.h  |1 
 21 files changed, 3474 insertions(+), 1786 deletions(-)

New commits:
commit ef308a29b590f84a4283fe030ecaeeaeaca787bf
Author: Robert Hooker sarv...@ubuntu.com
Date:   Tue Feb 7 11:20:35 2012 -0500

Refresh libdrm2 and libdrm-radeon1 symbols, bump shlibs.

diff --git a/debian/changelog b/debian/changelog
index a3f910a..94e2d44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 libdrm (2.4.31-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump libdrm2 and libdrm-radeon1 symbols and shlibs to account for
+recent changes.
 
- -- Robert Hooker sarv...@ubuntu.com  Tue, 07 Feb 2012 10:54:39 -0500
+ -- Robert Hooker sarv...@ubuntu.com  Tue, 07 Feb 2012 11:06:32 -0500
 
 libdrm (2.4.30-1) unstable; urgency=low
 
diff --git a/debian/libdrm-radeon1.symbols b/debian/libdrm-radeon1.symbols
index c900ea9..557be89 100644
--- a/debian/libdrm-radeon1.symbols
+++ b/debian/libdrm-radeon1.symbols
@@ -56,3 +56,7 @@ libdrm_radeon.so.1 libdrm-radeon1 #MINVER#
  radeon_gem_get_reloc_in_cs@Base 2.4.20
  radeon_gem_name_bo@Base 2.4.17
  radeon_gem_set_domain@Base 2.4.17
+ radeon_surface_best@Base 2.4.31
+ radeon_surface_init@Base 2.4.31
+ radeon_surface_manager_free@Base 2.4.31
+ radeon_surface_manager_new@Base 2.4.31
diff --git a/debian/libdrm2.symbols b/debian/libdrm2.symbols
index 29ce302..0f70434 100644
--- a/debian/libdrm2.symbols
+++ b/debian/libdrm2.symbols
@@ -90,6 +90,7 @@ libdrm.so.2 libdrm2 #MINVER#
  drmModeFreeFB@Base 2.4.3
  drmModeFreeModeInfo@Base 2.4.3
  drmModeFreePlane@Base 2.4.30
+ drmModeFreePlaneResources@Base 2.4.31
  drmModeFreeProperty@Base 2.4.3
  drmModeFreePropertyBlob@Base 2.4.3
  drmModeFreeResources@Base 2.4.3
diff --git a/debian/rules b/debian/rules
index a620ec7..7857963 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,7 +75,7 @@ endif
dh_strip -s --remaining-packages
 
 override_dh_makeshlibs:
-   dh_makeshlibs -plibdrm2 -V'libdrm2 (= 2.4.30)' -- -c4
+   dh_makeshlibs -plibdrm2 -V'libdrm2 (= 2.4.31)' -- -c4
 ifeq ($(INTEL), yes)
dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (= 2.4.30)' -- -c4
 endif
@@ -83,7 +83,7 @@ ifeq ($(NOUVEAU), yes)
dh_makeshlibs -plibdrm-nouveau1a -V'libdrm-nouveau1a (= 2.4.23)' -- -c4
 endif
 ifeq ($(RADEON), yes)
-   dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (= 2.4.20)' -- -c4
+   dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (= 2.4.31)' -- -c4
 endif
 ifeq ($(LIBKMS), yes)
dh_makeshlibs -plibkms1 -V'libkms1' -- -c4

commit 1761b100e3e7b405bd8c12c92392a3c623081c9e
Author: Robert Hooker sarv...@ubuntu.com
Date:   Tue Feb 7 10:58:36 2012 -0500

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index fe7581a..4d5e8df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,312 @@
+commit 230ec7d7bbf1e8a7e263d471b21afb08c28eba0c
+Author: Jerome Glisse jgli...@redhat.com
+Date:   Mon Feb 6 15:22:58 2012 -0500
+
+configure: Bump version for 2.4.31
+
+commit 356b87d8b34daf9aeadd33465141bc212ad6e3ff
+Author: Jerome Glisse jgli...@redhat.com
+Date:   Mon Feb 6 15:22:14 2012 -0500
+
+radeon: add r600_pci_ids.h to header file
+
+Signed-off-by: Jerome Glisse jgli...@redhat.com
+
+commit 10c0837780b2d4a33568c16bb92527e196d6c05e
+Author: Jerome Glisse jgli...@redhat.com
+Date:   Fri Feb 3 12:22:11 2012 -0500
+
+radeon: fix surface API for good before anyone start relying on it
+
+The mipmap level computation was wrong, we need to know the block
+width, height, depth of compressed texture to properly compute this.
+Change API to provide block width, height, depth instead of nblk_x,
+nblk_y, nblk_z.
+
+Signed-off-by: Jerome Glisse jgli...@redhat.com
+
+commit 6a720cb8660975acea1100e61a88a92a7cb3856e
+Author: Jerome Glisse jgli...@redhat.com
+Date:   Thu Feb 2 14:17:10 2012 -0500
+
+radeon: surface fix macro - micro tile fallback
+
+We need to force 1D 

libdrm: Changes to 'debian-unstable'

[Cyril Brulebois]

 ChangeLog |  273 ++
 configure.ac  |4 
 debian/README.source  |6 
 debian/changelog  |8 
 debian/libdrm-intel1.symbols  |7 
 debian/libdrm2.symbols|5 
 debian/rules  |4 
 include/drm/Makefile.am   |1 
 include/drm/drm.h |4 
 include/drm/drm_fourcc.h  |  130 +
 include/drm/drm_mode.h|   64 
 include/drm/i915_drm.h|6 
 intel/.gitignore  |1 
 intel/Makefile.am |   30 
 intel/intel_bufmgr.h  |   14 
 intel/intel_bufmgr_gem.c  |   19 
 intel/intel_chipset.h |  112 -
 intel/intel_decode.c  | 3691 ++
 intel/test_decode.c   |  191 +
 intel/tests/.gitignore|1 
 intel/tests/gen4-3d.batch |binary
 intel/tests/gen4-3d.batch-ref.txt |  488 +
 intel/tests/gen4-3d.batch.sh  |1 
 intel/tests/gen5-3d.batch |binary
 intel/tests/gen5-3d.batch-ref.txt |  512 +
 intel/tests/gen5-3d.batch.sh  |1 
 intel/tests/gen6-3d.batch |binary
 intel/tests/gen6-3d.batch-ref.txt |  990 ++
 intel/tests/gen6-3d.batch.sh  |1 
 intel/tests/gen7-3d.batch |binary
 intel/tests/gen7-3d.batch-ref.txt | 1350 +
 intel/tests/gen7-3d.batch.sh  |1 
 intel/tests/gm45-3d.batch |binary
 intel/tests/gm45-3d.batch-ref.txt |  488 +
 intel/tests/gm45-3d.batch.sh  |1 
 intel/tests/test-batch.sh |   20 
 tests/gem_flink.c |7 
 xf86drmMode.c |  153 +
 xf86drmMode.h |   33 
 39 files changed, 8565 insertions(+), 52 deletions(-)

New commits:
commit e91400b4219caf5d63a59e40c4585308ed30326c
Author: Cyril Brulebois k...@debian.org
Date:   Fri Jan 6 20:04:48 2012 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 9f24159..3b92e88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdrm (2.4.30-1) UNRELEASED; urgency=low
+libdrm (2.4.30-1) unstable; urgency=low
 
   * New upstream release.
   * Bump libdrm2's and libdrm-intel1's symbols and shlibs accordingly.
   * Document the symlink dance when building from git in README.source.
 
- -- Cyril Brulebois k...@debian.org  Fri, 06 Jan 2012 19:47:07 +0100
+ -- Cyril Brulebois k...@debian.org  Fri, 06 Jan 2012 20:04:37 +0100
 
 libdrm (2.4.29-1) unstable; urgency=low
 

commit f40e3394471d158b4af5780e258813b3d2ed8764
Author: Cyril Brulebois k...@debian.org
Date:   Fri Jan 6 20:04:25 2012 +0100

Document the symlink dance when building from git in README.source.

diff --git a/debian/README.source b/debian/README.source
index 4ecd5e6..f9bb7c6 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -14,6 +14,12 @@ Quick Guide To Patching This Package For The Impatient
 Alternatively, instead of using quilt directly, you can drop the patch in to 
 debian/patches and add the name of the patch to debian/patches/series.
 
+While building from git, dpkg-source can complain about symlinks vs.
+normal files mismatches. To work around this issue, before uploading,
+and without committing:
+
+  find -type l | while read dest; do src=$(readlink -f $dest); rm $dest; cp 
$src $dest; done
+
 
 Guide To The X Strike Force Packages
 
diff --git a/debian/changelog b/debian/changelog
index d6a0c18..9f24159 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libdrm (2.4.30-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Bump libdrm2's and libdrm-intel1's symbols and shlibs accordingly.
+  * Document the symlink dance when building from git in README.source.
 
  -- Cyril Brulebois k...@debian.org  Fri, 06 Jan 2012 19:47:07 +0100
 

commit 9ce84e5c243f6403f0d39e2e5cf13c8ced51b471
Author: Cyril Brulebois k...@debian.org
Date:   Fri Jan 6 19:57:02 2012 +0100

Bump libdrm2's and libdrm-intel1's symbols and shlibs accordingly.

diff --git a/debian/changelog b/debian/changelog
index d714a4a..d6a0c18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libdrm (2.4.30-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump libdrm2's and libdrm-intel1's symbols and shlibs accordingly.
 
  -- Cyril Brulebois k...@debian.org  Fri, 06 Jan 2012 19:47:07 +0100
 
diff --git a/debian/libdrm-intel1.symbols b/debian/libdrm-intel1.symbols
index 36d102d..c4af4d2 100644
--- a/debian/libdrm-intel1.symbols
+++ b/debian/libdrm-intel1.symbols
@@ -39,6 +39,13 @@ libdrm_intel.so.1 libdrm-intel1 #MINVER#
  drm_intel_bufmgr_gem_init@Base 2.4.1
  drm_intel_bufmgr_gem_set_vma_cache_size@Base 2.4.29
  drm_intel_bufmgr_set_debug@Base 2.4.1
+ drm_intel_decode@Base 2.4.30
+ drm_intel_decode_context_alloc@Base 2.4.30
+ drm_intel_decode_context_free@Base 2.4.30
+ 

libdrm: Changes to 'debian-unstable'

[Cyril Brulebois]

 ChangeLog|   70 +
 configure.ac |2 
 debian/changelog |8 ++
 debian/libdrm-intel1.symbols |1 
 debian/rules |2 
 intel/intel_bufmgr.h |2 
 intel/intel_bufmgr_gem.c |  138 ++-
 tests/radeon/Makefile.am |2 
 8 files changed, 207 insertions(+), 18 deletions(-)

New commits:
commit 26cdd1d4dc6e19ae317c977490835b854f94f874
Author: Cyril Brulebois k...@debian.org
Date:   Tue Dec 13 13:16:24 2011 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index c7d7c1f..3deadfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdrm (2.4.29-1) UNRELEASED; urgency=low
+libdrm (2.4.29-1) unstable; urgency=low
 
   * New upstream release:
 - assert()s are now gone (Closes: #651316).
   * Update libdrm-intel1's symbols and shlibs accordingly.
 
- -- Cyril Brulebois k...@debian.org  Tue, 13 Dec 2011 13:06:03 +0100
+ -- Cyril Brulebois k...@debian.org  Tue, 13 Dec 2011 13:16:22 +0100
 
 libdrm (2.4.28-1) unstable; urgency=low
 

commit 60911644f90be10e4f92b6f7c641c8ee31bfdf5f
Author: Cyril Brulebois k...@debian.org
Date:   Tue Dec 13 13:09:29 2011 +0100

Update libdrm-intel1's symbols and shlibs accordingly.

diff --git a/debian/changelog b/debian/changelog
index 92a1568..c7d7c1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libdrm (2.4.29-1) UNRELEASED; urgency=low
 
   * New upstream release:
 - assert()s are now gone (Closes: #651316).
+  * Update libdrm-intel1's symbols and shlibs accordingly.
 
  -- Cyril Brulebois k...@debian.org  Tue, 13 Dec 2011 13:06:03 +0100
 
diff --git a/debian/libdrm-intel1.symbols b/debian/libdrm-intel1.symbols
index 7dee621..36d102d 100644
--- a/debian/libdrm-intel1.symbols
+++ b/debian/libdrm-intel1.symbols
@@ -37,6 +37,7 @@ libdrm_intel.so.1 libdrm-intel1 #MINVER#
  drm_intel_bufmgr_gem_enable_fenced_relocs@Base 2.4.20
  drm_intel_bufmgr_gem_enable_reuse@Base 2.4.1
  drm_intel_bufmgr_gem_init@Base 2.4.1
+ drm_intel_bufmgr_gem_set_vma_cache_size@Base 2.4.29
  drm_intel_bufmgr_set_debug@Base 2.4.1
  drm_intel_gem_bo_clear_relocs@Base 2.4.27
  drm_intel_gem_bo_get_reloc_count@Base 2.4.27
diff --git a/debian/rules b/debian/rules
index 5257452..188f43d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,7 +77,7 @@ endif
 override_dh_makeshlibs:
dh_makeshlibs -plibdrm2 -V'libdrm2 (= 2.4.25)' -- -c4
 ifeq ($(INTEL), yes)
-   dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (= 2.4.27)' -- -c4
+   dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (= 2.4.29)' -- -c4
 endif
 ifeq ($(NOUVEAU), yes)
dh_makeshlibs -plibdrm-nouveau1a -V'libdrm-nouveau1a (= 2.4.23)' -- -c4

commit d3053f019e7dcaf7c25899c0cd4a4b763b807b0f
Author: Cyril Brulebois k...@debian.org
Date:   Tue Dec 13 13:06:59 2011 +0100

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index 2bfd7b8..e7c92cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,73 @@
+commit 7fd1678110b78d9324723a54dfd5049496b9e3cf
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Mon Dec 5 23:09:20 2011 +
+
+configure: Bump version for 2.4.29
+
+Yet another release required for new API
+
+commit 015286f03e871ccf49af9f2ceef7f5e04c8d61ca
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Sun Dec 11 17:35:06 2011 +
+
+intel: Remove the fresh assertions used to debug the vma cacheing
+
+Hopefully all the bugs in the callers have been found, so time to
+handle the failures gracefully again.
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit c5f0ed1d296f11367febd0e1b7dce8789308bf35
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Tue Dec 13 10:30:54 2011 +
+
+intel: Update map-count for an early error return during mapping
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit dd9a5b4f7fb07c78db4e7481bedca1b981030e3f
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Tue Dec 6 13:12:37 2011 +
+
+intel: Evict cached VMA in order to make room for new mappings
+
+As the max number of VMA mappings is a hard per-process limit, we need
+to include the number of currently active mappings when evicting in
+order to make room for a new mmap.
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit e4b60f29609e9993dc7268993da509530862aa78
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Mon Dec 5 21:29:05 2011 +
+
+intel: Add an interface to limit vma caching
+
+There is a per-process limit on the number of vma that the process can
+keep open, so we cannot keep an unlimited cache of unused vma's (besides
+keeping track of all those vma in the kernel adds considerable overhead).
+However, in order to work around inefficiencies in the kernel it is
+beneficial to reuse the vma, so keep a MRU cache of vma.
+
+

libdrm: Changes to 'debian-unstable'

[Cyril Brulebois]

 ChangeLog |   66 +
 configure.ac  |3 
 debian/changelog  |6 +
 intel/intel_bufmgr_gem.c  |   35 +++--
 nouveau/nouveau_grobj.c   |3 
 tests/Makefile.am |4 +
 tests/radeon/Makefile.am  |   12 +++
 tests/radeon/list.h   |  137 
 tests/radeon/radeon_ttm.c |   75 
 tests/radeon/rbo.c|  171 ++
 tests/radeon/rbo.h|   50 +
 xf86drm.c |8 +-
 12 files changed, 558 insertions(+), 12 deletions(-)

New commits:
commit 39b6ee2a990637e2cca665800eaa45c3f378d79d
Author: Cyril Brulebois k...@debian.org
Date:   Tue Dec 6 15:17:53 2011 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 32a09b4..69c262f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libdrm (2.4.28-1) UNRELEASED; urgency=low
+libdrm (2.4.28-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Cyril Brulebois k...@debian.org  Tue, 06 Dec 2011 15:16:09 +0100
+ -- Cyril Brulebois k...@debian.org  Tue, 06 Dec 2011 15:17:50 +0100
 
 libdrm (2.4.27-1) unstable; urgency=low
 

commit 99335af48c702cfedf7aa76a40f51e0f8d552622
Author: Cyril Brulebois k...@debian.org
Date:   Tue Dec 6 15:17:47 2011 +0100

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index bac7f78..2bfd7b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,69 @@
+commit e73161a02b604742e3da3bca8f13cff81276de43
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Mon Dec 5 10:30:52 2011 +
+
+configure: Bump version to 2.4.28
+
+So that we can pull a couple of Intel bug fixes into xf86-video-intel.
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit c549a777c1b6227a724942c64aa5cd181eb93c6c
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Mon Dec 5 10:14:34 2011 +
+
+intel: Unmap buffers during drm_intel_gem_bo_unmap
+
+We cannot afford to cache the vma per open bo as this may exhaust the
+per-process limits.
+
+References: https://bugs.freedesktop.org/show_bug.cgi?id=43075
+References: https://bugs.freedesktop.org/show_bug.cgi?id=40066
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit 36cff1cbb89477c839588a7e40fec2a8db7df396
+Author: Daniel Vetter daniel.vet...@ffwll.ch
+Date:   Sun Dec 4 12:51:45 2011 +0100
+
+intel: limit aperture space to mappable area on gen3
+
+Otherwise we blow up on heavy tiled blitter loads (with giant
+pixmaps).
+
+Signed-Off-by: Daniel Vetter daniel.vet...@ffwll.ch
+Acked-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit 37ccce5e390a9d757474920f488cafa1cf89854a
+Author: Maarten Lankhorst m.b.lankho...@gmail.com
+Date:   Thu Nov 24 14:08:53 2011 +0100
+
+nouveau: Mark nouveau subchannel unbound nouveau_grobj_free
+
+Valgrind throws warns about a user-after-free if you try to bind a
+new subchannel after the old one in that slot was freed,
+so remove it from the channel list.
+
+Signed-off-by: Maarten Lankhorst m.b.lankho...@gmail.com
+
+commit ca4971292cf99e0063416cd1c3467af94637bf2b
+Author: Jerome Glisse jgli...@redhat.com
+Date:   Thu Nov 10 16:47:10 2011 -0500
+
+tests/radeon: radeon specific test
+
+Initial test only include ttm test for stressing ttm memory
+allocations.
+
+Signed-off-by: Jerome Glisse jgli...@redhat.com
+
+commit 961bf9b5c2866ccb4fedf2b45b29fb688519d0db
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Tue Nov 1 14:42:13 2011 -0700
+
+Fix compilation with -Werror=int-to-pointer-cast 
-Werror=pointer-to-int-cast
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
 commit cc9b751e82c5a3525907bba30ba3c95246751824
 Author: Eric Anholt e...@anholt.net
 Date:   Fri Oct 28 13:14:44 2011 -0700
diff --git a/debian/changelog b/debian/changelog
index 0fa808d..32a09b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.28-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Cyril Brulebois k...@debian.org  Tue, 06 Dec 2011 15:16:09 +0100
+
 libdrm (2.4.27-1) unstable; urgency=low
 
   * New upstream release:

commit e73161a02b604742e3da3bca8f13cff81276de43
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   Mon Dec 5 10:30:52 2011 +

configure: Bump version to 2.4.28

So that we can pull a couple of Intel bug fixes into xf86-video-intel.

Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk

diff --git a/configure.ac b/configure.ac
index 1447785..829e8d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 
 AC_PREREQ([2.63])
 AC_INIT([libdrm],
-[2.4.27],
+[2.4.28],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
 [libdrm])
 

commit c549a777c1b6227a724942c64aa5cd181eb93c6c
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   Mon Dec 5 10:14:34 

libdrm: Changes to 'debian-unstable'

[Cyril Brulebois]

 ChangeLog|  271 +++
 configure.ac |2 
 debian/changelog |9 +
 debian/libdrm-intel1.symbols |2 
 debian/rules |2 
 intel/Makefile.am|3 
 intel/intel_bufmgr.c |2 
 intel/intel_bufmgr.h |2 
 intel/intel_bufmgr_gem.c |  170 +-
 intel/intel_debug.h  |   44 ++
 nouveau/nouveau_device.c |4 
 nouveau/nouveau_pushbuf.c|3 
 tests/drmtest.c  |   13 +-
 tests/modeprint/modeprint.c  |7 -
 tests/modetest/modetest.c|   19 ++-
 tests/vbltest/vbltest.c  |   22 ++-
 xf86drm.h|8 +
 xf86drmMode.c|2 
 xf86drmMode.h|8 +
 19 files changed, 507 insertions(+), 86 deletions(-)

New commits:
commit 8141c4828219490f43317e92796999f77c916c46
Author: Cyril Brulebois k...@debian.org
Date:   Tue Nov 1 19:31:03 2011 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index f9e6a87..0fa808d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdrm (2.4.27-1) UNRELEASED; urgency=low
+libdrm (2.4.27-1) unstable; urgency=low
 
   * New upstream release:
 - Push the new Intel API for use by mesa.
 - Usual bug fixes.
   * Update libdrm-intel1's symbols and shlibs accordingly.
 
- -- Cyril Brulebois k...@debian.org  Tue, 01 Nov 2011 19:16:18 +0100
+ -- Cyril Brulebois k...@debian.org  Tue, 01 Nov 2011 19:30:54 +0100
 
 libdrm (2.4.26-1) unstable; urgency=low
 

commit 3020c976670166b5e2ae9bf24a05a01143429aef
Author: Cyril Brulebois k...@debian.org
Date:   Tue Nov 1 19:30:17 2011 +0100

Update libdrm-intel1's symbols and shlibs accordingly.

diff --git a/debian/changelog b/debian/changelog
index bb4d957..f9e6a87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libdrm (2.4.27-1) UNRELEASED; urgency=low
   * New upstream release:
 - Push the new Intel API for use by mesa.
 - Usual bug fixes.
+  * Update libdrm-intel1's symbols and shlibs accordingly.
 
  -- Cyril Brulebois k...@debian.org  Tue, 01 Nov 2011 19:16:18 +0100
 
diff --git a/debian/libdrm-intel1.symbols b/debian/libdrm-intel1.symbols
index c951b6b..7dee621 100644
--- a/debian/libdrm-intel1.symbols
+++ b/debian/libdrm-intel1.symbols
@@ -38,6 +38,8 @@ libdrm_intel.so.1 libdrm-intel1 #MINVER#
  drm_intel_bufmgr_gem_enable_reuse@Base 2.4.1
  drm_intel_bufmgr_gem_init@Base 2.4.1
  drm_intel_bufmgr_set_debug@Base 2.4.1
+ drm_intel_gem_bo_clear_relocs@Base 2.4.27
+ drm_intel_gem_bo_get_reloc_count@Base 2.4.27
  drm_intel_gem_bo_map_gtt@Base 2.4.3
  drm_intel_gem_bo_start_gtt_access@Base 2.4.3
  drm_intel_gem_bo_unmap_gtt@Base 2.4.9
diff --git a/debian/rules b/debian/rules
index 6ccb6a8..5257452 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,7 +77,7 @@ endif
 override_dh_makeshlibs:
dh_makeshlibs -plibdrm2 -V'libdrm2 (= 2.4.25)' -- -c4
 ifeq ($(INTEL), yes)
-   dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (= 2.4.26)' -- -c4
+   dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (= 2.4.27)' -- -c4
 endif
 ifeq ($(NOUVEAU), yes)
dh_makeshlibs -plibdrm-nouveau1a -V'libdrm-nouveau1a (= 2.4.23)' -- -c4

commit 9eea7002ebed82c306bc30e78a149d7bb2ae520f
Author: Cyril Brulebois k...@debian.org
Date:   Tue Nov 1 19:16:28 2011 +0100

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index 968043e..bac7f78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,274 @@
+commit cc9b751e82c5a3525907bba30ba3c95246751824
+Author: Eric Anholt e...@anholt.net
+Date:   Fri Oct 28 13:14:44 2011 -0700
+
+configure: version bump for 2.4.27 release.
+
+Push the new Intel API for use by mesa.
+
+Reviewed-by: Daniel Vetter daniel.vet...@ffwll.ch
+
+commit d0ae6837d117881d9f1f9cc12d3f1012b6a46103
+Author: Eric Anholt e...@anholt.net
+Date:   Fri Oct 28 13:13:08 2011 -0700
+
+intel: Share the implementation of BO unmap between CPU and GTT mappings.
+
+Before this, consumers of the libdrm API that might map a buffer
+either way had to track which way was chosen at map time to call the
+appropriate unmap.  This relaxes that requirement by making
+drm_intel_bo_unmap() always appropriate.
+
+Reviewed-by: Daniel Vetter daniel.vet...@ffwll.ch
+Reviewed-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit 4cb01eeccfa6a5169edea07c339117cac1f7b261
+Author: Eric Anholt e...@anholt.net
+Date:   Fri Oct 28 13:12:16 2011 -0700
+
+intel: Don't call the SW_FINISH ioctl unless a CPU-mapped write was done.
+
+Reviewed-by: Daniel Vetter daniel.vet...@ffwll.ch
+Reviewed-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit 77dc16f33d19195c7f7c569d877a6180ed1b9d54
+Author: Eric Anholt e...@anholt.net
+Date:   Fri Oct 28 13:02:53 2011 -0700
+
+intel: Remove stale comment.
+
+This used to be next to some map refcounting code, but that is long dead.
+ 

libdrm: Changes to 'debian-unstable'

[Cyril Brulebois]

 ChangeLog|   30 +
 configure.ac |6 -
 debian/changelog |9 +++
 debian/control   |1 
 debian/libdrm-intel1.symbols |1 
 debian/rules |2 -
 intel/Makefile.am|3 +-
 intel/intel_bufmgr.c |   50 +++
 intel/intel_bufmgr.h |2 +
 libkms/dumb.c|3 +-
 10 files changed, 103 insertions(+), 4 deletions(-)

New commits:
commit 9845da0fc73a1e3f926c4f83c25bc2d91c63eb0e
Author: Cyril Brulebois k...@debian.org
Date:   Fri Jun 24 17:07:07 2011 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index f6f8efc..d9bc994 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdrm (2.4.26-1) UNRELEASED; urgency=low
+libdrm (2.4.26-1) unstable; urgency=low
 
   * New upstream release:
 - Fix two important intel bugs.
   * Add libpciaccess-dev build-dep.
   * Update libdrm-intel1.symbols and shlibs for new aperture-related symbol.
 
- -- Cyril Brulebois k...@debian.org  Fri, 24 Jun 2011 16:59:56 +0200
+ -- Cyril Brulebois k...@debian.org  Fri, 24 Jun 2011 17:07:04 +0200
 
 libdrm (2.4.25-3) unstable; urgency=low
 

commit 6bc3b76da1bf8b461784345bc9084324d2e35337
Author: Cyril Brulebois k...@debian.org
Date:   Fri Jun 24 17:07:02 2011 +0200

Update libdrm-intel1.symbols and shlibs for new aperture-related symbol.

diff --git a/debian/changelog b/debian/changelog
index cdb70fe..f6f8efc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libdrm (2.4.26-1) UNRELEASED; urgency=low
   * New upstream release:
 - Fix two important intel bugs.
   * Add libpciaccess-dev build-dep.
+  * Update libdrm-intel1.symbols and shlibs for new aperture-related symbol.
 
  -- Cyril Brulebois k...@debian.org  Fri, 24 Jun 2011 16:59:56 +0200
 
diff --git a/debian/libdrm-intel1.symbols b/debian/libdrm-intel1.symbols
index 3634492..c951b6b 100644
--- a/debian/libdrm-intel1.symbols
+++ b/debian/libdrm-intel1.symbols
@@ -41,6 +41,7 @@ libdrm_intel.so.1 libdrm-intel1 #MINVER#
  drm_intel_gem_bo_map_gtt@Base 2.4.3
  drm_intel_gem_bo_start_gtt_access@Base 2.4.3
  drm_intel_gem_bo_unmap_gtt@Base 2.4.9
+ drm_intel_get_aperture_sizes@Base 2.4.26
  drm_intel_get_pipe_from_crtc_id@Base 2.4.11
  drm_mmAllocMem@Base 2.4.1
  drm_mmDestroy@Base 2.4.1
diff --git a/debian/rules b/debian/rules
index cab7ea3..6ccb6a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,7 +77,7 @@ endif
 override_dh_makeshlibs:
dh_makeshlibs -plibdrm2 -V'libdrm2 (= 2.4.25)' -- -c4
 ifeq ($(INTEL), yes)
-   dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (= 2.4.23-3~)' -- -c4
+   dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (= 2.4.26)' -- -c4
 endif
 ifeq ($(NOUVEAU), yes)
dh_makeshlibs -plibdrm-nouveau1a -V'libdrm-nouveau1a (= 2.4.23)' -- -c4

commit 0cadb56dc138fe2142c1f6332dfa177f63547755
Author: Cyril Brulebois k...@debian.org
Date:   Fri Jun 24 17:01:43 2011 +0200

Add libpciaccess-dev build-dep.

diff --git a/debian/changelog b/debian/changelog
index c74631b..cdb70fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libdrm (2.4.26-1) UNRELEASED; urgency=low
 
   * New upstream release:
 - Fix two important intel bugs.
+  * Add libpciaccess-dev build-dep.
 
  -- Cyril Brulebois k...@debian.org  Fri, 24 Jun 2011 16:59:56 +0200
 
diff --git a/debian/control b/debian/control
index 7b3673d..71d057b 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends:
  pkg-config,
  libpthread-stubs0-dev,
  libudev-dev [linux-any],
+ libpciaccess-dev,
 Standards-Version: 3.9.2
 Section: libs
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdrm

commit f79e6a4f95b538b2b9e70b6c74b0f00410965879
Author: Cyril Brulebois k...@debian.org
Date:   Fri Jun 24 17:00:48 2011 +0200

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index b69176e..968043e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+commit 6dd804c5a92104042b8be0a67d107946394a0b7a
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Sat Jun 4 13:01:50 2011 +0100
+
+configure: version bump for 2.4.26 release
+
+Push the new Intel API for use by mesa.
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit 9d77603d8b95aee4f2408e437c55af15ee05b608
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Sat Jun 4 12:47:19 2011 +0100
+
+intel: Add interface to query aperture sizes.
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit 61be94018ae9c403517d53f69357719224fa6ff3
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Sat May 14 11:15:06 2011 +0100
+
+libkms: All current BO_TYPE are 32bpp
+
+... so request a 32bpp dumb buffer rather than a 16bpp.
+
+Fixes modetest and friends.
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
 commit 

libdrm: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog|   14 ++
 debian/compat   |2 +-
 debian/control  |   19 +--
 debian/libdrm-dev.install   |6 +++---
 debian/libdrm-intel1.install|2 +-
 debian/libdrm-nouveau1a.install |2 +-
 debian/libdrm-radeon1.install   |2 +-
 debian/libdrm-radeon1.lintian-overrides |1 +
 debian/libdrm2.install  |2 +-
 debian/libkms1.install  |2 +-
 debian/libkms1.lintian-overrides|1 +
 11 files changed, 42 insertions(+), 11 deletions(-)

New commits:
commit b7b99dbe72246771a0c1365bc5b25f76ac36db7f
Author: Julien Cristau jcris...@debian.org
Date:   Thu Jun 9 20:06:00 2011 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 39b568d..80053d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-libdrm (2.4.25-3) UNRELEASED; urgency=low
+libdrm (2.4.25-3) unstable; urgency=low
+
+  * Team upload.
 
   [ Steve Langasek ]
   * Build for multiarch.
@@ -8,7 +10,7 @@ libdrm (2.4.25-3) UNRELEASED; urgency=low
 use that for private symbols).
   * Bump Standards-Version to 3.9.2.
 
- -- Julien Cristau jcris...@debian.org  Thu, 09 Jun 2011 19:51:16 +0200
+ -- Julien Cristau jcris...@debian.org  Thu, 09 Jun 2011 20:05:53 +0200
 
 libdrm (2.4.25-2) unstable; urgency=low
 

commit 514f38a13b15767ef4f1d4f0487aaea56f5d4436
Author: Julien Cristau jcris...@debian.org
Date:   Thu Jun 9 20:03:29 2011 +0200

Bump Standards-Version to 3.9.2.

diff --git a/debian/changelog b/debian/changelog
index 3e3cd96..39b568d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libdrm (2.4.25-3) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * Add lintian overrides for symbols-declares-dependency-on-other-package (we
 use that for private symbols).
+  * Bump Standards-Version to 3.9.2.
 
  -- Julien Cristau jcris...@debian.org  Thu, 09 Jun 2011 19:51:16 +0200
 
diff --git a/debian/control b/debian/control
index 1a21fbc..7b3673d 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  pkg-config,
  libpthread-stubs0-dev,
  libudev-dev [linux-any],
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Section: libs
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdrm
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libdrm.git

commit cb38517b4494dedf1325a8ffbe3bcc0798ae14c4
Author: Julien Cristau jcris...@debian.org
Date:   Thu Jun 9 20:01:26 2011 +0200

Add lintian overrides for symbols-declares-dependency-on-other-package

We use that for private symbols.

diff --git a/debian/changelog b/debian/changelog
index 18ef67e..3e3cd96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ libdrm (2.4.25-3) UNRELEASED; urgency=low
   [ Steve Langasek ]
   * Build for multiarch.
 
+  [ Julien Cristau ]
+  * Add lintian overrides for symbols-declares-dependency-on-other-package (we
+use that for private symbols).
+
  -- Julien Cristau jcris...@debian.org  Thu, 09 Jun 2011 19:51:16 +0200
 
 libdrm (2.4.25-2) unstable; urgency=low
diff --git a/debian/libdrm-radeon1.lintian-overrides 
b/debian/libdrm-radeon1.lintian-overrides
new file mode 100644
index 000..0e452e0
--- /dev/null
+++ b/debian/libdrm-radeon1.lintian-overrides
@@ -0,0 +1 @@
+libdrm-radeon1: symbols-declares-dependency-on-other-package 
libdrm-radeon-private
diff --git a/debian/libkms1.lintian-overrides b/debian/libkms1.lintian-overrides
new file mode 100644
index 000..0617799
--- /dev/null
+++ b/debian/libkms1.lintian-overrides
@@ -0,0 +1 @@
+symbols-declares-dependency-on-other-package libkms-private

commit ce8ce08657202ca8a254f8fc02a3d3f6d9d3dabb
Author: Julien Cristau jcris...@debian.org
Date:   Thu Jun 9 19:57:13 2011 +0200

Add changelog entry

diff --git a/debian/changelog b/debian/changelog
index 0d1a16c..18ef67e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdrm (2.4.25-3) UNRELEASED; urgency=low
+
+  [ Steve Langasek ]
+  * Build for multiarch.
+
+ -- Julien Cristau jcris...@debian.org  Thu, 09 Jun 2011 19:51:16 +0200
+
 libdrm (2.4.25-2) unstable; urgency=low
 
   * Upload to unstable.

commit a3853a0540b739370fbeb6f252df15b3c4ec629a
Author: Steve Langasek steve.langa...@linaro.org
Date:   Sat Mar 19 20:55:26 2011 -0700

the rest of these packages are also multiarch clean; mark them as such

diff --git a/debian/control b/debian/control
index fef5cab..be025b0 100644
--- a/debian/control
+++ b/debian/control
@@ -77,6 +77,8 @@ Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Userspace interface to intel-specific kernel DRM services -- 
runtime
  This library implements the userspace interface to the intel-specific kernel
  DRM services.  DRM stands for Direct Rendering Manager, which 

libdrm: Changes to 'debian-unstable'

[Cyril Brulebois]

 ChangeLog  |  264 
 Makefile.am|2 
 autogen.sh |   14 
 configure.ac   |   47 +-
 debian/README.source   |   24 -
 debian/changelog   |   25 +
 debian/compat  |2 
 debian/control |   11 
 debian/libdrm2.symbols |1 
 debian/libkms1.symbols |1 
 debian/patches/03_build_against_librt.diff |   11 
 debian/patches/series  |1 
 debian/rules   |  129 +-
 debian/xsfbs/repack.sh |   32 -
 debian/xsfbs/xsfbs.mk  |  285 -
 debian/xsfbs/xsfbs.sh  |  622 -
 include/drm/drm.h  |   14 
 include/drm/drm_mode.h |   29 +
 intel/intel_bufmgr.c   |9 
 intel/intel_bufmgr_gem.c   |7 
 libkms/Makefile.am |1 
 libkms/dumb.c  |  220 ++
 libkms/internal.h  |2 
 libkms/linux.c |3 
 m4/.gitignore  |5 
 tests/Makefile.am  |   12 
 xf86drm.c  |   12 
 xf86drm.h  |4 
 28 files changed, 672 insertions(+), 1117 deletions(-)

New commits:
commit c1ab9be89978e029282495f6d4fde8e298166054
Author: Cyril Brulebois k...@debian.org
Date:   Mon May 16 19:15:03 2011 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index e9ad98a..0d1a16c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.25-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Cyril Brulebois k...@debian.org  Mon, 16 May 2011 19:14:49 +0200
+
 libdrm (2.4.25-1) experimental; urgency=low
 
   * New upstream release.

commit e039fac82ba1dbbaa431fbe3d841fd90ca57ca19
Author: Cyril Brulebois k...@debian.org
Date:   Tue Apr 19 02:57:39 2011 +0200

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 4e98ba1..e9ad98a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.25-1) UNRELEASED; urgency=low
+libdrm (2.4.25-1) experimental; urgency=low
 
   * New upstream release.
   * Update libdrm2.symbols and shlibs.
@@ -15,7 +15,7 @@ libdrm (2.4.25-1) UNRELEASED; urgency=low
   * Remove xsfbs as it's no longer needed.
   * Bump Standards-Version (no changes needed).
 
- -- Cyril Brulebois k...@debian.org  Mon, 18 Apr 2011 22:23:18 +0200
+ -- Cyril Brulebois k...@debian.org  Tue, 19 Apr 2011 02:57:29 +0200
 
 libdrm (2.4.24-2) unstable; urgency=low
 

commit 5d77322c4117871de92b16a9ed8b6c9c476f2dfe
Author: Cyril Brulebois k...@debian.org
Date:   Tue Apr 19 02:57:26 2011 +0200

Bump Standards-Version (no changes needed).

diff --git a/debian/changelog b/debian/changelog
index a847774..4e98ba1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ libdrm (2.4.25-1) UNRELEASED; urgency=low
   * Add libudev-dev build-dep on Linux so that detection works.
   * Since the testsuite just got enabled, let's not bail out if it fails.
   * Remove xsfbs as it's no longer needed.
+  * Bump Standards-Version (no changes needed).
 
  -- Cyril Brulebois k...@debian.org  Mon, 18 Apr 2011 22:23:18 +0200
 
diff --git a/debian/control b/debian/control
index 740832d..793dbb2 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  pkg-config,
  libpthread-stubs0-dev,
  libudev-dev [linux-any],
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Section: libs
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdrm
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libdrm.git

commit ef9924c5181125101556d2bc4dbe15ebcdb21098
Author: Cyril Brulebois k...@debian.org
Date:   Tue Apr 19 02:56:09 2011 +0200

Remove xsfbs as it's no longer needed.

diff --git a/debian/README.source b/debian/README.source
index b09a1ab..4ecd5e6 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -47,27 +47,3 @@ are involved:
   case, it appears directly in the .diff.gz.
 * Otherwise, the patch is added to debian/patches/ which is managed
   with quilt as documented in /usr/share/doc/quilt/README.source.
-
-quilt is actually invoked by the Debian X packaging through a larger
-set of scripts called XSFBS. XSFBS brings some other X specific
-features such as managing dependencies and conflicts due to the video
-and input driver ABIs.
-XSFBS itself is maintained in a separate repository at
-  git://git.debian.org/pkg-xorg/xsfbs.git
-and it is pulled inside the other Debian X repositories when needed.
-
-The XSFBS patching system requires a build dependency on quilt. Also
-a dependency on 

libdrm: Changes to 'debian-unstable'

[Cyril Brulebois]

 configure.ac|5 
 debian/changelog|   19 +++
 debian/libkms1.symbols  |1 
 debian/watch|2 
 include/drm/i915_drm.h  |   14 ++
 intel/intel_bufmgr.c|6 -
 intel/intel_bufmgr.h|2 
 intel/intel_bufmgr_gem.c|   22 ++--
 intel/intel_bufmgr_priv.h   |4 
 libkms/Makefile.am  |4 
 libkms/internal.h   |2 
 libkms/linux.c  |4 
 libkms/radeon.c |  242 
 nouveau/Makefile.am |2 
 nouveau/nouveau_channel.c   |   37 +++---
 nouveau/nouveau_grobj.c |   11 +-
 nouveau/nouveau_pushbuf.h   |   38 --
 nouveau/nouveau_reloc.c |   34 --
 nouveau/nv04_pushbuf.h  |   66 
 nouveau/nvc0_pushbuf.h  |   92 
 tests/modeprint/Makefile.am |4 
 tests/modeprint/modeprint.c |4 
 tests/modetest/Makefile.am  |4 
 tests/modetest/modetest.c   |  137 ++--
 24 files changed, 612 insertions(+), 144 deletions(-)

New commits:
commit 2f0483128b47a19a91352b27abf71a820ba90f28
Author: Cyril Brulebois k...@debian.org
Date:   Sun Apr 10 22:57:11 2011 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index ef9dbc9..fae4a12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libdrm (2.4.24-2) UNRELEASED; urgency=low
+libdrm (2.4.24-2) unstable; urgency=low
 
   * Upload to unstable.
 
- -- Cyril Brulebois k...@debian.org  Sun, 10 Apr 2011 22:51:14 +0200
+ -- Cyril Brulebois k...@debian.org  Sun, 10 Apr 2011 22:57:02 +0200
 
 libdrm (2.4.24-1) experimental; urgency=low
 

commit 8e069a0b0451aac2b9ee09fb0b91f60fe68b8a56
Author: Cyril Brulebois k...@debian.org
Date:   Sun Apr 10 22:56:58 2011 +0200

Mention upstream git URL in a comment.

diff --git a/debian/watch b/debian/watch
index 60b4b63..b2a1765 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
+#git=git://anongit.freedesktop.org/mesa/drm
 version=3
-
 http://dri.freedesktop.org/libdrm/libdrm-(.*)\.tar\.gz

commit 2dbd5ecb719d4d5d88ccad0a71c68cc1dbbd7d75
Author: Cyril Brulebois k...@debian.org
Date:   Sun Apr 10 22:51:37 2011 +0200

Bump changelog for unstable.

diff --git a/debian/changelog b/debian/changelog
index b9229e2..ef9dbc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.24-2) UNRELEASED; urgency=low
+
+  * Upload to unstable.
+
+ -- Cyril Brulebois k...@debian.org  Sun, 10 Apr 2011 22:51:14 +0200
+
 libdrm (2.4.24-1) experimental; urgency=low
 
   [ Christopher James Halse Rogers ]

commit 6c26ff465e0f680800864db026da6a98723a8412
Author: Cyril Brulebois k...@debian.org
Date:   Sat Mar 5 20:27:33 2011 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 375199f..b9229e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.24-1) UNRELEASED; urgency=low
+libdrm (2.4.24-1) experimental; urgency=low
 
   [ Christopher James Halse Rogers ]
   * New upstream release.
@@ -9,7 +9,7 @@ libdrm (2.4.24-1) UNRELEASED; urgency=low
 warning, since patches were sent upstream to stop exporting private
 symbols: symbols-declares-dependency-on-other-package
 
- -- Christopher James Halse Rogers r...@ubuntu.com  Fri, 04 Mar 2011 
11:24:07 +1100
+ -- Cyril Brulebois k...@debian.org  Sat, 05 Mar 2011 20:27:23 +0100
 
 libdrm (2.4.23-3) unstable; urgency=low
 

commit 80190376c877b3cc1fbd9888e225071f4d2bf1bd
Author: Cyril Brulebois k...@debian.org
Date:   Sat Mar 5 20:27:07 2011 +0100

No need to mention previous cherry-picks.

diff --git a/debian/changelog b/debian/changelog
index 886c938..375199f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,6 @@ libdrm (2.4.24-1) UNRELEASED; urgency=low
 
   [ Christopher James Halse Rogers ]
   * New upstream release.
-- Contains intel cherry-picks taken in 2.4.23-3.
   * Add new internal radeon symbols to libkms1.symbols
 
   [ Cyril Brulebois ]

commit fefbe7bcf96610372f6344ecd626d8b54b369b4a
Author: Cyril Brulebois k...@debian.org
Date:   Sat Mar 5 20:17:49 2011 +0100

Add a reminder for lintian warning.

diff --git a/debian/changelog b/debian/changelog
index 9f5f54d..886c938 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
 libdrm (2.4.24-1) UNRELEASED; urgency=low
 
+  [ Christopher James Halse Rogers ]
   * New upstream release.
 - Contains intel cherry-picks taken in 2.4.23-3.
   * Add new internal radeon symbols to libkms1.symbols
 
+  [ Cyril Brulebois ]
+  * Just as a reminder, not adding a lintian override for the following
+warning, since patches were sent upstream to stop exporting private
+symbols: symbols-declares-dependency-on-other-package
+
  -- Christopher James Halse Rogers r...@ubuntu.com  Fri, 04 Mar 2011 
11:24:07 +1100
 
 libdrm (2.4.23-3) unstable; urgency=low

commit a11ea35f4ffb32591da33dba6e242d246d58ad7d
Author: Christopher James 

libdrm: Changes to 'debian-unstable'

[Cyril Brulebois]

 debian/changelog |   16 
 debian/libdrm-intel1.symbols |2 +-
 debian/rules |2 +-
 intel/intel_bufmgr.c |4 
 intel/intel_bufmgr_gem.c |   29 +
 5 files changed, 51 insertions(+), 2 deletions(-)

New commits:
commit 8dbd9c6ac6f5a5803a39b93d65cdd9a9fb7e21b2
Author: Cyril Brulebois k...@debian.org
Date:   Wed Feb 16 11:44:48 2011 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 26372aa..9e5318e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.23-3) UNRELEASED; urgency=low
+libdrm (2.4.23-3) unstable; urgency=low
 
   * Cherry-pick from upstream:
 - intel: Fallback to old exec if no mrb_exec is available
@@ -12,7 +12,7 @@ libdrm (2.4.23-3) UNRELEASED; urgency=low
 (Closes: #609299).
   * Bump the libdrm-intel1 shlibs version for consistency.
 
- -- Cyril Brulebois k...@debian.org  Wed, 16 Feb 2011 11:04:43 +0100
+ -- Cyril Brulebois k...@debian.org  Wed, 16 Feb 2011 11:44:44 +0100
 
 libdrm (2.4.23-2) unstable; urgency=low
 

commit af6d552526b32d1b713a0fe9c4f9c1385b945a2e
Author: Cyril Brulebois k...@debian.org
Date:   Wed Feb 16 11:40:39 2011 +0100

Make lintian/backporters happy…

diff --git a/debian/libdrm-intel1.symbols b/debian/libdrm-intel1.symbols
index 750f65b..3634492 100644
--- a/debian/libdrm-intel1.symbols
+++ b/debian/libdrm-intel1.symbols
@@ -16,7 +16,7 @@ libdrm_intel.so.1 libdrm-intel1 #MINVER#
  drm_intel_bo_is_reusable@Base 2.4.21
  drm_intel_bo_madvise@Base 2.4.16
  drm_intel_bo_map@Base 2.4.1
- drm_intel_bo_mrb_exec@Base 2.4.23-3
+ drm_intel_bo_mrb_exec@Base 2.4.23-3~
  drm_intel_bo_pin@Base 2.4.1
  drm_intel_bo_reference@Base 2.4.1
  drm_intel_bo_references@Base 2.4.15
diff --git a/debian/rules b/debian/rules
index 69b2e89..4d838ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -144,7 +144,7 @@ endif
dh_fixperms -s
dh_makeshlibs -plibdrm2 -V'libdrm2 (= 2.4.17)' -- -c4
 ifeq ($(INTEL), yes)
-   dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (= 2.4.23-3)' -- -c4
+   dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (= 2.4.23-3~)' -- -c4
 endif
 ifeq ($(NOUVEAU), yes)
dh_makeshlibs -plibdrm-nouveau1a -V'libdrm-nouveau1a (= 2.4.23)' -- -c4

commit ff3f97e2d8f6643324361806f86379675c7d25a9
Author: Cyril Brulebois k...@debian.org
Date:   Wed Feb 16 11:39:46 2011 +0100

Bump the libdrm-intel1 shlibs version for consistency.

diff --git a/debian/changelog b/debian/changelog
index 51eed55..26372aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ libdrm (2.4.23-3) UNRELEASED; urgency=low
 libdrm-intel1's symbols file. While the former version is alright
 from a shared object point of view, runtime doesn't seem to agree
 (Closes: #609299).
+  * Bump the libdrm-intel1 shlibs version for consistency.
 
  -- Cyril Brulebois k...@debian.org  Wed, 16 Feb 2011 11:04:43 +0100
 
diff --git a/debian/rules b/debian/rules
index 82741af..69b2e89 100755
--- a/debian/rules
+++ b/debian/rules
@@ -144,7 +144,7 @@ endif
dh_fixperms -s
dh_makeshlibs -plibdrm2 -V'libdrm2 (= 2.4.17)' -- -c4
 ifeq ($(INTEL), yes)
-   dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (= 2.4.21)' -- -c4
+   dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (= 2.4.23-3)' -- -c4
 endif
 ifeq ($(NOUVEAU), yes)
dh_makeshlibs -plibdrm-nouveau1a -V'libdrm-nouveau1a (= 2.4.23)' -- -c4

commit 070f3a6c02359e5966a747b5aa79d2bdf21140b6
Author: Cyril Brulebois k...@debian.org
Date:   Wed Feb 16 11:32:06 2011 +0100

Bump dependency to 2.4.23-3 for the drm_intel_bo_mrb_exec symbol.

Hopefully closes: #609299.

diff --git a/debian/changelog b/debian/changelog
index 7ff3e0c..51eed55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ libdrm (2.4.23-3) UNRELEASED; urgency=low
 - intel: Remember named bo
   * The first of those fixes should fix some failures to submit batch
 buffer (Closes: #612766).
+  * Bump dependency to 2.4.23-3 for the drm_intel_bo_mrb_exec symbol in
+libdrm-intel1's symbols file. While the former version is alright
+from a shared object point of view, runtime doesn't seem to agree
+(Closes: #609299).
 
  -- Cyril Brulebois k...@debian.org  Wed, 16 Feb 2011 11:04:43 +0100
 
diff --git a/debian/libdrm-intel1.symbols b/debian/libdrm-intel1.symbols
index 24b01cb..750f65b 100644
--- a/debian/libdrm-intel1.symbols
+++ b/debian/libdrm-intel1.symbols
@@ -16,7 +16,7 @@ libdrm_intel.so.1 libdrm-intel1 #MINVER#
  drm_intel_bo_is_reusable@Base 2.4.21
  drm_intel_bo_madvise@Base 2.4.16
  drm_intel_bo_map@Base 2.4.1
- drm_intel_bo_mrb_exec@Base 2.4.21
+ drm_intel_bo_mrb_exec@Base 2.4.23-3
  drm_intel_bo_pin@Base 2.4.1
  drm_intel_bo_reference@Base 2.4.1
  drm_intel_bo_references@Base 2.4.15

commit 961bd23b6adb02726bd3307d1b53feedfa592945
Author: Cyril Brulebois k...@debian.org
Date:   Wed Feb 16 11:11:00 2011 +0100

libdrm: Changes to 'debian-unstable'

[Cyril Brulebois]

Rebased ref, commits from common ancestor:
commit f7181ec00542fa7b7527111ed5e0f34790fa64cc
Author: Cyril Brulebois k...@debian.org
Date:   Sat Feb 5 11:26:50 2011 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 466a503..a83bdd2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-libdrm (2.4.23-2) UNRELEASED; urgency=low
+libdrm (2.4.23-2) unstable; urgency=low
 
+  * Upload to unstable.
   * Update Uploaders list. Thanks, David  Brice!
 
- -- Cyril Brulebois k...@debian.org  Sat, 05 Feb 2011 11:25:09 +0100
+ -- Cyril Brulebois k...@debian.org  Sat, 05 Feb 2011 11:26:44 +0100
 
 libdrm (2.4.23-1) experimental; urgency=low
 

commit 681f4acb147a22c1ea55126a2c6a108b24e9f267
Author: Cyril Brulebois k...@debian.org
Date:   Sat Feb 5 11:26:27 2011 +0100

Remove trailing spaces.

diff --git a/debian/changelog b/debian/changelog
index 26e7b6a..466a503 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,7 @@ libdrm (2.4.23-1) experimental; urgency=low
 - Adjust the lintian override.
 - Bump libdrm-nouveau shlibs and symbols versions to 2.4.23.
   * Use dh_prep instead of the deprecated dh_clean -k in debian/rules.
-  
+
  -- Julien Cristau jcris...@debian.org  Thu, 23 Dec 2010 17:56:54 +0100
 
 libdrm (2.4.22-2) experimental; urgency=low

commit 1302fb6a31ec45428cacce2caf1b9838b96db820
Author: Cyril Brulebois k...@debian.org
Date:   Sat Feb 5 11:26:11 2011 +0100

Update Uploaders list. Thanks, David  Brice!

diff --git a/debian/changelog b/debian/changelog
index dc81cc4..26e7b6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.23-2) UNRELEASED; urgency=low
+
+  * Update Uploaders list. Thanks, David  Brice!
+
+ -- Cyril Brulebois k...@debian.org  Sat, 05 Feb 2011 11:25:09 +0100
+
 libdrm (2.4.23-1) experimental; urgency=low
 
   [ Sven Joachim ]
diff --git a/debian/control b/debian/control
index cc5091a..2ac055d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: libdrm
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@debian.org, Cyril Brulebois k...@debian.org
+Uploaders: Cyril Brulebois k...@debian.org
 Build-Depends:
  debhelper (= 7.2.7),
  libx11-dev,

commit 27afd439e485e6ed52290d4114604eca2f28bc58
Author: Julien Cristau jcris...@debian.org
Date:   Thu Dec 23 17:57:26 2010 +0100

Upload to experimental

diff --git a/debian/changelog b/debian/changelog
index 8def930..dc81cc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-libdrm (2.4.23-1) UNRELEASED; urgency=low
+libdrm (2.4.23-1) experimental; urgency=low
 
+  [ Sven Joachim ]
   * New upstream release.
   * Rename the libdrm-nouveau1 package to libdrm-nouveau1a, since upstream
 broke the ABI without changing the soname.
@@ -9,7 +10,7 @@ libdrm (2.4.23-1) UNRELEASED; urgency=low
 - Bump libdrm-nouveau shlibs and symbols versions to 2.4.23.
   * Use dh_prep instead of the deprecated dh_clean -k in debian/rules.
   
- -- Sven Joachim svenj...@gmx.de  Tue, 14 Dec 2010 14:28:11 +0100
+ -- Julien Cristau jcris...@debian.org  Thu, 23 Dec 2010 17:56:54 +0100
 
 libdrm (2.4.22-2) experimental; urgency=low
 

commit 2abd407d29cc6509728e2897e7b50f0d7f9a924e
Author: Sven Joachim svenj...@gmx.de
Date:   Tue Dec 14 16:09:14 2010 +0100

Use dh_prep instead of dh_clean -k

The latter is deprecated, and we're build-depending on a new enough
debhelper to use the former.

diff --git a/debian/changelog b/debian/changelog
index 542c9dc..8def930 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ libdrm (2.4.23-1) UNRELEASED; urgency=low
   remove the Breaks against xserver-xorg-video-nouveau.
 - Adjust the lintian override.
 - Bump libdrm-nouveau shlibs and symbols versions to 2.4.23.
+  * Use dh_prep instead of the deprecated dh_clean -k in debian/rules.
   
  -- Sven Joachim svenj...@gmx.de  Tue, 14 Dec 2010 14:28:11 +0100
 
diff --git a/debian/rules b/debian/rules
index e2dc066..82741af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -108,7 +108,7 @@ clean: xsfclean
 install: build
dh_testdir
dh_testroot
-   dh_clean -k
+   dh_prep
dh_installdirs
 
cd build  $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp

commit b8a75a799d9412320e07cddaf145c5d4d900e199
Author: Sven Joachim svenj...@gmx.de
Date:   Tue Dec 14 14:44:05 2010 +0100

Bump symbols and shlibs versions of libdrm-nouveau1a

Mostly for documentary purposes, the numbers do not really matter.

diff --git a/debian/changelog b/debian/changelog
index bc9..542c9dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libdrm (2.4.23-1) UNRELEASED; urgency=low
 - Make libdrm-nouveau1a{,-dbg} conflict with libdrm-nouveau1{,-dbg} and
   remove the Breaks against xserver-xorg-video-nouveau.
 - Adjust the lintian override.
+- Bump 

libdrm: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog  |6 
 include/drm/drm_mode.h|4 ++
 include/drm/i915_drm.h|4 +-
 include/drm/nouveau_drm.h |1 
 include/drm/radeon_drm.h  |4 ++
 include/drm/vmwgfx_drm.h  |   69 ++
 6 files changed, 85 insertions(+), 3 deletions(-)

New commits:
commit d457902970d1561d0f9d663839ec49a25930ab10
Author: Julien Cristau jcris...@debian.org
Date:   Mon Sep 20 16:51:13 2010 +0200

Add changelog entry

diff --git a/debian/changelog b/debian/changelog
index acf7005..e980fc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.21-1~squeeze3) unstable; urgency=low
+
+  * Update kernel drm headers.
+
+ -- Julien Cristau jcris...@debian.org  Mon, 20 Sep 2010 16:51:11 +0200
+
 libdrm (2.4.21-1~squeeze2) unstable; urgency=low
 
   [ Sven Joachim ]

commit 57ebd699b73a7119cb422e43710f262cae1331a5
Author: Dave Airlie airl...@redhat.com
Date:   Wed Aug 4 08:41:23 2010 +1000

Copy headers from kernel drm-core-next
(cherry picked from commit 431f7f00db844534dbcf9a63da0d2832a3d91bff)

diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
index 43009bc..0fc7397 100644
--- a/include/drm/drm_mode.h
+++ b/include/drm/drm_mode.h
@@ -74,6 +74,7 @@
 /* Dithering mode options */
 #define DRM_MODE_DITHERING_OFF 0
 #define DRM_MODE_DITHERING_ON  1
+#define DRM_MODE_DITHERING_AUTO 2
 
 /* Dirty info options */
 #define DRM_MODE_DIRTY_OFF  0
@@ -85,7 +86,7 @@ struct drm_mode_modeinfo {
__u16 hdisplay, hsync_start, hsync_end, htotal, hskew;
__u16 vdisplay, vsync_start, vsync_end, vtotal, vscan;
 
-   __u32 vrefresh; /* vertical refresh * 1000 */
+   __u32 vrefresh;
 
__u32 flags;
__u32 type;
@@ -160,6 +161,7 @@ struct drm_mode_get_encoder {
 #define DRM_MODE_CONNECTOR_HDMIA   11
 #define DRM_MODE_CONNECTOR_HDMIB   12
 #define DRM_MODE_CONNECTOR_TV  13
+#define DRM_MODE_CONNECTOR_eDP 14
 
 struct drm_mode_get_connector {
 
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
index c040afa..7594413 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -617,8 +617,8 @@ struct drm_i915_gem_execbuffer2 {
__u32 num_cliprects;
/** This is a struct drm_clip_rect *cliprects */
__u64 cliprects_ptr;
-#define I915_EXEC_RENDER   (1  0)
-#define I915_EXEC_BSD  (1  1)
+#define I915_EXEC_RENDER (10)
+#define I915_EXEC_BSD(11)
__u64 flags;
__u64 rsvd1;
__u64 rsvd2;
diff --git a/include/drm/nouveau_drm.h b/include/drm/nouveau_drm.h
index a6a9f4a..fe917de 100644
--- a/include/drm/nouveau_drm.h
+++ b/include/drm/nouveau_drm.h
@@ -79,6 +79,7 @@ struct drm_nouveau_gpuobj_free {
 #define NOUVEAU_GETPARAM_CHIPSET_ID  11
 #define NOUVEAU_GETPARAM_VM_VRAM_BASE12
 #define NOUVEAU_GETPARAM_GRAPH_UNITS 13
+#define NOUVEAU_GETPARAM_PTIMER_TIME 14
 struct drm_nouveau_getparam {
uint64_t param;
uint64_t value;
diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h
index ff97e48..3b762d6 100644
--- a/include/drm/radeon_drm.h
+++ b/include/drm/radeon_drm.h
@@ -902,6 +902,10 @@ struct drm_radeon_cs {
 #define RADEON_INFO_NUM_GB_PIPES   0x01
 #define RADEON_INFO_NUM_Z_PIPES0x02
 #define RADEON_INFO_ACCEL_WORKING  0x03
+#define RADEON_INFO_CRTC_FROM_ID   0x04
+#define RADEON_INFO_ACCEL_WORKING2 0x05
+#define RADEON_INFO_TILING_CONFIG  0x06
+#define RADEON_INFO_WANT_HYPERZ0x07
 
 struct drm_radeon_info {
uint32_trequest;
diff --git a/include/drm/vmwgfx_drm.h b/include/drm/vmwgfx_drm.h
index 47914bd..4d08423 100644
--- a/include/drm/vmwgfx_drm.h
+++ b/include/drm/vmwgfx_drm.h
@@ -50,6 +50,8 @@
 #define DRM_VMW_EXECBUF  12
 #define DRM_VMW_FIFO_DEBUG   13
 #define DRM_VMW_FENCE_WAIT   14
+/* guarded by minor version = 2 */
+#define DRM_VMW_UPDATE_LAYOUT15
 
 
 /*/
@@ -88,6 +90,49 @@ struct drm_vmw_getparam_arg {
 
 /*/
 /**
+ * DRM_VMW_EXTENSION - Query device extensions.
+ */
+
+/**
+ * struct drm_vmw_extension_rep
+ *
+ * @exists: The queried extension exists.
+ * @driver_ioctl_offset: Ioctl number of the first ioctl in the extension.
+ * @driver_sarea_offset: Offset to any space in the DRI SAREA
+ * used by the extension.
+ * @major: Major version number of the extension.
+ * @minor: Minor version number of the extension.
+ * @pl: Patch level version number of the extension.
+ *
+ * Output argument to the DRM_VMW_EXTENSION Ioctl.
+ */
+
+struct drm_vmw_extension_rep {
+   int32_t exists;
+   uint32_t driver_ioctl_offset;
+   uint32_t driver_sarea_offset;
+   uint32_t major;
+   uint32_t minor;
+   uint32_t pl;
+   uint32_t pad64;
+};

libdrm: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 1456c7cd9d1e62c51366063fbf7b09fa8764f1dc
Author: Julien Cristau jcris...@debian.org
Date:   Wed Aug 25 12:20:46 2010 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 1043796..acf7005 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-libdrm (2.4.21-1~squeeze2) UNRELEASED; urgency=low
+libdrm (2.4.21-1~squeeze2) unstable; urgency=low
 
+  [ Sven Joachim ]
   * Restore 04_fix_nouveau_bo_new_tile_segfault.diff, actually only half
 applied upstream.
 
- -- Sven Joachim svenj...@gmx.de  Tue, 24 Aug 2010 22:16:07 +0200
+ -- Julien Cristau jcris...@debian.org  Wed, 25 Aug 2010 12:20:40 +0200
 
 libdrm (2.4.21-1~squeeze1) unstable; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1oodaz-0005r5...@alioth.debian.org

Re: libdrm: Changes to 'debian-unstable'

[Julien Cristau]

On Tue, Aug 24, 2010 at 22:33:07 +0200, Sven Joachim wrote:

 On 2010-08-24 21:53 +0200, Julien Cristau wrote:
 
  Can you fix it up?  I'll reupload.
 
 Done.
 
Thanks, uploaded now.  Again sorry for the breakage.

Cheers,
Julien


signature.asc
Description: Digital signature

Re: libdrm: Changes to 'debian-unstable'

[Sven Joachim]

On 2010-08-24 22:33 +0200, Sven Joachim wrote:

 On 2010-08-24 21:53 +0200, Julien Cristau wrote:

 On Tue, Aug 24, 2010 at 21:48:51 +0200, Sven Joachim wrote:
 BTW, it is now possible to install the experimental
 xserver-xorg-video-nouveau together with sid's libdrm-nouveau1. :-/
 
 Yeah, I know :/
 I needed a newer libdrm in sid for intel, and didn't see a way to avoid
 this.

 Maybe we should bite the bullet and rename the experimental
 libdrm-nouveau package, there is now another reverse dependency
 (plymouth) in sid.  Alternatively we could bump the symbols version to
 2.4.21-1.

I have done the latter in the libdrm debian-experimental branch and also
prepared a new nouveau snapshot which build-depends on the updated
libdrm, so that the rebuilt nouveau package will depend on
libdrm-nouveau1 (= 2.4.21-1).  Could you please check and upload these?

Cheers,
   Sven


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/878w3usicr@turtle.gmx.de

Re: libdrm: Changes to 'debian-unstable'

[Julien Cristau]

On Wed, Aug 25, 2010 at 19:38:28 +0200, Sven Joachim wrote:

 I have done the latter in the libdrm debian-experimental branch and also
 prepared a new nouveau snapshot which build-depends on the updated
 libdrm, so that the rebuilt nouveau package will depend on
 libdrm-nouveau1 (= 2.4.21-1).  Could you please check and upload these?
 
Uploaded.

Cheers,
Julien


signature.asc
Description: Digital signature

libdrm: Changes to 'debian-unstable'

[Julien Cristau]

 .gitignore  |1 
 ChangeLog   |  677 +
 Makefile.am |1 
 configure.ac|   63 
 debian/changelog|   66 
 debian/control  |1 
 debian/copyright|  291 
 debian/libdrm-intel1.symbols|4 
 debian/libdrm-nouveau1.install  |2 
 debian/libdrm-radeon1.symbols   |   21 
 debian/libkms1.install  |1 
 debian/libkms1.symbols  |   14 
 debian/patches/02_build_libkms_against_in_tree_drm.diff |   17 
 debian/patches/03_revert_abi_change.diff| 9131 +++-
 debian/patches/04_fix_nouveau_bo_new_tile_segfault.diff |   21 
 debian/patches/series   |2 
 debian/rules|   15 
 include/drm/Makefile.am |2 
 include/drm/drm.h   |2 
 include/drm/drm_mode.h  |   37 
 include/drm/i915_drm.h  |   59 
 include/drm/radeon_drm.h|1 
 include/drm/vmwgfx_drm.h|   63 
 intel/Makefile.am   |3 
 intel/intel_atomic.h|   93 
 intel/intel_bufmgr.c|   32 
 intel/intel_bufmgr.h|9 
 intel/intel_bufmgr_fake.c   |4 
 intel/intel_bufmgr_gem.c|  507 
 intel/intel_bufmgr_priv.h   |   19 
 intel/intel_chipset.h   |   90 
 intel/libdrm_intel.pc.in|2 
 libdrm.pc.in|2 
 libkms/Makefile.am  |8 
 libkms/intel.c  |2 
 libkms/internal.h   |2 
 libkms/libkms.pc.in |2 
 libkms/linux.c  |4 
 libkms/nouveau.c|  220 
 nouveau/Makefile.am |3 
 nouveau/libdrm_nouveau.pc.in|3 
 nouveau/nouveau_bo.c|2 
 nouveau/nouveau_channel.c   |2 
 nouveau/nouveau_class.h | 9041 ---
 nouveau/nouveau_private.h   |1 
 nouveau/nouveau_reloc.c |6 
 radeon/Makefile.am  |6 
 radeon/bof.c|  477 
 radeon/bof.h|   90 
 radeon/libdrm_radeon.pc.in  |2 
 radeon/radeon_bo.h  |1 
 radeon/radeon_bo_gem.c  |9 
 radeon/radeon_bo_gem.h  |1 
 radeon/radeon_cs.c  |6 
 radeon/radeon_cs.h  |4 
 radeon/radeon_cs_gem.c  |  231 
 radeon/radeon_cs_int.h  |1 
 tests/Makefile.am   |   10 
 tests/kmstest/main.c|1 
 tests/modeprint/modeprint.c |4 
 tests/modetest/modetest.c   |   29 
 tests/vbltest/Makefile.am   |   11 
 tests/vbltest/vbltest.c |  188 
 xf86atomic.h|   99 
 xf86drmMode.h   |2 
 65 files changed, 12268 insertions(+), 9453 deletions(-)

New commits:
commit 752295ba101d84b8e3e695621fa41ce9406104e1
Author: Julien Cristau jcris...@debian.org
Date:   Tue Aug 24 19:32:36 2010 +0200

Drop 04_fix_nouveau_bo_new_tile_segfault.diff, applied upstream.

diff --git a/debian/changelog b/debian/changelog
index 9fcae3c..6be4f93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libdrm (2.4.21-2) UNRELEASED; urgency=low
 
   * Revert nouveau ABI update.
   * Don't build libkms and vmwgfx.
+  * Drop 04_fix_nouveau_bo_new_tile_segfault.diff, applied upstream.
 
  -- Julien Cristau jcris...@debian.org  Tue, 24 Aug 2010 18:27:59 +0200
 
diff --git a/debian/patches/04_fix_nouveau_bo_new_tile_segfault.diff 

libdrm: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 854772f78e247521882b1e4cc2e484ece7f7a2ed
Author: Julien Cristau jcris...@debian.org
Date:   Tue Aug 24 19:48:50 2010 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 6be4f93..9ad2c05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdrm (2.4.21-2) UNRELEASED; urgency=low
+libdrm (2.4.21-1~squeeze1) unstable; urgency=low
 
   * Revert nouveau ABI update.
   * Don't build libkms and vmwgfx.
   * Drop 04_fix_nouveau_bo_new_tile_segfault.diff, applied upstream.
 
- -- Julien Cristau jcris...@debian.org  Tue, 24 Aug 2010 18:27:59 +0200
+ -- Julien Cristau jcris...@debian.org  Tue, 24 Aug 2010 19:47:57 +0200
 
 libdrm (2.4.21-1) experimental; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1onzfd-0001cu...@alioth.debian.org

Re: libdrm: Changes to 'debian-unstable'

[Sven Joachim]

On 2010-08-24 21:03 +0200, Julien Cristau wrote:

 New commits:
 commit 752295ba101d84b8e3e695621fa41ce9406104e1
 Author: Julien Cristau jcris...@debian.org
 Date:   Tue Aug 24 19:32:36 2010 +0200

 Drop 04_fix_nouveau_bo_new_tile_segfault.diff, applied upstream.

This is actually only half correct.

 diff --git a/debian/patches/04_fix_nouveau_bo_new_tile_segfault.diff 
 b/debian/patches/04_fix_nouveau_bo_new_tile_segfault.diff
 deleted file mode 100644
 index c8cc948..000
 --- a/debian/patches/04_fix_nouveau_bo_new_tile_segfault.diff
 +++ /dev/null
 @@ -1,21 +0,0 @@
 -Index: b/nouveau/nouveau_bo.c
 -===
  a/nouveau/nouveau_bo.c
 -+++ b/nouveau/nouveau_bo.c
 -@@ -198,14 +198,14 @@
 - if (flags  (NOUVEAU_BO_VRAM | NOUVEAU_BO_GART)) {
 - ret = nouveau_bo_kalloc(nvbo, NULL);
 - if (ret) {
 --nouveau_bo_ref(NULL, (void *)nvbo);
 -+nouveau_bo_ref(NULL, (void *)nvbo);
 - return ret;

This hunk has been superseded by the updated 03_revert_abi_change.diff.

 - if (flags  NOUVEAU_BO_PIN) {
 - ret = nouveau_bo_pin((void *)nvbo, nvbo-flags);
 - if (ret) {
 --nouveau_bo_ref(NULL, (void *)nvbo);
 -+nouveau_bo_ref(NULL, (void *)nvbo);
 - return ret;

But that one needs to be restored (this path does not exist upstream
anymore).

BTW, it is now possible to install the experimental
xserver-xorg-video-nouveau together with sid's libdrm-nouveau1. :-/

Cheers,
   Sven


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/87iq2zu6zg@turtle.gmx.de

Re: libdrm: Changes to 'debian-unstable'

[Julien Cristau]

On Tue, Aug 24, 2010 at 21:48:51 +0200, Sven Joachim wrote:

 On 2010-08-24 21:03 +0200, Julien Cristau wrote:
 
  New commits:
  commit 752295ba101d84b8e3e695621fa41ce9406104e1
  Author: Julien Cristau jcris...@debian.org
  Date:   Tue Aug 24 19:32:36 2010 +0200
 
  Drop 04_fix_nouveau_bo_new_tile_segfault.diff, applied upstream.
 
 This is actually only half correct.
 
Damn, sorry about that.

  -   if (flags  NOUVEAU_BO_PIN) {
  -   ret = nouveau_bo_pin((void *)nvbo, nvbo-flags);
  -   if (ret) {
  --  nouveau_bo_ref(NULL, (void *)nvbo);
  -+  nouveau_bo_ref(NULL, (void *)nvbo);
  -   return ret;
 
 But that one needs to be restored (this path does not exist upstream
 anymore).
 
Can you fix it up?  I'll reupload.

 BTW, it is now possible to install the experimental
 xserver-xorg-video-nouveau together with sid's libdrm-nouveau1. :-/
 
Yeah, I know :/
I needed a newer libdrm in sid for intel, and didn't see a way to avoid
this.

Thanks for the review.

Cheers,
Julien


signature.asc
Description: Digital signature

Re: libdrm: Changes to 'debian-unstable'

[Sven Joachim]

On 2010-08-24 21:53 +0200, Julien Cristau wrote:

 On Tue, Aug 24, 2010 at 21:48:51 +0200, Sven Joachim wrote:

 On 2010-08-24 21:03 +0200, Julien Cristau wrote:
 
  New commits:
  commit 752295ba101d84b8e3e695621fa41ce9406104e1
  Author: Julien Cristau jcris...@debian.org
  Date:   Tue Aug 24 19:32:36 2010 +0200
 
  Drop 04_fix_nouveau_bo_new_tile_segfault.diff, applied upstream.
 
 This is actually only half correct.
 
 Damn, sorry about that.

  -  if (flags  NOUVEAU_BO_PIN) {
  -  ret = nouveau_bo_pin((void *)nvbo, nvbo-flags);
  -  if (ret) {
  -- nouveau_bo_ref(NULL, (void *)nvbo);
  -+ nouveau_bo_ref(NULL, (void *)nvbo);
  -  return ret;
 
 But that one needs to be restored (this path does not exist upstream
 anymore).
 
 Can you fix it up?  I'll reupload.

Done.

 BTW, it is now possible to install the experimental
 xserver-xorg-video-nouveau together with sid's libdrm-nouveau1. :-/
 
 Yeah, I know :/
 I needed a newer libdrm in sid for intel, and didn't see a way to avoid
 this.

Maybe we should bite the bullet and rename the experimental
libdrm-nouveau package, there is now another reverse dependency
(plymouth) in sid.  Alternatively we could bump the symbols version to
2.4.21-1.

Cheers,
   Sven


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/87bp8ru4xo@turtle.gmx.de

libdrm: Changes to 'debian-unstable'

[Sven Joachim]

 debian/changelog|7 +++
 debian/patches/04_fix_nouveau_bo_new_tile_segfault.diff |   15 +++
 debian/patches/series   |1 +
 3 files changed, 23 insertions(+)

New commits:
commit 70a3a37650293fed3bced8cf4882ffb1f9b14d9b
Author: Sven Joachim svenj...@gmx.de
Date:   Tue Aug 24 22:17:31 2010 +0200

Restore 04_fix_nouveau_bo_new_tile_segfault.diff

There is another code path which does no longer exist upstream, but is
restored by 03_revert_abi_change.diff.

diff --git a/debian/changelog b/debian/changelog
index 9ad2c05..1043796 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdrm (2.4.21-1~squeeze2) UNRELEASED; urgency=low
+
+  * Restore 04_fix_nouveau_bo_new_tile_segfault.diff, actually only half
+applied upstream.
+
+ -- Sven Joachim svenj...@gmx.de  Tue, 24 Aug 2010 22:16:07 +0200
+
 libdrm (2.4.21-1~squeeze1) unstable; urgency=low
 
   * Revert nouveau ABI update.
diff --git a/debian/patches/04_fix_nouveau_bo_new_tile_segfault.diff 
b/debian/patches/04_fix_nouveau_bo_new_tile_segfault.diff
new file mode 100644
index 000..3761552
--- /dev/null
+++ b/debian/patches/04_fix_nouveau_bo_new_tile_segfault.diff
@@ -0,0 +1,15 @@
+---
+ nouveau/nouveau_bo.c |2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/nouveau/nouveau_bo.c
 b/nouveau/nouveau_bo.c
+@@ -205,7 +205,7 @@
+   if (flags  NOUVEAU_BO_PIN) {
+   ret = nouveau_bo_pin((void *)nvbo, nvbo-flags);
+   if (ret) {
+-  nouveau_bo_ref(NULL, (void *)nvbo);
++  nouveau_bo_ref(NULL, (void *)nvbo);
+   return ret;
+   }
+   }
diff --git a/debian/patches/series b/debian/patches/series
index 419cc8b..512df25 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_default_perms.diff
 02_build_libkms_against_in_tree_drm.diff
 03_revert_abi_change.diff
+04_fix_nouveau_bo_new_tile_segfault.diff


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1oo04z-0005g7...@alioth.debian.org

libdrm: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit e4d9063750bccac07415b6f2540a78fa3398e082
Author: Julien Cristau jcris...@debian.org
Date:   Wed Jun 16 12:22:26 2010 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 4d1e8fc..47aad2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-libdrm (2.4.18-6) UNRELEASED; urgency=low
+libdrm (2.4.18-6) unstable; urgency=medium
 
+  [ Sven Joachim ]
   * New patch 04_fix_nouveau_bo_new_tile_segfault.diff, backported from
 upstream commit df32c307e8f81b46ee8aa4dd7222fc18f175bbb3.  Fixes
 segfault in nouveau_bo_new_tile() failure path (see #579425).
   * Update xsfbs to 81fc271788605b52e85c2d11635a0371fb44605e0.
 
- -- Sven Joachim svenj...@gmx.de  Sat, 22 May 2010 13:17:50 +0200
+ -- Julien Cristau jcris...@debian.org  Wed, 16 Jun 2010 12:21:58 +0100
 
 libdrm (2.4.18-5) unstable; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ooqqu-0005zt...@alioth.debian.org

libdrm: Changes to 'debian-unstable'

[Sven Joachim]

 debian/README.source|2 
 debian/changelog|9 
 debian/patches/04_fix_nouveau_bo_new_tile_segfault.diff |   21 +
 debian/patches/series   |1 
 debian/xsfbs/xsfbs.mk   |   35 ++--
 5 files changed, 54 insertions(+), 14 deletions(-)

New commits:
commit d0e14dd4d1eb18fab55dd9b372c7d2daada59503
Author: Sven Joachim svenj...@gmx.de
Date:   Sat May 22 13:40:50 2010 +0200

debian/changelog entry for xsfbs update

diff --git a/debian/changelog b/debian/changelog
index 75acd5e..4d1e8fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libdrm (2.4.18-6) UNRELEASED; urgency=low
   * New patch 04_fix_nouveau_bo_new_tile_segfault.diff, backported from
 upstream commit df32c307e8f81b46ee8aa4dd7222fc18f175bbb3.  Fixes
 segfault in nouveau_bo_new_tile() failure path (see #579425).
+  * Update xsfbs to 81fc271788605b52e85c2d11635a0371fb44605e0.
 
  -- Sven Joachim svenj...@gmx.de  Sat, 22 May 2010 13:17:50 +0200
 

commit d5b6947a94ecc229be933384d580e5aa166d20eb
Author: Sven Joachim svenj...@gmx.de
Date:   Sat May 22 13:25:13 2010 +0200

Fix segfault in nouveau_bo_new_tile() failure path

New patch 04_fix_nouveau_bo_new_tile_segfault, backported from commit
df32c307e8f81b46ee8aa4dd7222fc18f175bbb3.

diff --git a/debian/changelog b/debian/changelog
index bc62c1d..75acd5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libdrm (2.4.18-6) UNRELEASED; urgency=low
+
+  * New patch 04_fix_nouveau_bo_new_tile_segfault.diff, backported from
+upstream commit df32c307e8f81b46ee8aa4dd7222fc18f175bbb3.  Fixes
+segfault in nouveau_bo_new_tile() failure path (see #579425).
+
+ -- Sven Joachim svenj...@gmx.de  Sat, 22 May 2010 13:17:50 +0200
+
 libdrm (2.4.18-5) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/patches/04_fix_nouveau_bo_new_tile_segfault.diff 
b/debian/patches/04_fix_nouveau_bo_new_tile_segfault.diff
new file mode 100644
index 000..c8cc948
--- /dev/null
+++ b/debian/patches/04_fix_nouveau_bo_new_tile_segfault.diff
@@ -0,0 +1,21 @@
+Index: b/nouveau/nouveau_bo.c
+===
+--- a/nouveau/nouveau_bo.c
 b/nouveau/nouveau_bo.c
+@@ -198,14 +198,14 @@
+   if (flags  (NOUVEAU_BO_VRAM | NOUVEAU_BO_GART)) {
+   ret = nouveau_bo_kalloc(nvbo, NULL);
+   if (ret) {
+-  nouveau_bo_ref(NULL, (void *)nvbo);
++  nouveau_bo_ref(NULL, (void *)nvbo);
+   return ret;
+   }
+ 
+   if (flags  NOUVEAU_BO_PIN) {
+   ret = nouveau_bo_pin((void *)nvbo, nvbo-flags);
+   if (ret) {
+-  nouveau_bo_ref(NULL, (void *)nvbo);
++  nouveau_bo_ref(NULL, (void *)nvbo);
+   return ret;
+   }
+   }
diff --git a/debian/patches/series b/debian/patches/series
index 6d16bf9..9978597 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_default_perms.diff
 03_revert_abi_change.diff
+04_fix_nouveau_bo_new_tile_segfault.diff

commit 81fc271788605b52e85c2d11635a0371fb44605e
Author: Cyril Brulebois k...@debian.org
Date:   Sun May 2 02:14:45 2010 +0200

Add xorg-driver-{video,input} to Provides.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 77c4a39..3c59c20 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -261,8 +261,8 @@ INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 
2/dev/null)
 # these two can be removed post-squeeze
 VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2/dev/null)
 INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2/dev/null)
-VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
-INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
+VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input
 
 ifeq ($(PACKAGE),)
 PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }'  debian/control)

commit b045afbd8277ad0c44e29d7c45802053c4335ccd
Author: Julien Cristau jcris...@debian.org
Date:   Fri Apr 16 22:14:46 2010 +0200

Update serverabi rule for xserver 1.7.6.901

Add new variables ${xviddriver:Depends} and ${xinpdriver:Depends} for
drivers.  The ${xserver:Depends} variable is deprecated.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 351fea5..77c4a39 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -253,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
#debian/*.prerm
$@
 
-SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2/dev/null)
+# Compute dependencies 

libdrm: Changes to 'debian-unstable'

[Cyril Brulebois]

 debian/changelog |   16 
 debian/control   |   26 
 debian/libdrm-nouveau1.install   |1 
 debian/libdrm-nouveau1.symbols   |   59 +
 debian/patches/03_revert_abi_change.diff | 1224 +++
 debian/patches/series|1 
 debian/rules |   10 
 7 files changed, 1337 insertions(+)

New commits:
commit eebc0b4f31062ef36d918f8762c5b85da78fc027
Author: Cyril Brulebois k...@debian.org
Date:   Wed Apr 14 13:03:08 2010 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 79153c3..bc62c1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.18-5) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Cyril Brulebois k...@debian.org  Wed, 14 Apr 2010 13:02:34 +0200
+
 libdrm (2.4.18-4) experimental; urgency=low
 
   * Steal 03_revert_abi_change.diff from Ubuntu to revert the nouveau ABI

commit 197bdde16f9c405936f7a6cdce30322770022562
Author: Brice Goglin bgog...@debian.org
Date:   Wed Mar 24 22:19:10 2010 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index c1d3dda..79153c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.18-4) UNRELEASED; urgency=low
+libdrm (2.4.18-4) experimental; urgency=low
 
   * Steal 03_revert_abi_change.diff from Ubuntu to revert the nouveau ABI
 change.  Current Debian kernels support only the old ABI.
@@ -6,7 +6,7 @@ libdrm (2.4.18-4) UNRELEASED; urgency=low
   * Build a libdrm-nouveau1 package on Linux architectures (Closes: #568162).
 Patch adapted from the Ubuntu package. Thanks Sven Joachim!
 
- -- Brice Goglin bgog...@debian.org  Wed, 24 Mar 2010 22:12:36 +0100
+ -- Brice Goglin bgog...@debian.org  Wed, 24 Mar 2010 22:27:00 +0100
 
 libdrm (2.4.18-3) unstable; urgency=low
 

commit 9f62499e2dd1df046001d174d9a6518b3db929e4
Author: Brice Goglin bgog...@debian.org
Date:   Wed Mar 24 22:18:36 2010 +0100

Build a libdrm-nouveau1 package on Linux architectures (Closes: #568162).

diff --git a/debian/changelog b/debian/changelog
index fe4f1f0..c1d3dda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ libdrm (2.4.18-4) UNRELEASED; urgency=low
   * Steal 03_revert_abi_change.diff from Ubuntu to revert the nouveau ABI
 change.  Current Debian kernels support only the old ABI.
 Thanks Sven Joachim!
+  * Build a libdrm-nouveau1 package on Linux architectures (Closes: #568162).
+Patch adapted from the Ubuntu package. Thanks Sven Joachim!
 
  -- Brice Goglin bgog...@debian.org  Wed, 24 Mar 2010 22:12:36 +0100
 
diff --git a/debian/control b/debian/control
index 65f013a..cf271d8 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,7 @@ Depends:
  libdrm2 (= ${binary:Version}),
  libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
  libdrm-radeon1 (= ${binary:Version}) [linux-any],
+ libdrm-nouveau1 (= ${binary:Version}) [linux-any],
  ${misc:Depends},
 Replaces:
  linux-libc-dev ( 2.6.32-10)
@@ -93,6 +94,31 @@ Description: Userspace interface to intel-specific kernel 
DRM services -- debugg
  .
  This package provides the debugging symbols for the libdrm-intel1 package.
 
+Package: libdrm-nouveau1
+Section: libs
+Architecture: linux-any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+Description: Userspace interface to nouveau-specific kernel DRM services -- 
runtime
+ This library implements the userspace interface to the nouveau-specific kernel
+ DRM services. DRM stands for Direct Rendering Manager, which is the
+ kernelspace portion of the Direct Rendering Infrastructure (DRI). The DRI is
+ currently used on Linux to provide hardware-accelerated OpenGL drivers.
+
+Package: libdrm-nouveau1-dbg
+Section: debug
+Priority: extra
+Architecture: linux-any
+Depends: libdrm-nouveau1 (= ${binary:Version}),
+ ${misc:Depends},
+Description: Userspace interface to nouveau-specific kernel DRM -- debugging 
symbols
+ This library implements the userspace interface to the kernel DRM services.
+ DRM stands for Direct Rendering Manager, which is the kernelspace portion
+ of the Direct Rendering Infrastructure (DRI). The DRI is currently used on
+ Linux to provide hardware-accelerated OpenGL drivers.
+ .
+ This package provides the debugging symbols for the libdrm-nouveau1 package.
+
 Package: libdrm-radeon1
 Section: libs
 Architecture: linux-any
diff --git a/debian/libdrm-nouveau1.install b/debian/libdrm-nouveau1.install
new file mode 100644
index 000..7650858
--- /dev/null
+++ b/debian/libdrm-nouveau1.install
@@ -0,0 +1 @@
+usr/lib/libdrm_nouveau.so.*
diff --git a/debian/libdrm-nouveau1.symbols b/debian/libdrm-nouveau1.symbols
new file mode 100644
index 000..48ce118
--- /dev/null
+++ b/debian/libdrm-nouveau1.symbols
@@ -0,0 +1,59 @@
+libdrm_nouveau.so.1 libdrm-nouveau1 #MINVER#
+#MISSING: 2.4.12+git20090729.5a73f066# d...@base 2.4.4
+ 

libdrm: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 99da4f5ca2b9e82468a7149d9bc201579f22725e
Author: Julien Cristau jcris...@debian.org
Date:   Tue Mar 16 12:29:20 2010 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 4b1ba28..ed279c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdrm (2.4.18-3) UNRELEASED; urgency=low
+libdrm (2.4.18-3) unstable; urgency=low
 
   * Include full SONAME in libdrm*.install to prevent accidental breakage.
   * Add back the drm headers in libdrm-dev.
 
- -- Julien Cristau jcris...@debian.org  Sun, 07 Mar 2010 15:31:51 +0100
+ -- Julien Cristau jcris...@debian.org  Tue, 16 Mar 2010 12:28:50 +0100
 
 libdrm (2.4.18-2) unstable; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1nrv9p-0007xd...@alioth.debian.org

libdrm: Changes to 'debian-unstable'

[Julien Cristau]

 debian/changelog |1 +
 debian/control   |3 ++-
 debian/rules |6 --
 3 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit a88e94deeaf9f642a108ef3b57436a534dc353e0
Author: Julien Cristau jcris...@debian.org
Date:   Mon Mar 15 00:28:11 2010 +0100

Add back the drm headers in libdrm-dev.

diff --git a/debian/changelog b/debian/changelog
index 6f8766d..4b1ba28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libdrm (2.4.18-3) UNRELEASED; urgency=low
 
   * Include full SONAME in libdrm*.install to prevent accidental breakage.
+  * Add back the drm headers in libdrm-dev.
 
  -- Julien Cristau jcris...@debian.org  Sun, 07 Mar 2010 15:31:51 +0100
 
diff --git a/debian/control b/debian/control
index 13708bf..65f013a 100644
--- a/debian/control
+++ b/debian/control
@@ -20,11 +20,12 @@ Package: libdrm-dev
 Section: libdevel
 Architecture: any
 Depends:
- linux-libc-dev (= 2.6.32) [linux-any],
  libdrm2 (= ${binary:Version}),
  libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
  libdrm-radeon1 (= ${binary:Version}) [linux-any],
  ${misc:Depends},
+Replaces:
+ linux-libc-dev ( 2.6.32-10)
 Description: Userspace interface to kernel DRM services -- development files
  This library implements the userspace interface to the kernel DRM
  services.  DRM stands for Direct Rendering Manager, which is the
diff --git a/debian/rules b/debian/rules
index 6eaef3d..dede329 100755
--- a/debian/rules
+++ b/debian/rules
@@ -103,12 +103,6 @@ install: build
dh_installdirs
 
cd build  $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-ifeq (linux, $(DEB_HOST_ARCH_OS))
-   # remove files provided by linux-libc-dev
-   for file in drm_mode.h drm_sarea.h drm.h i915_drm.h mga_drm.h 
r128_drm.h radeon_drm.h savage_drm.h sis_drm.h via_drm.h; do \
-   rm -f debian/tmp/usr/include/drm/$$file; \
-   done
-endif
 
 # Build architecture-independent files here.
 binary-indep: build install


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1nqxfk-0002zp...@alioth.debian.org