.gitignore | 2 ChangeLog | 647 ++ Makefile.am | 49 README | 85 configure.ac | 80 debian/changelog | 33 debian/control | 50 debian/libdrm-intel1.symbols | 3 debian/libdrm-nouveau1.symbols | 3 debian/libdrm-radeon1.install | 3 debian/libdrm-radeon1.symbols | 30 debian/libdrm2.symbols | 2 debian/patches/01_default_perms.diff | 8 debian/patches/02_silent_master.diff | 11 debian/rules | 76 include/Makefile.am | 1 include/drm/Makefile.am | 38 include/drm/drm.h | 782 +++ include/drm/drm_mode.h | 268 + include/drm/drm_sarea.h | 82 include/drm/i810_drm.h | 281 + include/drm/i830_drm.h | 342 + include/drm/i915_drm.h | 760 +++ include/drm/mach64_drm.h | 256 + include/drm/mga_drm.h | 419 + include/drm/nouveau_drm.h | 220 include/drm/r128_drm.h | 326 + include/drm/radeon_drm.h | 911 +++ include/drm/savage_drm.h | 210 include/drm/sis_drm.h | 67 include/drm/via_drm.h | 275 + intel/Makefile.am | 50 intel/intel_atomic.h | 78 intel/intel_bufmgr.c | 244 + intel/intel_bufmgr.h | 213 intel/intel_bufmgr_fake.c | 1610 ++++++ intel/intel_bufmgr_gem.c | 1823 +++++++ intel/intel_bufmgr_priv.h | 268 + intel/intel_chipset.h | 77 intel/libdrm_intel.pc.in | 10 intel/mm.c | 271 + intel/mm.h | 94 libdrm/ChangeLog | 20 libdrm/Makefile.am | 43 libdrm/TODO | 10 libdrm/intel/Makefile.am | 47 libdrm/intel/intel_bufmgr.c | 237 libdrm/intel/intel_bufmgr.h | 198 libdrm/intel/intel_bufmgr_fake.c | 1530 ------ libdrm/intel/intel_bufmgr_gem.c | 1485 ------ libdrm/intel/intel_bufmgr_priv.h | 214 libdrm/intel/intel_chipset.h | 77 libdrm/intel/mm.c | 281 - libdrm/intel/mm.h | 96 libdrm/libdrm_lists.h | 89 libdrm/nouveau/Makefile.am | 39 libdrm/nouveau/libdrm_nouveau.pc.in | 10 libdrm/nouveau/nouveau_bo.c | 603 -- libdrm/nouveau/nouveau_bo.h | 109 libdrm/nouveau/nouveau_channel.c | 126 libdrm/nouveau/nouveau_channel.h | 56 libdrm/nouveau/nouveau_class.h | 8389 ---------------------------------- libdrm/nouveau/nouveau_device.c | 194 libdrm/nouveau/nouveau_device.h | 33 libdrm/nouveau/nouveau_drmif.h | 57 libdrm/nouveau/nouveau_grobj.c | 138 libdrm/nouveau/nouveau_grobj.h | 48 libdrm/nouveau/nouveau_notifier.c | 146 libdrm/nouveau/nouveau_notifier.h | 63 libdrm/nouveau/nouveau_private.h | 128 libdrm/nouveau/nouveau_pushbuf.c | 333 - libdrm/nouveau/nouveau_pushbuf.h | 177 libdrm/nouveau/nouveau_resource.c | 115 libdrm/nouveau/nouveau_resource.h | 48 libdrm/radeon/Makefile.am | 54 libdrm/radeon/libdrm_radeon.pc.in | 10 libdrm/radeon/radeon_bo.h | 215 libdrm/radeon/radeon_bo_gem.c | 335 - libdrm/radeon/radeon_bo_gem.h | 43 libdrm/radeon/radeon_cs.h | 246 - libdrm/radeon/radeon_cs_gem.c | 457 - libdrm/radeon/radeon_cs_gem.h | 41 libdrm/radeon/radeon_cs_space.c | 234 libdrm/radeon/radeon_track.c | 141 libdrm/radeon/radeon_track.h | 64 libdrm/xf86drm.c | 2512 ---------- libdrm/xf86drm.h | 670 -- libdrm/xf86drmHash.c | 428 - libdrm/xf86drmMode.c | 669 -- libdrm/xf86drmMode.h | 364 - libdrm/xf86drmRandom.c | 208 libdrm/xf86drmSL.c | 480 - libdrm_intel.pc.in | 10 libdrm_lists.h | 89 nouveau/Makefile.am | 40 nouveau/libdrm_nouveau.pc.in | 10 nouveau/nouveau_bo.c | 622 ++ nouveau/nouveau_bo.h | 112 nouveau/nouveau_channel.c | 126 nouveau/nouveau_channel.h | 56 nouveau/nouveau_class.h | 8515 +++++++++++++++++++++++++++++++++++ nouveau/nouveau_device.c | 194 nouveau/nouveau_device.h | 33 nouveau/nouveau_drmif.h | 57 nouveau/nouveau_grobj.c | 138 nouveau/nouveau_grobj.h | 48 nouveau/nouveau_notifier.c | 146 nouveau/nouveau_notifier.h | 63 nouveau/nouveau_private.h | 133 nouveau/nouveau_pushbuf.c | 411 + nouveau/nouveau_pushbuf.h | 196 nouveau/nouveau_resource.c | 115 nouveau/nouveau_resource.h | 48 radeon/Makefile.am | 54 radeon/libdrm_radeon.pc.in | 10 radeon/radeon_bo.h | 229 radeon/radeon_bo_gem.c | 343 + radeon/radeon_bo_gem.h | 43 radeon/radeon_cs.h | 246 + radeon/radeon_cs_gem.c | 458 + radeon/radeon_cs_gem.h | 41 radeon/radeon_cs_space.c | 234 radeon/radeon_track.c | 141 radeon/radeon_track.h | 64 shared-core/Makefile.am | 41 shared-core/drm.h | 859 --- shared-core/drm_mode.h | 273 - shared-core/drm_sarea.h | 84 shared-core/i915_drm.h | 730 --- shared-core/i915_reg.h | 1422 ----- shared-core/mach64_drm.h | 256 - shared-core/mga_drm.h | 425 - shared-core/nouveau_drm.h | 216 shared-core/r128_drm.h | 326 - shared-core/r300_reg.h | 1778 ------- shared-core/radeon_drm.h | 906 --- shared-core/savage_drm.h | 209 shared-core/sis_drm.h | 67 shared-core/via_3d_reg.h | 1650 ------ shared-core/via_drm.h | 282 - shared-core/xgi_drm.h | 137 tests/Makefile.am | 32 tests/modeprint/Makefile.am | 10 tests/modetest/Makefile.am | 10 tests/name_from_fd.c | 58 xf86drm.c | 2534 ++++++++++ xf86drm.h | 716 ++ xf86drmHash.c | 428 + xf86drmMode.c | 712 ++ xf86drmMode.h | 364 + xf86drmRandom.c | 208 xf86drmSL.c | 480 + xf86mm.h | 198 153 files changed, 29657 insertions(+), 32147 deletions(-)
New commits: commit 6b385493b52b836f50ce333dae01819db5b19d37 Author: Timo Aaltonen <[email protected]> Date: Tue Dec 15 21:37:40 2009 +0200 Release 2.4.16-1ubuntu1. diff --git a/debian/changelog b/debian/changelog index 73ee193..94fba3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libdrm (2.4.16-1ubuntu1) UNRELEASED; urgency=low +libdrm (2.4.16-1ubuntu1) lucid; urgency=low * Merge with Debian unstable, remaining changes: + control, rules, libdrm-nouveau1.symbols: Enable libdrm_nouveau. @@ -6,7 +6,7 @@ libdrm (2.4.16-1ubuntu1) UNRELEASED; urgency=low drm master is set or dropped. * Update libdrm-nouveau1.symbols and shlibs. - -- Timo Aaltonen <[email protected]> Tue, 15 Dec 2009 21:09:25 +0200 + -- Timo Aaltonen <[email protected]> Tue, 15 Dec 2009 21:37:28 +0200 libdrm (2.4.16-1) unstable; urgency=low commit 2da122bc0f9578224f423b1d5e82fe69ad22dcb0 Author: Timo Aaltonen <[email protected]> Date: Tue Dec 15 21:33:16 2009 +0200 fix the changelog. diff --git a/debian/changelog b/debian/changelog index d4239fd..73ee193 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ libdrm (2.4.16-1ubuntu1) UNRELEASED; urgency=low * Merge with Debian unstable, remaining changes: - + control, rules, *nouvea.symbols: Enable libdrm_nouveau + + control, rules, libdrm-nouveau1.symbols: Enable libdrm_nouveau. + patches/02_silent_master.diff: Don't write to stderr when the drm master is set or dropped. * Update libdrm-nouveau1.symbols and shlibs. commit 4201649f8e01474caeafe2fa09bdca641b243178 Author: Timo Aaltonen <[email protected]> Date: Tue Dec 15 21:32:28 2009 +0200 Update libdrm-nouveau1.symbols and shlibs. diff --git a/debian/changelog b/debian/changelog index e851c21..d4239fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ libdrm (2.4.16-1ubuntu1) UNRELEASED; urgency=low + control, rules, *nouvea.symbols: Enable libdrm_nouveau + patches/02_silent_master.diff: Don't write to stderr when the drm master is set or dropped. + * Update libdrm-nouveau1.symbols and shlibs. -- Timo Aaltonen <[email protected]> Tue, 15 Dec 2009 21:09:25 +0200 diff --git a/debian/libdrm-nouveau1.symbols b/debian/libdrm-nouveau1.symbols index 8b73e1d..2ae9229 100644 --- a/debian/libdrm-nouveau1.symbols +++ b/debian/libdrm-nouveau1.symbols @@ -11,6 +11,7 @@ libdrm_nouveau.so.1 libdrm-nouveau1 #MINVER# nouveau_bo_map_ra...@base 2.4.11-1ubuntu1~ nouveau_bo_...@base 2.4.4 nouveau_bo_new_t...@base 2.4.11-1ubuntu1~ + nouveau_bo_pend...@base 2.4.16 nouveau_bo_...@base 2.4.4 nouveau_bo_...@base 2.4.4 nouveau_bo_taked...@base 2.4.4 @@ -49,6 +50,8 @@ libdrm_nouveau.so.1 libdrm-nouveau1 #MINVER# nouveau_pushbuf_emit_re...@base 2.4.4 nouveau_pushbuf_fl...@base 2.4.4 nouveau_pushbuf_i...@base 2.4.4 + nouveau_pushbuf_marker_e...@base 2.4.16-1ubuntu1 + nouveau_pushbuf_marker_u...@base 2.4.16-1ubuntu1 nouveau_resource_al...@base 2.4.4 nouveau_resource_f...@base 2.4.4 nouveau_resource_i...@base 2.4.4 diff --git a/debian/rules b/debian/rules index 47ada31..ee246fb 100755 --- a/debian/rules +++ b/debian/rules @@ -145,7 +145,7 @@ ifeq ($(INTEL), yes) dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (>= 2.4.16)' -- -c4 endif ifeq ($(NOUVEAU), yes) - dh_makeshlibs -plibdrm-nouveau1 -V'libdrm-nouveau1 (>= 2.4.13)' -- -c4 + dh_makeshlibs -plibdrm-nouveau1 -V'libdrm-nouveau1 (>= 2.4.16)' -- -c4 endif ifeq ($(RADEON), yes) dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (>= 2.4.13)' -- -c4 commit b22ce75fa6e574ac9d011d5bd76ba7f1d1198ea8 Author: Timo Aaltonen <[email protected]> Date: Tue Dec 15 21:14:22 2009 +0200 Refresh 02_silent_master.diff. diff --git a/debian/patches/02_silent_master.diff b/debian/patches/02_silent_master.diff index b4cc3db..1b07450 100644 --- a/debian/patches/02_silent_master.diff +++ b/debian/patches/02_silent_master.diff @@ -1,7 +1,8 @@ -diff -rup libdrm-2.4.14~/libdrm/xf86drm.c libdrm-2.4.14/libdrm/xf86drm.c ---- libdrm-2.4.14~/libdrm/xf86drm.c 2009-07-10 04:17:53.000000000 +0100 -+++ libdrm-2.4.14/libdrm/xf86drm.c 2009-12-11 04:22:07.094463655 +0000 -@@ -2498,7 +2498,6 @@ int drmSetMaster(int fd) +Index: libdrm/xf86drm.c +=================================================================== +--- libdrm.orig/xf86drm.c 2009-12-15 20:35:52.000000000 +0200 ++++ libdrm/xf86drm.c 2009-12-15 21:13:17.000000000 +0200 +@@ -2494,7 +2494,6 @@ { int ret; @@ -9,7 +10,7 @@ diff -rup libdrm-2.4.14~/libdrm/xf86drm.c libdrm-2.4.14/libdrm/xf86drm.c ret = ioctl(fd, DRM_IOCTL_SET_MASTER, 0); return ret; } -@@ -2506,7 +2505,7 @@ int drmSetMaster(int fd) +@@ -2502,7 +2501,7 @@ int drmDropMaster(int fd) { int ret; commit b600a43ff4f6139d06ed54ced3c74428d2d17638 Author: Timo Aaltonen <[email protected]> Date: Tue Dec 15 21:12:20 2009 +0200 Update the changelog. diff --git a/debian/changelog b/debian/changelog index d658a91..e851c21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +libdrm (2.4.16-1ubuntu1) UNRELEASED; urgency=low + + * Merge with Debian unstable, remaining changes: + + control, rules, *nouvea.symbols: Enable libdrm_nouveau + + patches/02_silent_master.diff: Don't write to stderr when the + drm master is set or dropped. + + -- Timo Aaltonen <[email protected]> Tue, 15 Dec 2009 21:09:25 +0200 + libdrm (2.4.16-1) unstable; urgency=low [ Julien Cristau ] commit 868e2ca87deba7115b0ad539b87ccfebe384262e Author: Brice Goglin <[email protected]> Date: Fri Dec 11 22:37:55 2009 +0100 Prepare Changelog for upload diff --git a/debian/changelog b/debian/changelog index 2215486..a6941a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libdrm (2.4.16-1) UNRELEASED; urgency=low +libdrm (2.4.16-1) unstable; urgency=low [ Julien Cristau ] * New upstream release, closes: #560434. @@ -11,7 +11,7 @@ libdrm (2.4.16-1) UNRELEASED; urgency=low * Enable libdrm_radeon, interface to kernel graphics memory management on radeon (closes: #558786). - -- Julien Cristau <[email protected]> Thu, 03 Dec 2009 22:40:20 +0100 + -- Brice Goglin <[email protected]> Fri, 11 Dec 2009 22:37:48 +0100 libdrm (2.4.15-1) unstable; urgency=low commit 002b3dae68d70547fe9ec73d236fcfb149793089 Author: Brice Goglin <[email protected]> Date: Fri Dec 11 09:20:33 2009 +0100 Add bug closer diff --git a/debian/changelog b/debian/changelog index 4792831..2215486 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libdrm (2.4.16-1) UNRELEASED; urgency=low - * New upstream release. + [ Julien Cristau ] + * New upstream release, closes: #560434. * Update patch 01_default_perms.diff to account for upstream move of libdrm to toplevel. * Update libdrm2.symbols and shlibs. commit 54c7d6b56da45ba6c55e5238340a506b74241c08 Author: Julien Cristau <[email protected]> Date: Thu Dec 3 23:45:03 2009 +0100 Enable libdrm_radeon diff --git a/debian/changelog b/debian/changelog index e682db2..4792831 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ libdrm (2.4.16-1) UNRELEASED; urgency=low * Update libdrm-intel1.symbols and shlibs. * Bump debhelper build-dep, we use dh_strip --remaining-packages (closes: #558443). Thanks, Sergio Gelato! + * Enable libdrm_radeon, interface to kernel graphics memory management on + radeon (closes: #558786). -- Julien Cristau <[email protected]> Thu, 03 Dec 2009 22:40:20 +0100 diff --git a/debian/control b/debian/control index ceb59d6..7ccd43b 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,11 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libdrm.git Package: libdrm-dev Section: libdevel Architecture: any -Depends: linux-libc-dev (>= 2.6.28) [linux-any], libdrm2 (= ${binary:Version}), libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386] +Depends: + linux-libc-dev (>= 2.6.28) [linux-any], + libdrm2 (= ${binary:Version}), + libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386], + libdrm-radeon1 (= ${binary:Version}) [linux-any], 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 @@ -79,3 +83,26 @@ Description: Userspace interface to intel-specific kernel DRM services -- debugg . This package provides the debugging symbols for the libdrm-intel1 package. +Package: libdrm-radeon1 +Section: libs +Architecture: linux-any +Depends: ${shlibs:Depends}, ${misc:Depends} +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. + +Package: libdrm-radeon1-dbg +Section: debug +Priority: extra +Architecture: linux-any +Depends: libdrm-radeon1 (= ${binary:Version}), ${misc:Depends} +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 hardware-accelerated OpenGL drivers. + . + This package provides the debugging symbols for the libdrm-radeon1 package. + diff --git a/debian/libdrm-radeon1.install b/debian/libdrm-radeon1.install new file mode 100644 index 0000000..24e5a6b --- /dev/null +++ b/debian/libdrm-radeon1.install @@ -0,0 +1 @@ +usr/lib/libdrm_radeon.so.1* diff --git a/debian/libdrm-radeon1.symbols b/debian/libdrm-radeon1.symbols new file mode 100644 index 0000000..2ac6ddf --- /dev/null +++ b/debian/libdrm-radeon1.symbols @@ -0,0 +1,16 @@ +libdrm_radeon.so.1 libdrm-radeon1 #MINVER# + radeon_bo_manager_gem_c...@base 2.4.13 + radeon_bo_manager_gem_d...@base 2.4.13 + radeon_cs_manager_gem_c...@base 2.4.13 + radeon_cs_manager_gem_d...@base 2.4.13 + radeon_cs_space_add_persistent...@base 2.4.13 + radeon_cs_space_ch...@base 2.4.13 + radeon_cs_space_check_with...@base 2.4.13 + radeon_cs_space_reset_...@base 2.4.13 + radeon_gem_get_kernel_n...@base 2.4.13 + radeon_gem_name...@base 2.4.13 + radeon_gem_set_dom...@base 2.4.13 + radeon_track_add_ev...@base 2.4.13 + radeon_tracker_add_tr...@base 2.4.13 + radeon_tracker_pr...@base 2.4.13 + radeon_tracker_remove_tr...@base 2.4.13 diff --git a/debian/rules b/debian/rules index 25e4789..46dd11b 100755 --- a/debian/rules +++ b/debian/rules @@ -24,8 +24,12 @@ else endif ifeq (linux, $(DEB_HOST_ARCH_OS)) confflags += --enable-udev + confflags += --enable-radeon-experimental-api + RADEON = yes else confflags += --disable-udev + confflags += --disable-radeon-experimental-api + RADEON = no endif # only build libdrm-intel on x86 @@ -61,9 +65,12 @@ obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure dh_testdir test -d obj-$(DEB_BUILD_GNU_TYPE) || mkdir obj-$(DEB_BUILD_GNU_TYPE) cd obj-$(DEB_BUILD_GNU_TYPE) && \ - ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ + ../configure \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ - --enable-static=yes $(confflags) \ + --enable-static=yes \ + $(confflags) \ CFLAGS="$(CFLAGS)" build: build-stamp @@ -120,6 +127,9 @@ binary-arch: build install ifeq ($(INTEL), yes) dh_strip -plibdrm-intel1 --dbg-package=libdrm-intel1-dbg endif +ifeq ($(RADEON), yes) + dh_strip -plibdrm-radeon1 --dbg-package=libdrm-radeon1-dbg +endif dh_strip -s --remaining-packages dh_compress -s dh_fixperms -s @@ -127,6 +137,9 @@ endif ifeq ($(INTEL), yes) dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (>= 2.4.16)' -- -c4 endif +ifeq ($(RADEON), yes) + dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (>= 2.4.13)' -- -c4 +endif dh_installdeb -s dh_shlibdeps -s dh_gencontrol -s commit aa83356d0efbd87726a561f9f6450fd54b45aa08 Author: Julien Cristau <[email protected]> Date: Thu Dec 3 23:17:16 2009 +0100 Bump debhelper build-dep, we use dh_strip --remaining-packages Closes: #558443 Thanks, Sergio Gelato! diff --git a/debian/changelog b/debian/changelog index 8056837..e682db2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ libdrm (2.4.16-1) UNRELEASED; urgency=low to toplevel. * Update libdrm2.symbols and shlibs. * Update libdrm-intel1.symbols and shlibs. + * Bump debhelper build-dep, we use dh_strip --remaining-packages (closes: + #558443). Thanks, Sergio Gelato! -- Julien Cristau <[email protected]> Thu, 03 Dec 2009 22:40:20 +0100 diff --git a/debian/control b/debian/control index e48b0d2..ceb59d6 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian X Strike Force <[email protected]> Uploaders: Julien Cristau <[email protected]>, David Nusinow <[email protected]>, Brice Goglin <[email protected]> Build-Depends: - debhelper (>= 5.0.0), + debhelper (>= 7.2.7), libx11-dev, dpkg-dev (>= 1.13.19), quilt (>= 0.40), commit 6e69551cce1d1a6ef06bed5fbb023dc49503d8c4 Author: Julien Cristau <[email protected]> Date: Thu Dec 3 23:15:55 2009 +0100 Wrap the build-depends field diff --git a/debian/control b/debian/control index cac77fb..e48b0d2 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,15 @@ Source: libdrm Priority: optional Maintainer: Debian X Strike Force <[email protected]> Uploaders: Julien Cristau <[email protected]>, David Nusinow <[email protected]>, Brice Goglin <[email protected]> -Build-Depends: debhelper (>= 5.0.0), libx11-dev, dpkg-dev (>= 1.13.19), quilt (>= 0.40), automake, libtool, pkg-config, libpthread-stubs0-dev +Build-Depends: + debhelper (>= 5.0.0), + libx11-dev, + dpkg-dev (>= 1.13.19), + quilt (>= 0.40), + automake, + libtool, + pkg-config, + libpthread-stubs0-dev, Standards-Version: 3.8.3 Section: libs Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdrm commit cde76338155404bfb4f416ba213fe95620ee9bdd Author: Julien Cristau <[email protected]> Date: Thu Dec 3 22:56:12 2009 +0100 Update libdrm-intel1.symbols and shlibs. diff --git a/debian/changelog b/debian/changelog index f7b24dc..8056837 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ libdrm (2.4.16-1) UNRELEASED; urgency=low * Update patch 01_default_perms.diff to account for upstream move of libdrm to toplevel. * Update libdrm2.symbols and shlibs. + * Update libdrm-intel1.symbols and shlibs. -- Julien Cristau <[email protected]> Thu, 03 Dec 2009 22:40:20 +0100 diff --git a/debian/libdrm-intel1.symbols b/debian/libdrm-intel1.symbols index 5bfb6fc..71e8f02 100644 --- a/debian/libdrm-intel1.symbols +++ b/debian/libdrm-intel1.symbols @@ -12,6 +12,7 @@ libdrm_intel.so.1 libdrm-intel1 #MINVER# drm_intel_bo_gem_create_from_n...@base 2.4.1 drm_intel_bo_get_subd...@base 2.4.1 drm_intel_bo_get_til...@base 2.4.1 + drm_intel_bo_madv...@base 2.4.16 drm_intel_bo_...@base 2.4.1 drm_intel_bo_...@base 2.4.1 drm_intel_bo_refere...@base 2.4.1 diff --git a/debian/rules b/debian/rules index 941baff..25e4789 100755 --- a/debian/rules +++ b/debian/rules @@ -125,7 +125,7 @@ endif dh_fixperms -s dh_makeshlibs -plibdrm2 -V'libdrm2 (>= 2.4.16)' -- -c4 ifeq ($(INTEL), yes) - dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (>= 2.4.15)' -- -c4 + dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (>= 2.4.16)' -- -c4 endif dh_installdeb -s dh_shlibdeps -s commit febf689bb4a453756de8151770518a6fcd1157dd Author: Julien Cristau <[email protected]> Date: Thu Dec 3 22:50:24 2009 +0100 Update libdrm2.symbols and shlibs. diff --git a/debian/changelog b/debian/changelog index 3214250..f7b24dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ libdrm (2.4.16-1) UNRELEASED; urgency=low * New upstream release. * Update patch 01_default_perms.diff to account for upstream move of libdrm to toplevel. + * Update libdrm2.symbols and shlibs. -- Julien Cristau <[email protected]> Thu, 03 Dec 2009 22:40:20 +0100 diff --git a/debian/libdrm2.symbols b/debian/libdrm2.symbols index 9d625d6..f74d9a2 100644 --- a/debian/libdrm2.symbols +++ b/debian/libdrm2.symbols @@ -51,6 +51,7 @@ libdrm.so.2 libdrm2 #MINVER# drmgetcontextfl...@base 2.3.1 drmgetcontextprivatemapp...@base 2.3.1 drmgetcontext...@base 2.3.1 + drmgetdevicenamefro...@base 2.4.16 drmgeten...@base 2.3.1 drmgethashta...@base 2.3.1 drmgetinterruptfrombu...@base 2.3.1 @@ -61,6 +62,7 @@ libdrm.so.2 libdrm2 #MINVER# drmgetreservedcontextl...@base 2.3.1 drmgetst...@base 2.3.1 drmgetvers...@base 2.3.1 + drmhandleev...@base 2.4.16 drmhashcre...@base 2.3.1 drmhashdel...@base 2.3.1 drmhashdest...@base 2.3.1 diff --git a/debian/rules b/debian/rules index 0a66490..941baff 100755 --- a/debian/rules +++ b/debian/rules @@ -123,7 +123,7 @@ endif dh_strip -s --remaining-packages dh_compress -s dh_fixperms -s - dh_makeshlibs -plibdrm2 -V'libdrm2 (>= 2.4.3)' -- -c4 + dh_makeshlibs -plibdrm2 -V'libdrm2 (>= 2.4.16)' -- -c4 ifeq ($(INTEL), yes) dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (>= 2.4.15)' -- -c4 endif commit 3692950247627a5c98cc84ab69b069cdb65cdcd5 Author: Julien Cristau <[email protected]> Date: Thu Dec 3 22:44:09 2009 +0100 Update patch 01_default_perms.diff Account for upstream move of libdrm to toplevel. diff --git a/debian/changelog b/debian/changelog index 147f9ea..3214250 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ libdrm (2.4.16-1) UNRELEASED; urgency=low * New upstream release. + * Update patch 01_default_perms.diff to account for upstream move of libdrm + to toplevel. -- Julien Cristau <[email protected]> Thu, 03 Dec 2009 22:40:20 +0100 diff --git a/debian/patches/01_default_perms.diff b/debian/patches/01_default_perms.diff index ed70162..cdba93e 100644 --- a/debian/patches/01_default_perms.diff +++ b/debian/patches/01_default_perms.diff @@ -1,8 +1,8 @@ -Index: libdrm/libdrm/xf86drm.h +Index: libdrm/xf86drm.h =================================================================== ---- libdrm.orig/libdrm/xf86drm.h -+++ libdrm/libdrm/xf86drm.h -@@ -45,7 +45,7 @@ +--- libdrm.orig/xf86drm.h ++++ libdrm/xf86drm.h +@@ -70,7 +70,7 @@ /* Default /dev/dri directory permissions 0755 */ #define DRM_DEV_DIRMODE \ (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH) commit d153e79f76111b72dea1f8058aab8c0ab79272d9 Author: Julien Cristau <[email protected]> Date: Thu Dec 3 22:42:17 2009 +0100 Bump changelogs diff --git a/ChangeLog b/ChangeLog index 7f8c872..bcdaf10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,499 @@ +commit db50f5127421ac8f4e3ce4eb7c27d27475781488 +Author: Kristian Høgsberg <[email protected]> +Date: Thu Dec 3 11:31:27 2009 -0500 + + Bump to 2.4.16 for release + +commit bef7f88de9a1f40ec82cfd4d80c73802c640e5ed +Author: Kristian Høgsberg <[email protected]> +Date: Thu Dec 3 11:27:16 2009 -0500 + + Enable experimental APIs for distcheck + +commit 57473c7f523f476ffa54c34e0c6312ffa66dcc5c +Author: Chris Wilson <[email protected]> +Date: Wed Dec 2 13:36:22 2009 +0000 + + intel: Free memory before inserting bo into cache. + + This has the unfortunate behaviour of releasing our malloc cache, but + the alternative is for X to consume a couple of gigabytes of ram and + die during testing. Fortunately the extra mallocs have little impact on + performance whereas avoiding swap and death, lots. + + Signed-off-by: Chris Wilson <[email protected]> + +commit 792fed1e2460f96459141b5a628dd5ab4fbb87db +Author: Chris Wilson <[email protected]> +Date: Wed Dec 2 13:12:39 2009 +0000 + + intel: Check and propagate errors from building reloc-tree + + Instead of forcing the caller to check after every emit_reloc(), we can + flag the object as being in error, propagating that error upwards through + the relocation tree, and failing the eventual batch buffer execution. + + Signed-off-by: Chris Wilson <[email protected]> + +commit b73612e4fd69565aa2c5c2e9677f3e0af1945f7d +Author: Chris Wilson <[email protected]> +Date: Wed Dec 2 12:58:00 2009 +0000 + + intel: Repeat execbuffer after EINTR + + EAGAIN cannot be raised by the current code, but the system call maybe + interrupted and so return EINTR. + + Signed-off-by: Chris Wilson <[email protected]> + +commit acb4aa671507aa181b3ff50ccf26a1c0d705a309 +Author: Chris Wilson <[email protected]> +Date: Wed Dec 2 12:40:26 2009 +0000 + + intel: Review use of errno. + + Hitting this error lead to a segfault: + + intel_bufmgr_gem.c:919: Error mapping buffer 48607 (pixmap): + Cannot allocate memory. + + because the errno was reused as the function return value after being + reset by the fprintf(), so caller thought the mapping had succeeded. The + convention established by libdrm is that the return value is the + negative errno and that uses of libdrm cannot trust the value of errno + afterwards, but must use the return code. + + Signed-off-by: Chris Wilson <[email protected]> + +commit 9fec2a8cb28d814da4fdd97b25e9cc5c10768c87 +Author: Chris Wilson <[email protected]> +Date: Wed Dec 2 10:42:51 2009 +0000 + + intel: Make bo_reference() inline for internal use. + + Signed-off-by: Chris Wilson <[email protected]> + +commit 9c8ad05e8bb1c954b804e40f2f975fed23c24550 +Author: Chris Wilson <[email protected]> +Date: Wed Dec 2 10:41:39 2009 +0000 + + intel: Remove the extra reference while validating the reloc tree + + Buffers on the relocation tree are guarded by the reference to the batch + object and so do not need an extra reference whilst constructing the + list of execution buffer objects. + + Signed-off-by: Chris Wilson <[email protected]> + +commit 8ffd2e142e38d19326a40ff66dc99d052ce22100 +Author: Chris Wilson <[email protected]> +Date: Tue Dec 1 13:08:04 2009 +0000 + + intel: Wrap a few more syscalls with EINTR protection + + Having been bitten by a missing EINTR check during mmap_gtt(), I thought + it prudent to add some more protection around the ioctls. + + Signed-off-by: Chris Wilson <[email protected]> + +commit b666f4151ab934d3083fa8b5f14ce19bbf999b15 +Author: Chris Wilson <[email protected]> +Date: Mon Nov 30 23:07:19 2009 +0000 + + intel: Clear bo->used_as_reloc_target flag on destroy + + This allows us to keep the assert added in the previous commit that we do + not modify the tree_reloc_size after inserting the buffer into a relocation + tree, which was being hit here: + + #0 0xb78c2424 in __kernel_vsyscall () + #1 0xb74f6401 in raise () from /lib/libc.so.6 + #2 0xb74f7b42 in abort () from /lib/libc.so.6 + #3 0xb74ef5a8 in __assert_fail () from /lib/libc.so.6 + #4 0xb737e78b in drm_intel_bo_gem_set_in_aperture_size (bufmgr_gem=<value optimized out>, bo_gem=0x6) at intel_bufmgr_gem.c:373 + #5 0xb737f519 in drm_intel_gem_bo_set_tiling (bo=0xa1030a0, tiling_mode=0xbff6c85c, stride=0) at intel_bufmgr_gem.c:1386 + #6 0xb737f67f in drm_intel_gem_bo_unreference_final (bo=0xa1030a0, time=<value optimized out>) at intel_bufmgr_gem.c:768 + #7 0xb737f5e3 in drm_intel_gem_bo_unreference_locked_timed (bo=0xa1e50d0, time=<value optimized out>) at intel_bufmgr_gem.c:805 + #8 drm_intel_gem_bo_unreference_final (bo=0xa1e50d0, time=<value optimized out>) at intel_bufmgr_gem.c:756 + #9 0xb737fcbb in drm_intel_gem_bo_unreference (bo=0xa1e50d0) at intel_bufmgr_gem.c:821 + #10 0xb737b4e6 in drm_intel_bo_unreference (bo=0x0) at intel_bufmgr.c:80 + #11 0xb7325625 in intel_batch_flush (scrn=0x9d91f78, flush=1) at i830_batchbuffer.c:200 + + Signed-off-by: Chris Wilson <[email protected]> + +commit e22fb797728c07fd05b195bd345fdf91bab47855 +Author: Chris Wilson <[email protected]> +Date: Mon Nov 30 22:14:30 2009 +0000 + + intel: Apply pessimistic alignment to in-aperture buffer size + + For the older chipsets, i.e. pre-i965, which have severe alignment + restrictions for tiled buffers we need to pessimistically assume that we + will waste the size of buffer to meet those alignment constraints. + + Signed-off-by: Chris Wilson <[email protected]> + +commit 60aa803dc76bbdfac72da4de4cdc3018717b0884 +Author: Chris Wilson <[email protected]> +Date: Mon Nov 30 20:02:05 2009 +0000 + + intel: Only store a buffer in the cache if it is retained. + + If the kernel immediately frees the backing store for a buffer when + marking it purgeable, then there is not point adding to the cache. Free + it immediately, instead. + + Signed-off-by: Chris Wilson <[email protected]> + +commit 6f66de982ad6ee6967ec61a7399e600bdd9e5887 +Author: Robert Noland <[email protected]> +Date: Wed Nov 25 15:09:24 2009 -0600 + + Correctly set DRM_MAX_MINOR for all platforms. + + DRM_MAJOR is platform specific, but not used outside of xf86drm.c + that I can find. + +commit 9558f6377ffee680d6bec0808bc113b3139b0d5f +Author: Alex Deucher <[email protected]> +Date: Tue Nov 24 15:03:32 2009 -0500 + + Add missing DRM_MAX_MINOR define + + lost in 500f5b524000ed5930301f4303744cb4c0a19b75 + + Signed-off-by: Alex Deucher <[email protected]> + +commit 82bf52fbcdf1e71840c2024bb2bc05a8daeaafad +Author: Robert Noland <[email protected]> +Date: Tue Nov 24 10:31:41 2009 -0600 + + More fixups to allow mesa to build + +commit 170674a606f6d7869b5fa4457c07e10dd27f2771 +Author: Robert Noland <[email protected]> +Date: Tue Nov 24 09:27:29 2009 -0600 + + Finish fixing the build on FreeBSD + +commit 22d46669043d38fcd16efca773f5ed5693c0fb58 +Author: Kristian Høgsberg <[email protected]> +Date: Mon Nov 23 20:51:34 2009 -0500 + + Add drmGetDeviceNameFromFd function + + Determines the /dev filename of the drm fd argument. + +commit 500f5b524000ed5930301f4303744cb4c0a19b75 +Author: Kristian Høgsberg <[email protected]> +Date: Mon Nov 23 18:25:08 2009 -0500 + + Fix build on *BSD + + This adds a minimal #ifdef clause to drm.h that we'll push upstream. + Once that goes in we can share drm.h between linux, libdrm, and + the bsd's. + +commit 863e39b56eea0ef95f9bde648fe4868d0b8e3f11 +Author: Kristian Høgsberg <[email protected]> +Date: Mon Nov 23 12:38:40 2009 -0500 + + Don't hardcore 'yes', use in configure.ac output + + Oops, I assumed intel was always enable, but it just defaults to on. + +commit 696fdb11f447b1e77803c4a15ad7062bfb79f0f0 +Author: Kristian Høgsberg <[email protected]> +Date: Mon Nov 23 11:41:15 2009 -0500 + + Output summary of enabled features at the end of configure.ac + +commit dd6cbe7acb1708a1aa8e101c6ddb80205bd1f63b +Author: Kristian Høgsberg <[email protected]> +Date: Mon Nov 23 11:25:46 2009 -0500 + + Drop duplicated radeon_*.h files in include/drm + + These files are userspace headers and live in radeon/ + +commit 6b3cbe7655ee7746c4418e1fb8af136774420dbd +Author: Kristian Høgsberg <[email protected]> +Date: Fri Nov 20 20:17:26 2009 -0500 + + Put mach64_drm.h back in to avoid breaking mesa build + + We may want to drop mach64 from mesa instead, but that's a different + discussion. + +commit 4f070d593cfc60b18c6ccb85af785b00ffb51db4 +Author: Kristian Høgsberg <[email protected]> +Date: Fri Nov 20 19:42:59 2009 -0500 + + Install kernel headers in ${includedir}/drm + +commit 3a87b1f497cc201a6c37fcd779019560ab7746ae +Author: Pekka Paalanen <[email protected]> +Date: Sat Nov 21 01:00:36 2009 +0200 + + nouveau: fix DRM headers + + The nouveau_drmif.h is not the Nouveau DRM kernel ABI file, but purely + user space stuff. Remove it, it does not belong in include/drm/. + + Copy the right header from Nouveau kernel v2.6.31-rc9-757-gaca551c. + + Signed-off-by: Pekka Paalanen <[email protected]> + +commit 10ce0ec18806ae32a5d615c693626a085b0dd7b8 +Merge: 1b064cc b4312b6 +Author: Kristian Høgsberg <[email protected]> +Date: Fri Nov 20 17:09:03 2009 -0500 + + Merge remote branch 'origin/master' into libdrm + +commit 1b064cc428f03f753699d4d9fbe60453891a8529 +Author: Kristian Høgsberg <[email protected]> +Date: Fri Nov 20 17:08:28 2009 -0500 + + Update README + +commit b4312b639d56a6cad78953af0fd4f863182007e3 +Author: Maciej Cencora <[email protected]> +Date: Wed Nov 18 16:07:13 2009 -0500 + + libdrm_radeon: add radeon_bo_is_referenced_by_cs function + + Signed-off-by: Alex Deucher <[email protected]> + +commit e8523e087fc5dfe15b0e1af9b30d1ddac5d0314c +Author: Kristian Høgsberg <[email protected]> +Date: Tue Nov 17 11:15:56 2009 -0500 + + Drop stale TODO and unused ChangeLog + +commit 4f57abfe66091281c9f59c14e6ea27b524b55d5b +Author: Kristian Høgsberg <[email protected]> +Date: Tue Nov 17 11:14:54 2009 -0500 + + Move libdrm/ up one level + +commit 9dd3613073aa2491cef440725fdfa0cf1e8f1a42 +Author: Kristian Høgsberg <[email protected]> +Date: Tue Nov 17 09:46:56 2009 -0500 + + Drop shared-core, bsd-core, linux-core and scripts subdirs + +commit a66cf9ce68bdf9bd887f91a38ced4b59c129b3c7 +Author: Kristian Høgsberg <[email protected]> -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
