ChangeLog | 159 ++++++++++++++++++++++++++
configure.ac | 2
debian/changelog | 67 ++++++----
debian/control | 39 +-----
debian/libdrm-intel1.symbols | 1
debian/libdrm2.symbols | 1
debian/libkms1.install | 1
debian/libkms1.lintian-overrides | 1
debian/libkms1.symbols | 16 --
debian/patches/02_kbsd_modeset.diff | 57 +++++++++
debian/patches/03_build_against_librt.diff | 11 -
debian/patches/add-more-reserved-hsw-ids.diff | 136 ----------------------
debian/patches/fix-hsw-gt3-names.diff | 110 -----------------
debian/patches/series | 4
debian/rules | 31 +----
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
32 files changed, 659 insertions(+), 422 deletions(-)
New commits:
commit adaa21bab73af66545a79f709a227bc498c5b301
Author: Colin Watson <cjwat...@ubuntu.com>
Date: Wed Oct 23 15:39:53 2013 +0100
Declare libdrm-dev Multi-Arch: same.
diff --git a/debian/changelog b/debian/changelog
index 637ea0c..5dc58d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.46-3ubuntu1) trusty; urgency=low
+
+ * Declare libdrm-dev Multi-Arch: same.
+
+ -- 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..94ae419 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
Source: libdrm
Priority: optional
-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Cyril Brulebois <k...@debian.org>
Build-Depends:
debhelper (>= 9),
@@ -30,6 +31,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 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..0000000
--- 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..0000000
--- 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..0000000
--- 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 = no
@@ -80,9 +79,6 @@ 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
dh_strip -s --remaining-packages
override_dh_makeshlibs:
@@ -97,9 +93,6 @@ endif
ifeq ($(OMAP), yes)
dh_makeshlibs -plibdrm-omap1 -V'libdrm-omap1 (>= 2.4.38)' -- -c4
endif
-ifeq ($(LIBKMS), yes)
- dh_makeshlibs -plibkms1 -V'libkms1' -- -c4
-endif
%:
dh $@ --with quilt,autoreconf --builddirectory=build/
commit 9188b0a7110dfeb0db1c2a32c664ca85659e4ccd
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Sep 19 21:14:41 2013 +0200
Make drmCheckModesettingSupported work on FreeBSD.
Thanks, Christoph Egger!
diff --git a/debian/changelog b/debian/changelog
index cb88c30..a7f2f7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdrm (2.4.46-3) UNRELEASED; urgency=low
+
+ * Make drmCheckModesettingSupported work on FreeBSD. Thanks, Christoph
+ Egger!
+
+ -- Julien Cristau <jcris...@debian.org> Thu, 19 Sep 2013 21:13:52 +0200
+
libdrm (2.4.46-2) unstable; urgency=low
* Build libdrm-radeon1 on kfreebsd (closes: #684593).
diff --git a/debian/patches/02_kbsd_modeset.diff
b/debian/patches/02_kbsd_modeset.diff
new file mode 100644
index 0000000..2602609
--- /dev/null
+++ b/debian/patches/02_kbsd_modeset.diff
@@ -0,0 +1,57 @@
+From: kostikbel <k...@freebsd.org>
+Date: Thu, 21 Feb 2013 20:02:00 +0000
+Subject: Make drmCheckModesettingSupported work on FreeBSD
+
+Patch from http://people.freebsd.org/~kib/drm/libdrm.2.patch
+
+Index: libdrm-bisect/xf86drmMode.c
+===================================================================
+--- libdrm-bisect.orig/xf86drmMode.c 2013-09-19 13:28:24.000000000 +0200
++++ libdrm-bisect/xf86drmMode.c 2013-09-19 13:32:43.085063015 +0200
+@@ -704,7 +704,7 @@
+ */
+ int drmCheckModesettingSupported(const char *busid)
+ {
+-#ifdef __linux__
++#if defined (__linux__)
+ char pci_dev_dir[1024];
+ int domain, bus, dev, func;
+ DIR *sysdir;
+@@ -754,6 +754,37 @@
+ closedir(sysdir);
+ if (found)
+ return 0;
++#elif defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
++ char kbusid[1024], sbusid[1024];
++ char oid[128];
++ int domain, bus, dev, func;
++ int i, modesetting, ret;
++ size_t len;
++
++ ret = sscanf(busid, "pci:%04x:%02x:%02x.%d", &domain, &bus, &dev,
&func);
++ if (ret != 4)
++ return -EINVAL;
++ snprintf(kbusid, sizeof(kbusid), "pci:%04x:%02x:%02x.%d", domain, bus,
dev, func);
++
++ /* How many GPUs do we expect in the machine? */
++ for (i = 0; i < 16; i++) {
++ snprintf(oid, sizeof(oid), "hw.dri.%d.busid", i);
++ len = sizeof(sbusid);
++ ret = sysctlbyname(oid, sbusid, &len, NULL, 0);
++ if (ret == -1) {
++ if (errno == ENOENT)
++ continue;
++ return -EINVAL;
++ }
++ if (strcmp(sbusid, kbusid) != 0)
++ continue;
++ snprintf(oid, sizeof(oid), "hw.dri.%d.modesetting", i);
++ len = sizeof(modesetting);
++ ret = sysctlbyname(oid, &modesetting, &len, NULL, 0);
++ if (ret == -1 || len != sizeof(modesetting))
++ return -EINVAL;
++ return (modesetting ? 0 : -ENOSYS);
++ }
+ #endif
+ return -ENOSYS;
+
diff --git a/debian/patches/series b/debian/patches/series
index 8ca2297..56baa63 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
01_default_perms.diff
+02_kbsd_modeset.diff
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
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
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)' -- -c4
commit 7eb5558d584ae7010f1dd8e54992f9c58fea819c
Author: Sven Joachim <svenj...@gmx.de>
Date: Tue Jul 2 16:51:29 2013 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index 51c7a9b..2ea6916 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,162 @@
+commit c6d73cfeeaff9596c735d0a10b248f94b2e1e347
+Author: Dave Airlie <airl...@redhat.com>
+Date: Tue Jul 2 09:24:53 2013 +0100
+
+ libdrm: bump to 2.4.46
+
+commit 2e0ab6237697c9754d92689f77c1792c11be881b
+Author: Dave Airlie <airl...@redhat.com>
+Date: Tue Jul 2 09:21:06 2013 +0100
+
+ drm: add hotspot cursor interface support.
+
+ Signed-off-by: Dave Airlie <airl...@redhat.com>
+
+commit 378bb47a784a3808c9b256fe7a52e10a4fcabf92
+Author: Alex Deucher <alexander.deuc...@amd.com>
+Date: Thu Jan 24 18:01:59 2013 -0500
+
+ radeon: add kabini pci ids
+
+ Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
+
+commit 96c04c23fca6656483f66ecb0da0679df02eb9c0
+Author: Alex Deucher <alexander.deuc...@amd.com>
+Date: Fri Jun 7 13:46:37 2013 -0400
+
+ radeon: add Bonaire pci ids
+
+ Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
+
+commit 0ff7f2760d052503d5cf65ded34a66fe20ccec28
+Author: Alex Deucher <alexander.deuc...@amd.com>
+Date: Fri Jun 7 13:45:30 2013 -0400
+
+ radeon: add CIK chip families
+
+ Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
+
+commit fbd106ad76b0ee33814f6a5b94efaa0b067ec2af
+Author: Damien Lespiau <damien.lesp...@intel.com>
+Date: Wed Feb 20 12:11:49 2013 +0000
+
+ intel/aub: Implement a way to specify the output .aub filename
+
+ Signed-off-by: Damien Lespiau <damien.lesp...@intel.com>
+ Reviewed-by: Kenneth Graunke <kenn...@whitecape.org>
+
+commit 1e4f63bbc8e9a23c90745e10027e2772bab15038
+Author: Damien Lespiau <damien.lesp...@intel.com>
+Date: Wed Feb 20 12:11:50 2013 +0000
+
+ intel/aub: Return early if we disable aub dumps
+
+ No need to prepare the .aub header and dump in that case, it'll be
+ done with the next call with true.
+
+ Signed-off-by: Damien Lespiau <damien.lesp...@intel.com>
+ Reviewed-by: Kenneth Graunke <kenn...@whitecape.org>
+
+commit 59257580666cf5f5916bf989d94bace774030bd5
+Author: Damien Lespiau <damien.lesp...@intel.com>
+Date: Wed Feb 20 12:11:48 2013 +0000
+
+ intel/aub: Sync the AUB defines with mesa's
+
+ Signed-off-by: Damien Lespiau <damien.lesp...@intel.com>
+ Reviewed-by: Kenneth Graunke <kenn...@whitecape.org>
+
+commit a0178c00c70f4b47e09ed7564fc2ccde611231a0
+Author: Mark Kettenis <kette...@openbsd.org>
+Date: Wed Jun 5 13:04:30 2013 +1000
+
+ radeon: correct RADEON_GEM_WAIT_IDLE use
+
+ RADEON_GEM_WAIT_IDLE is declared DRM_IOW but libdrm
+ uses it with drmCommandWriteRead instead of drmCommandWrite
+ which leads to the ioctl being unmatched and returning an
+ error on at least OpenBSD.
+
+ Signed-off-by: Mark Kettenis <kette...@openbsd.org>
+ Signed-off-by: Jonathan Gray <j...@jsg.id.au>
+
+commit 1669a67d063e82a58dae4d906015172d471e9a2a
+Author: Rodrigo Vivi <rodrigo.v...@gmail.com>
+Date: Mon May 13 17:48:40 2013 -0300
+
+ intel: Adding more reserved PCI IDs for Haswell.
+
+ At DDX commit Chris mentioned the tendency we have of finding out more
+ PCI IDs only when users report. So Let's add all new reserved Haswell IDs.
+
+ Bugzilla: http://bugs.freedesktop.org/show_bug.cgi?id=63701
+ Signed-off-by: Rodrigo Vivi <rodrigo.v...@gmail.com>
+ Acked-by: Kenneth Graunke <kenn...@whitecape.org>
+
+commit 150c3555e7ba53f6ad2d3970cca8e4d5970410aa
+Author: Rodrigo Vivi <rodrigo.v...@gmail.com>
+Date: Mon May 13 17:48:39 2013 -0300
+
+ intel: Fix Haswell GT3 names.
+
+ When publishing first HSW ids we weren't allowed to use "GT3" codname.
+ But this is the correct codname and Mesa is using it already.
+ So to avoid people getting confused why in Mesa it is called GT3 and here
+ it is called GT2_PLUS let's fix this name in a standard and correct way.
+
+ Signed-off-by: Rodrigo Vivi <rodrigo.v...@gmail.com>
+ Reviewed-by: Chad Versace <chad.vers...@linux.intel.com>
+ Reviewed-by: Kenneth Graunke <kenn...@whitecape.org>
+
+commit 8a88e349975a64676f143183e835e6d296f29627
+Author: Ville Syrjälä <ville.syrj...@linux.intel.com>
+Date: Thu Apr 18 17:26:52 2013 +0300
+
+ modetest: Make RGB565 pwetty too
+
+ Render the crosshairs for 565 and x888/a888 formats.
+
+ v2: Use the drm format to determine cairo format
+
+ Acked-by: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
+ Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
+
+commit 3586337f3703ce4833a375f66b08df064a1cec28
+Author: Rob Clark <robcl...@freedesktop.org>
+Date: Fri May 17 16:13:02 2013 -0400
+
+ freedreno: also remove from name table on bo delete
+
+ When adding the name tracking, I missed removing from the name table
+ when the bo was deleted, leaving a dangling pointer.
+
+ Signed-off-by: Rob Clark <robcl...@freedesktop.org>
+
+commit acfbf394a9176ea97f114ca6c0eb8249a2220e82
+Author: Rob Clark <robcl...@freedesktop.org>
+Date: Wed May 15 13:21:24 2013 -0400
+
+ freedreno: add some asserts
+
+ Things are worse if we issueibcmds with bogus gpu ptrs, so it is better
+ to just make userspace crash when things go pear shaped.
+
+ Signed-off-by: Rob Clark <robcl...@freedesktop.org>
+
+commit 0b89e2730c41466e8d9c04c469679ba23d052ec9
+Author: Rob Clark <robcl...@freedesktop.org>
+Date: Wed May 15 13:18:02 2013 -0400
+
+ freedreno: add handle and name tracking
+
+ Due to the evil userspace buffer tracking we have to do, and hacks for
+ creating GEM buffer from fbdev/scanout, "evil-twin" fd_bo objects are
+ problematic. So introduce hashtable tracking of bo's and dev's, to
+ avoid getting duplicate fd_bo ptrs for the same underlying gem object,
+ in particular when importing via flink name.
+
+ Signed-off-by: Rob Clark <robcl...@freedesktop.org>
+
commit 63aeae123848d0bfbc0a35102cb9717cf496eab6
Author: Marek Olšák <mar...@gmail.com>
Date: Wed May 15 19:32:05 2013 +0200
diff --git a/debian/changelog b/debian/changelog
index 3b2fa20..46c8fb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-libdrm (2.4.45-4) UNRELEASED; urgency=low
+libdrm (2.4.46-1) UNRELEASED; urgency=low
+ * New upstream release.
* Build libdrm-intel1 on x32 (Closes: #712515).
-- Sven Joachim <svenj...@gmx.de> Sun, 16 Jun 2013 20:40:09 +0200
commit c6d73cfeeaff9596c735d0a10b248f94b2e1e347
Author: Dave Airlie <airl...@redhat.com>
Date: Tue Jul 2 09:24:53 2013 +0100
libdrm: bump to 2.4.46
diff --git a/configure.ac b/configure.ac
index 21f8d3f..d2e232b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
AC_PREREQ([2.63])
AC_INIT([libdrm],
- [2.4.45],
+ [2.4.46],
[https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
[libdrm])
commit 2e0ab6237697c9754d92689f77c1792c11be881b
Author: Dave Airlie <airl...@redhat.com>
Date: Tue Jul 2 09:21:06 2013 +0100
drm: add hotspot cursor interface support.
Signed-off-by: Dave Airlie <airl...@redhat.com>
diff --git a/include/drm/drm.h b/include/drm/drm.h
index a847689..616824b 100644
--- a/include/drm/drm.h
+++ b/include/drm/drm.h
@@ -733,6 +733,7 @@ struct drm_prime_handle {
#define DRM_IOCTL_MODE_ADDFB2 DRM_IOWR(0xB8, struct drm_mode_fb_cmd2)
#define DRM_IOCTL_MODE_OBJ_GETPROPERTIES DRM_IOWR(0xB9, struct
drm_mode_obj_get_properties)
#define DRM_IOCTL_MODE_OBJ_SETPROPERTY DRM_IOWR(0xBA, struct
drm_mode_obj_set_property)
+#define DRM_IOCTL_MODE_CURSOR2 DRM_IOWR(0xBB, struct drm_mode_cursor2)
/**
* Device specific ioctls should only be in their respective headers
diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
index 62ba997..d41d76b 100644
--- a/include/drm/drm_mode.h
+++ b/include/drm/drm_mode.h
@@ -390,6 +390,19 @@ struct drm_mode_cursor {
__u32 handle;
};
+struct drm_mode_cursor2 {
+ __u32 flags;
+ __u32 crtc_id;
+ __s32 x;
+ __s32 y;
+ __u32 width;
+ __u32 height;
+ /* driver specific handle */
+ __u32 handle;
+ __s32 hot_x;
+ __s32 hot_y;
+};
+
struct drm_mode_crtc_lut {
__u32 crtc_id;
__u32 gamma_size;
diff --git a/xf86drmMode.c b/xf86drmMode.c
index f603ceb..6b60c35 100644
--- a/xf86drmMode.c
+++ b/xf86drmMode.c
@@ -400,6 +400,21 @@ int drmModeSetCursor(int fd, uint32_t crtcId, uint32_t
bo_handle, uint32_t width
return DRM_IOCTL(fd, DRM_IOCTL_MODE_CURSOR, &arg);
}
+int drmModeSetCursor2(int fd, uint32_t crtcId, uint32_t bo_handle, uint32_t
width, uint32_t height, int32_t hot_x, int32_t hot_y)
+{
+ struct drm_mode_cursor2 arg;
+
+ arg.flags = DRM_MODE_CURSOR_BO;
+ arg.crtc_id = crtcId;
+ arg.width = width;
+ arg.height = height;
+ arg.handle = bo_handle;
+ arg.hot_x = hot_x;
+ arg.hot_y = hot_y;
+
+ return DRM_IOCTL(fd, DRM_IOCTL_MODE_CURSOR2, &arg);
+}
+
int drmModeMoveCursor(int fd, uint32_t crtcId, int x, int y)
{
struct drm_mode_cursor arg;
diff --git a/xf86drmMode.h b/xf86drmMode.h
index 8e40034..f8a817c 100644
--- a/xf86drmMode.h
+++ b/xf86drmMode.h
@@ -378,6 +378,7 @@ int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t
bufferId,
*/
int drmModeSetCursor(int fd, uint32_t crtcId, uint32_t bo_handle, uint32_t
width, uint32_t height);
+int drmModeSetCursor2(int fd, uint32_t crtcId, uint32_t bo_handle, uint32_t
width, uint32_t height, int32_t hot_x, int32_t hot_y);
/**
* Move the cursor on crtc
*/
commit 378bb47a784a3808c9b256fe7a52e10a4fcabf92
Author: Alex Deucher <alexander.deuc...@amd.com>
Date: Thu Jan 24 18:01:59 2013 -0500
radeon: add kabini pci ids
Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
diff --git a/radeon/r600_pci_ids.h b/radeon/r600_pci_ids.h
index 545019e..fbadb82 100644
--- a/radeon/r600_pci_ids.h
+++ b/radeon/r600_pci_ids.h
@@ -407,3 +407,20 @@ CHIPSET(0x6651, BONAIRE_6651, BONAIRE)
CHIPSET(0x6658, BONAIRE_6658, BONAIRE)
CHIPSET(0x665C, BONAIRE_665C, BONAIRE)
CHIPSET(0x665D, BONAIRE_665D, BONAIRE)
+
+CHIPSET(0x9830, KABINI_9830, KABINI)
+CHIPSET(0x9831, KABINI_9831, KABINI)
+CHIPSET(0x9832, KABINI_9832, KABINI)
+CHIPSET(0x9833, KABINI_9833, KABINI)
+CHIPSET(0x9834, KABINI_9834, KABINI)
+CHIPSET(0x9835, KABINI_9835, KABINI)
+CHIPSET(0x9836, KABINI_9836, KABINI)
+CHIPSET(0x9837, KABINI_9837, KABINI)
+CHIPSET(0x9838, KABINI_9838, KABINI)
+CHIPSET(0x9839, KABINI_9839, KABINI)
+CHIPSET(0x983A, KABINI_983A, KABINI)
+CHIPSET(0x983B, KABINI_983B, KABINI)
+CHIPSET(0x983C, KABINI_983C, KABINI)
+CHIPSET(0x983D, KABINI_983D, KABINI)
+CHIPSET(0x983E, KABINI_983E, KABINI)
+CHIPSET(0x983F, KABINI_983F, KABINI)
commit 96c04c23fca6656483f66ecb0da0679df02eb9c0
Author: Alex Deucher <alexander.deuc...@amd.com>
Date: Fri Jun 7 13:46:37 2013 -0400
radeon: add Bonaire pci ids
Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
diff --git a/radeon/r600_pci_ids.h b/radeon/r600_pci_ids.h
index 01c900f..545019e 100644
--- a/radeon/r600_pci_ids.h
+++ b/radeon/r600_pci_ids.h
@@ -398,3 +398,12 @@ CHIPSET(0x6664, HAINAN_6664, HAINAN)
CHIPSET(0x6665, HAINAN_6665, HAINAN)
CHIPSET(0x6667, HAINAN_6667, HAINAN)
CHIPSET(0x666F, HAINAN_666F, HAINAN)
+
+CHIPSET(0x6640, BONAIRE_6640, BONAIRE)
+CHIPSET(0x6641, BONAIRE_6641, BONAIRE)
+CHIPSET(0x6649, BONAIRE_6649, BONAIRE)
+CHIPSET(0x6650, BONAIRE_6650, BONAIRE)
+CHIPSET(0x6651, BONAIRE_6651, BONAIRE)
+CHIPSET(0x6658, BONAIRE_6658, BONAIRE)
+CHIPSET(0x665C, BONAIRE_665C, BONAIRE)
+CHIPSET(0x665D, BONAIRE_665D, BONAIRE)
commit 0ff7f2760d052503d5cf65ded34a66fe20ccec28
Author: Alex Deucher <alexander.deuc...@amd.com>
Date: Fri Jun 7 13:45:30 2013 -0400
radeon: add CIK chip families
Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
diff --git a/radeon/radeon_surface.c b/radeon/radeon_surface.c
index a74064c..818e26a 100644
--- a/radeon/radeon_surface.c
+++ b/radeon/radeon_surface.c
@@ -74,6 +74,9 @@ enum radeon_family {
CHIP_VERDE,
CHIP_OLAND,
CHIP_HAINAN,
+ CHIP_BONAIRE,
+ CHIP_KAVERI,
+ CHIP_KABINI,
CHIP_LAST,
};
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
--
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/e1vemp7-0007cz...@vasks.debian.org
