debian/changelog | 14 ++++- debian/control | 6 +- debian/patches/02_fix_kms_detection_with_linux_backport_modules.diff | 6 +- debian/patches/09_add_BEGIN_RING_NI.diff | 25 ++++++++++ debian/patches/series | 1 debian/rules | 3 - 6 files changed, 44 insertions(+), 11 deletions(-)
New commits: commit 0b383eeff698476c8db9d1462ee09fab251b59e8 Author: Christopher James Halse Rogers <[email protected]> Date: Wed Feb 3 20:23:36 2010 +1100 Merge in 0ubuntu2 revision that missed git diff --git a/debian/changelog b/debian/changelog index 065f299..41195f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,13 @@ libdrm (2.4.17-1ubuntu1) UNRELEASED; urgency=low -- Christopher James Halse Rogers <[email protected]> Mon, 01 Feb 2010 15:55:14 +1100 +libdrm (2.4.17-0ubuntu2) lucid; urgency=low + + * Enable libdrm-intel for ports architectures (LP: #507765) + * Adjust libdrm-dev dependencies to reflect nouveau being linux-any + + -- Emmet Hikory <[email protected]> Fri, 15 Jan 2010 12:31:40 +0900 + libdrm (2.4.17-1) unstable; urgency=low [ Julien Cristau ] diff --git a/debian/control b/debian/control index 99efc8b..cdd6c2d 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ 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-intel1 (= ${binary:Version}) [linux-any kfreebsd-any] libdrm-radeon1 (= ${binary:Version}) [linux-any], libdrm-nouveau1 (= ${binary:Version}) [linux-any] Description: Userspace interface to kernel DRM services -- development files @@ -64,7 +64,7 @@ Description: Userspace interface to kernel DRM services -- debugging symbols Package: libdrm-intel1 Section: libs -Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 +Architecture: linux-any kfreebsd-any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Userspace interface to intel-specific kernel DRM services -- runtime This library implements the userspace interface to the intel-specific kernel @@ -75,7 +75,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: linux-any kfreebsd-any Depends: libdrm-intel1 (= ${binary:Version}), ${misc:Depends} Description: Userspace interface to intel-specific kernel DRM services -- debugging symbols This library implements the userspace interface to the kernel DRM services. diff --git a/debian/rules b/debian/rules index 330f343..b80459c 100755 --- a/debian/rules +++ b/debian/rules @@ -36,12 +36,9 @@ else RADEON = no endif -# only build libdrm-intel on x86 -ifneq (,$(filter amd64 i386,$(DEB_HOST_ARCH_CPU))) ifneq (,$(filter linux kfreebsd,$(DEB_HOST_ARCH_OS))) INTEL = yes endif -endif ifeq ($(INTEL), yes) confflags += --enable-intel commit 7d638efa9dcdec8c851833389f1c65ef3d71987b Author: Christopher James Halse Rogers <[email protected]> Date: Mon Feb 1 16:30:19 2010 +1100 Fix typo in linux-backports-modules patch. 'drm_lbm' != 'lbm-drm' diff --git a/debian/patches/02_fix_kms_detection_with_linux_backport_modules.diff b/debian/patches/02_fix_kms_detection_with_linux_backport_modules.diff index 7b95e18..b4b2ecc 100644 --- a/debian/patches/02_fix_kms_detection_with_linux_backport_modules.diff +++ b/debian/patches/02_fix_kms_detection_with_linux_backport_modules.diff @@ -6,10 +6,10 @@ Index: libdrm/xf86drmMode.c return 0; } -+ /* Ubuntu's linux-backports-modules renames the drm module to drm_lbm ++ /* Ubuntu's linux-backports-modules renames the drm module to lbm-drm + to avoid conflicting with existing drm modules. We therefore need -+ to search in $DIR/drm_lbm as well as $DIR/drm */ -+ sprintf(pci_dev_dir, "/sys/bus/pci/devices/%04x:%02x:%02x.%d/drm_lbm", ++ to search in $DIR/lbm-drm as well as $DIR/drm */ ++ sprintf(pci_dev_dir, "/sys/bus/pci/devices/%04x:%02x:%02x.%d/lbm-drm", + domain, bus, dev, func); + + sysdir = opendir(pci_dev_dir); commit b4caa5f39afd8fdadec2497d87025c1f33b688a8 Author: Christopher James Halse Rogers <[email protected]> Date: Mon Feb 1 15:55:59 2010 +1100 Patch to add BEGIN_RING_NI to nouveau headers, needed for nv50 accel diff --git a/debian/changelog b/debian/changelog index bf5d8e6..065f299 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,8 +28,11 @@ libdrm (2.4.17-1ubuntu1) UNRELEASED; urgency=low * debian/patches/08_nouveau_no_flush_notify_on_channel_free.diff: + Patch taken from git. Avoid calling flush_notify when part of the channel's context might be freed. - - -- Christopher James Halse Rogers <[email protected]> Mon, 01 Feb 2010 12:50:59 +1100 + * debian/patchs/09_add_BEGIN_RING_NI.diff: + + Patch taken from git. Add BEGIN_RING_NI inline to nouveau_pushbuf.h. + Used in nv50 accel code. + + -- Christopher James Halse Rogers <[email protected]> Mon, 01 Feb 2010 15:55:14 +1100 libdrm (2.4.17-1) unstable; urgency=low diff --git a/debian/patches/09_add_BEGIN_RING_NI.diff b/debian/patches/09_add_BEGIN_RING_NI.diff new file mode 100644 index 0000000..9865110 --- /dev/null +++ b/debian/patches/09_add_BEGIN_RING_NI.diff @@ -0,0 +1,25 @@ +commit c5c503b519777fb9ebbaa22681a1ed81717c1d71 +Author: Marcin Slusarz <[email protected]> +Date: Wed Dec 30 21:32:40 2009 +0100 + + nouveau: add BEGIN_RING_NI + +diff --git a/nouveau/nouveau_pushbuf.h b/nouveau/nouveau_pushbuf.h +index c7ac8c4..46982af 100644 +--- a/nouveau/nouveau_pushbuf.h ++++ b/nouveau/nouveau_pushbuf.h +@@ -111,6 +111,14 @@ BEGIN_RING(struct nouveau_channel *chan, struct nouveau_grobj *gr, + chan->pushbuf->remaining -= (size + 1); + } + ++/* non-incrementing BEGIN_RING */ ++static __inline__ void ++BEGIN_RING_NI(struct nouveau_channel *chan, struct nouveau_grobj *gr, ++ unsigned mthd, unsigned size) ++{ ++ BEGIN_RING(chan, gr, mthd | 0x40000000, size); ++} ++ + static __inline__ void + FIRE_RING(struct nouveau_channel *chan) + { diff --git a/debian/patches/series b/debian/patches/series index 4950390..eb89c4d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ 06_nouveau_free_objects_on_channel_close.diff 07_nouveau_fix_mem_leak_on_channel_free.diff 08_nouveau_no_flush_notify_on_channel_free.diff +09_add_BEGIN_RING_NI.diff -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
