libdrm: Changes to 'ubuntu'
Rebased ref, commits from common ancestor: -- 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/e1yzodo-0003w0...@moszumanska.debian.org
libdrm: Changes to 'ubuntu'
.gitignore|4
Makefile.am | 30 ++-
configure.ac | 36 ++-
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
include/drm/nouveau_drm.h |1
intel/Android.mk |2
intel/intel_bufmgr_gem.c | 71 +++
intel/test_decode.c |5
libdrm.h |2
libkms/exynos.c |7
nouveau/Android.mk|3
nouveau/abi16.c |3
nouveau/bufctx.c |6
nouveau/nouveau.c | 117 +--
nouveau/nouveau.h |1
radeon/Android.mk |3
tests/Makefile.am | 54 ++---
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/modetest.c |2
tests/name_from_fd.c |4
tests/nouveau/.gitignore |1
tests/nouveau/Makefile.am | 16 +
tests/nouveau/threaded.c | 156 +++
tests/proptest/Makefile.am|1
tests/proptest/proptest.c |4
tests/radeon/Makefile.am |1
tests/radeon/list.h | 12 -
tests/radeon/radeon_ttm.c |4
tests/setversion.c|1
tests/tegra/Makefile.am |2
tests/updatedraw.c|3
tests/vbltest/Makefile.am |2
tests/vbltest/vbltest.c |5
xf86atomic.h | 19 +
xf86drm.c | 371 --
xf86drm.h | 16 +
xf86drmMode.c | 59 +++---
xf86drmRandom.c | 12 -
60 files changed, 1482 insertions(+), 1269 deletions(-)
New commits:
commit f744c07a31010f09b916eefb05d788d51490ccae
Author: Alexandre Courbot
Date: Fri Dec 5 14:55:35 2014 +0900
Add coherent BO attribute
diff --git a/include/drm/nouveau_drm.h b/include/drm/nouveau_drm.h
index b18cad0..87aefc5 100644
--- a/include/drm/nouveau_drm.h
+++ b/include/drm/nouveau_drm.h
@@ -96,6 +96,7 @@ struct drm_nouveau_setparam {
#define NOUVEAU_GEM_DOMAIN_VRAM (1 << 1)
#define NOUVEAU_GEM_DOMAIN_GART (1 << 2)
#define NOUVEAU_GEM_DOMAIN_MAPPABLE (1 << 3)
+#define NOUVEAU_GEM_DOMAIN_COHERENT (1 << 4)
#define NOUVEAU_GEM_TILE_LAYOUT_MASK 0xff00
#define NOUVEAU_GEM_TILE_16BPP 0x0001
diff --git a/nouveau/abi16.c b/nouveau/abi16.c
index ae13821..d2d1d0d 100644
--- a/nouveau/abi16.c
+++ b/nouveau/abi16.c
@@ -195,6 +195,9 @@ abi16_bo_init(struct nouveau_bo *bo, uint32_t alignment,
if (bo->flags & NOUVEAU_BO_MAP)
info->domain |= NOUVEAU_GEM_DOMAIN_MAPPABLE;
+ if (bo->flags & NOUVEAU_BO_COHERENT)
+ info->domain |= NOUVEAU_GEM_DOMAIN_COHERENT;
+
if (!(bo->flags & NOUVEAU_BO_CONTIG))
info->tile_flags = NOUVEAU_GEM_TILE_NONCONTIG;
diff --git a/nouveau/nouveau.h b/nouveau/nouveau.h
index a55e2b0..4adda0e 100644
--- a/nouveau/nouveau.h
+++ b/nouveau/nouveau.h
@@ -127,6 +127,7 @@ union nouveau_bo_config {
#define NOUVEAU_BO_MAP 0x8000
#define NOUVEAU_BO_CONTIG 0x4000
#define NOUVEAU_BO_NOSNOOP 0x2000
+#define NOUVEAU_BO_COHERENT 0x1000
struct nouveau_bo {
struct nouveau_device *device;
commit 858b21f6af03c9658126fd6ec2aa35b4e5151ecb
Author: Tobias Jakobi
Date: Wed Mar 11 20:38:46 2015 +0100
exynos: fimg2d: follow-up fix for G2D_COEFF_MODE_GB_COLOR
Also add the register field formatting info provided by
Inki Dae .
Signed-off-by: Tobias Jakobi
Suggested-by: Inki Dae
diff --git a/exynos/exynos_fimg2d.h b/exynos/exynos_fimg2d.h
index f76f2a9..9db0c88 100644
--- a/exynos/exynos_fimg2d.h
+++ b/exynos/exynos_fimg2d.h
@@ -151,6 +151,12 @@ enum e_g2d_op {
G2D_OP_CONJOINT_
libdrm: Changes to 'ubuntu'
debian/changelog |6 ++ 1 file changed, 6 insertions(+) New commits: commit d868b29ce96722a7add7b1662576c6bc9a77b218 Author: Maarten Lankhorst Date: Tue Feb 24 14:21:36 2015 +0100 Copy libdrm 2.4.59-1 from NEW queue to ubuntu. diff --git a/debian/changelog b/debian/changelog index d529a03..90733fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libdrm (2.4.59-0ubuntu1) vivid; urgency=medium + + * Copy libdrm 2.4.59-1 from NEW queue to ubuntu. + + -- Maarten Lankhorst Tue, 24 Feb 2015 14:20:55 +0100 + libdrm (2.4.59-1) experimental; urgency=medium * New upstream release. -- 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/e1yqfr8-0006kp...@moszumanska.debian.org
libdrm: Changes to 'ubuntu-precise'
Rebased ref, commits from common ancestor: commit 1f916a3fe5709f32ed194ee2f54e6825a381e044 Author: Maarten Lankhorst Date: Wed Jun 4 12:26:10 2014 +0200 add changelog entry diff --git a/debian/changelog b/debian/changelog index fa5cd41..bdee38b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libdrm (2.4.52-1~precise1) precise-proposed; urgency=low + + * Copy package back to precise, and build libdrm-nouveau1a again. (LP: #1318616) + + -- Maarten Lankhorst Tue, 18 Feb 2014 17:08:01 +0100 + libdrm (2.4.52-1) unstable; urgency=medium [ Julien Cristau ] -- 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/e1ws8oq-00068n...@moszumanska.debian.org
libdrm: Changes to 'ubuntu-precise'
.gitignore |7
ChangeLog |39554
Makefile.am |2
configure.ac|4
debian/changelog| 61
debian/control | 33
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/series |1
debian/rules| 25
freedreno/Makefile.am | 19
freedreno/freedreno_bo.c| 332
freedreno/freedreno_device.c| 117
freedreno/freedreno_drmif.h |8
freedreno/freedreno_pipe.c | 188
freedreno/freedreno_priv.h | 107
freedreno/freedreno_ringbuffer.c| 180
freedreno/freedreno_ringbuffer.h| 35
freedreno/kgsl/kgsl_bo.c| 313
freedreno/kgsl/kgsl_device.c| 61
freedreno/kgsl/kgsl_drm.h | 192
freedreno/kgsl/kgsl_pipe.c | 264
freedreno/kgsl/kgsl_priv.h | 115
freedreno/kgsl/kgsl_ringbuffer.c| 224
freedreno/kgsl/msm_kgsl.h | 519
freedreno/kgsl_drm.h| 192
freedreno/msm/msm_bo.c | 141
freedreno/msm/msm_device.c | 61
freedreno/msm/msm_drm.h | 207
freedreno/msm/msm_pipe.c| 133
freedreno/msm/msm_priv.h| 95
freedreno/msm/msm_ringbuffer.c | 321
freedreno/msm_kgsl.h| 519
include/drm/drm.h | 22
include/drm/drm_mode.h | 42
include/drm/i915_drm.h | 132
include/drm/radeon_drm.h| 14
intel/intel_bufmgr.h| 17
intel/intel_bufmgr_gem.c| 174
intel/intel_chipset.h | 22
intel/intel_decode.c|6
intel/libdrm_intel.pc.in|4
intel/test_decode.c |1
libkms/Makefile.am |5
libkms/exynos.c | 207
libkms/internal.h |2
libkms/linux.c |4
nouveau/nouveau.c | 108
nouveau/private.h |3
nouveau/pushbuf.c |3
radeon/r600_pci_ids.h | 37
radeon/radeon_cs_gem.c |3
radeon/radeon_surface.c | 662
radeon/radeon_surface.h |1
tests/getversion.c |1
tests/kmstest/main.c|1
tests/modetest/Makefile.am |4
tests/modetest/buffers.c| 44
tests/modetest/buffers.h|5
tests/modetest/modetest.c | 1234 -
tests/setversion.c |1
tests/vbltest/vbltest.c |2
xf86drm.c |7
xf86drm.h | 10
xf86drmMode.c | 19
xf86drmMode.h | 47
70 files changed, 5538 insertions(+), 41413 deletions(-)
New commits:
commit 24c4a77ac40234eab260852cb266b71ac144b52d
Author: Ilia Mirkin
Date: Wed Mar 12 22:05:15 2014 -0400
nouveau: safen up nouveau_device list usage against concurrent access
Signed-off-by: Ilia Mirkin
diff --git a/nouveau/nouveau.c b/nouveau/nouveau.c
index ee7893b..75dfb0e 100644
--- a/nouveau/nouveau.c
+++ b/nouveau/nouveau.c
@@ -85,6 +85,12 @@ nouveau_device_wrap(int fd, int close, struct nouveau_device
**pdev)
if (!nvdev)
return -ENOMEM;
+ ret = pthread_mutex_init(&nvdev->lock, NULL);
+ if (ret) {
+ free(nvdev);
+ return ret;
+ }
+
nvdev->base.fd = fd;
ver = drmGetVersion(fd);
@@ -161,6 +167,7 @@ nouveau_device_del(struct nouveau_device **pdev)
if (nvdev->close)
drmClose(nvdev->base.fd);
free(nvdev->client);
+ pthread_mutex_destroy(&nvdev->lock);
free(nvdev);
*pdev = NULL;
}
@@ -191,6 +198,8 @@ nouveau_client_new(struct nouveau_device *dev, struct
nouveau_client **pclient)
int id = 0, i, ret = -ENOMEM;
uint32_t *clients;
+ pthread_mutex_lock(&nvdev->lock);
+
for (i = 0; i < nvdev->nr_client; i++) {
id = ffs(nvdev->client[i]) - 1;
if (id >= 0)
@@ -199,7 +208,7 @@ nouveau_client_new(struct nouveau_device *dev, struct
nouveau_client **pclient)
clients = realloc(nvdev->client, sizeof(uint32_t) * (i + 1));
if (!clients)
- return ret;
+ goto unlock;
nvdev->client = clients;
nvdev->client[i] = 0;
nvdev->nr_client++;
@@ -214,6 +223,9 @@ out:
}
*pc
libdrm: Changes to 'ubuntu-precise'
debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit e5c98ee686647ddbc6a7189975dde513562d6d79 Author: Maarten Lankhorst Date: Wed Nov 27 14:12:55 2013 +0100 prepare changelog for precise sru diff --git a/debian/changelog b/debian/changelog index a86e39c..289c073 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -libdrm (2.4.46-1ubuntu0.1) raring-proposed; urgency=low +libdrm (2.4.46-1ubuntu0.0.0.1) precise-proposed; urgency=low - * Copy package from saucy. (LP: #1253041) + * Copy package from saucy, but keep libdrm-nouveau1a. (LP: #1253041) * Drop pci-id patches, upstream. -- Maarten Lankhorst Wed, 27 Nov 2013 14:02:28 +0100 -- 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/e1vlf7r-0006sv...@moszumanska.debian.org
libdrm: Changes to 'ubuntu-quantal'
debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 51d84570ac6bd61704c98f53b88fb38c2af2f042 Author: Maarten Lankhorst Date: Wed Nov 27 14:12:10 2013 +0100 prepare changelog for quantal sru diff --git a/debian/changelog b/debian/changelog index c59bfdb..8f5cf4c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -libdrm (2.4.46-1ubuntu0.1) raring-proposed; urgency=low +libdrm (2.4.46-1ubuntu0.0.1) quantal-proposed; urgency=low - * Copy package from saucy. (LP: #1253041) + * Copy package from saucy, but keep libdrm-nouveau1a. (LP: #1253041) * Drop pci-id patches, upstream. -- Maarten Lankhorst Wed, 27 Nov 2013 14:02:28 +0100 -- 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/e1vlf7r-0006tc...@moszumanska.debian.org
libdrm: Changes to 'ubuntu-precise'
debian/changelog |9 + debian/patches/add-more-reserved-hsw-ids.diff | 136 ++ debian/patches/fix-hsw-crw-ids.diff | 40 +++ debian/patches/fix-hsw-gt3-names.diff | 110 + debian/patches/series |3 5 files changed, 298 insertions(+) New commits: commit 7caaa49df616af70d139371aeb9056bd75ae5aa9 Author: Maarten Lankhorst Date: Wed Jun 19 10:24:58 2013 +0200 merge sru from precise-propose diff --git a/debian/changelog b/debian/changelog index e405f09..1e477c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +libdrm (2.4.43-0ubuntu0.0.2) precise-proposed; urgency=low + + * Added patches to add/fix Haswell pci-id's (LP: #1175533) +- fix-hsw-crw-ids.diff +- fix-hsw-gt3-names.diff +- add-more-reserved-hsw-ids.diff + + -- Maarten Lankhorst Wed, 19 Jun 2013 10:24:58 +0200 + libdrm (2.4.43-0ubuntu0.0.1) precise-proposed; urgency=low * Copy package from raring, and re-enable libdrm-nouveau1a. (LP: #1171340) diff --git a/debian/patches/add-more-reserved-hsw-ids.diff b/debian/patches/add-more-reserved-hsw-ids.diff new file mode 100644 index 000..5586818 --- /dev/null +++ b/debian/patches/add-more-reserved-hsw-ids.diff @@ -0,0 +1,136 @@ +commit 1669a67d063e82a58dae4d906015172d471e9a2a +Author: Rodrigo Vivi +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 +Acked-by: Kenneth Graunke + +diff --git a/intel/intel_chipset.h b/intel/intel_chipset.h +index 3350def..aeb439e 100644 +--- a/intel/intel_chipset.h b/intel/intel_chipset.h +@@ -97,6 +97,12 @@ + #define PCI_CHIP_HASWELL_S_GT10x040A /* Server */ + #define PCI_CHIP_HASWELL_S_GT20x041A + #define PCI_CHIP_HASWELL_S_GT30x042A ++#define PCI_CHIP_HASWELL_B_GT10x040B /* Reserved */ ++#define PCI_CHIP_HASWELL_B_GT20x041B ++#define PCI_CHIP_HASWELL_B_GT30x042B ++#define PCI_CHIP_HASWELL_E_GT10x040E /* Reserved */ ++#define PCI_CHIP_HASWELL_E_GT20x041E ++#define PCI_CHIP_HASWELL_E_GT30x042E + #define PCI_CHIP_HASWELL_SDV_GT1 0x0C02 /* Desktop */ + #define PCI_CHIP_HASWELL_SDV_GT2 0x0C12 + #define PCI_CHIP_HASWELL_SDV_GT3 0x0C22 +@@ -106,6 +112,12 @@ + #define PCI_CHIP_HASWELL_SDV_S_GT10x0C0A /* Server */ + #define PCI_CHIP_HASWELL_SDV_S_GT20x0C1A + #define PCI_CHIP_HASWELL_SDV_S_GT30x0C2A ++#define PCI_CHIP_HASWELL_SDV_B_GT10x0C0B /* Reserved */ ++#define PCI_CHIP_HASWELL_SDV_B_GT20x0C1B ++#define PCI_CHIP_HASWELL_SDV_B_GT30x0C2B ++#define PCI_CHIP_HASWELL_SDV_E_GT10x0C0E /* Reserved */ ++#define PCI_CHIP_HASWELL_SDV_E_GT20x0C1E ++#define PCI_CHIP_HASWELL_SDV_E_GT30x0C2E + #define PCI_CHIP_HASWELL_ULT_GT1 0x0A02 /* Desktop */ + #define PCI_CHIP_HASWELL_ULT_GT2 0x0A12 + #define PCI_CHIP_HASWELL_ULT_GT3 0x0A22 +@@ -115,6 +127,12 @@ + #define PCI_CHIP_HASWELL_ULT_S_GT10x0A0A /* Server */ + #define PCI_CHIP_HASWELL_ULT_S_GT20x0A1A + #define PCI_CHIP_HASWELL_ULT_S_GT30x0A2A ++#define PCI_CHIP_HASWELL_ULT_B_GT10x0A0B /* Reserved */ ++#define PCI_CHIP_HASWELL_ULT_B_GT20x0A1B ++#define PCI_CHIP_HASWELL_ULT_B_GT30x0A2B ++#define PCI_CHIP_HASWELL_ULT_E_GT10x0A0E /* Reserved */ ++#define PCI_CHIP_HASWELL_ULT_E_GT20x0A1E ++#define PCI_CHIP_HASWELL_ULT_E_GT30x0A2E + #define PCI_CHIP_HASWELL_CRW_GT1 0x0D02 /* Desktop */ + #define PCI_CHIP_HASWELL_CRW_GT2 0x0D12 + #define PCI_CHIP_HASWELL_CRW_GT3 0x0D22 +@@ -124,6 +142,12 @@ + #define PCI_CHIP_HASWELL_CRW_S_GT10x0D0A /* Server */ + #define PCI_CHIP_HASWELL_CRW_S_GT20x0D1A + #define PCI_CHIP_HASWELL_CRW_S_GT30x0D2A ++#define PCI_CHIP_HASWELL_CRW_B_GT10x0D0B /* Reserved */ ++#define PCI_CHIP_HASWELL_CRW_B_GT20x0D1B ++#define PCI_CHIP_HASWELL_CRW_B_GT30x0D2B ++#define PCI_CHIP_HASWELL_CRW_E_GT10x0D0E /* Reserved */ ++#define PCI_CHIP_HASWELL_CRW_E_GT20x0D1E ++#define PCI_CHIP_HASWELL_CRW_E_GT30x0D2E + + #define PCI_CHIP_VALLEYVIEW_PO0x0f30 /* VLV PO board */ + #define PCI_CHIP_VALLEYVIEW_1 0x0f31 +@@ -210,39 +234,63 @@ + #define IS_HSW_GT1(devid) ((devid) == PCI_CHIP_HASWELL_GT1 || \ +(devid) == PCI_CHIP_HASWELL_M_GT1 || \ +(devid) == PCI_CHIP_HASWELL_S_GT1 || \ ++ (devid) == PCI_CHIP_HASWELL_B_GT1 || \ ++ (devid) == PCI_CHIP_HASWELL_E_GT1 || \ +(devid) == PCI_CHIP_HASWE
libdrm: Changes to 'ubuntu-saucy'
debian/changelog | 11 +++
debian/control |4 +++-
2 files changed, 14 insertions(+), 1 deletion(-)
New commits:
commit d66787a76df64fa88da14e404af7ed3861811357
Author: Maarten Lankhorst
Date: Mon Nov 11 13:02:28 2013 +0100
merge sru from saucy-proposed
diff --git a/debian/changelog b/debian/changelog
index 004df80..9aa4884 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+libdrm (2.4.46-1ubuntu1) saucy-proposed; urgency=low
+
+ [ Colin Watson ]
+ * Declare libdrm-dev Multi-Arch: same.
+
+ [ Maarten Lankhorst ]
+ * Cherry-pick upstream patch to fix relocations for all cards Mon, 11 Nov 2013
13:02:28 +0100
+
libdrm (2.4.46-1) unstable; urgency=low
[ Sven Joachim ]
diff --git a/debian/control b/debian/control
index 6729001..b36f07c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
Source: libdrm
Priority: optional
-Maintainer: Debian X Strike Force
+Maintainer: Ubuntu Developers
+XSBC-Original-Maintainer: Debian X Strike Force
Uploaders: Cyril Brulebois
Build-Depends:
debhelper (>= 9),
@@ -30,6 +31,7 @@ Depends:
libdrm-omap1 (= ${binary:Version}) [any-arm],
libkms1 (= ${binary:Version}) [linux-any],
${misc:Depends},
+Multi-Arch: same
Replaces:
linux-libc-dev (<< 2.6.32-10)
Description: Userspace interface to kernel DRM services -- development files
--
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/e1vlewp-0001gc...@moszumanska.debian.org
libdrm: Changes to 'ubuntu-saucy'
New branch 'ubuntu-saucy' available with the following commits: -- 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/e1vlet8-0001vc...@moszumanska.debian.org
libdrm: Changes to 'ubuntu'
nouveau/pushbuf.c |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit bcb55c0bb8182f4ec7206bce4eef19fb63a5a02e
Author: Maarten Lankhorst
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
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71116
Signed-off-by: Maarten Lankhorst
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/e1vepf8-0008mi...@vasks.debian.org
libdrm: Changes to 'ubuntu'
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
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 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
+Maintainer: Ubuntu Developers
+XSBC-Original-Maintainer: Debian X Strike Force
Uploaders: Cyril Brulebois
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
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 Thu, 19 Sep 2013 21:13:52 +0200
+ -- Julien Cristau Thu, 19 Sep 2013 21:24:52 +0200
libdrm (2.4.46-2) unstable; urgency=low
commit 28fa67827c16338311f2857d56c395a7202b9781
Author: Julien Cristau
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 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:Depend
libdrm: Changes to 'ubuntu-quantal'
debian/changelog |9 + debian/patches/add-more-reserved-hsw-ids.diff | 136 ++ debian/patches/fix-hsw-crw-ids.diff | 40 +++ debian/patches/fix-hsw-gt3-names.diff | 110 + debian/patches/series |3 5 files changed, 298 insertions(+) New commits: commit a58ab9b24e75e0131af8167f5c00db05dd4f7560 Author: Maarten Lankhorst Date: Wed Jun 19 10:25:17 2013 +0200 release to raring-proposed diff --git a/debian/changelog b/debian/changelog index c45a477..064431e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -libdrm (2.4.43-0ubuntu1.1) UNRELEASED; urgency=low +libdrm (2.4.43-0ubuntu1.1) raring-proposed; urgency=low * Added patches to add/fix Haswell pci-id's (LP: #1175533) - fix-hsw-crw-ids.diff - fix-hsw-gt3-names.diff - add-more-reserved-hsw-ids.diff - -- Maarten Lankhorst Wed, 19 Jun 2013 10:19:21 +0200 + -- Maarten Lankhorst Wed, 19 Jun 2013 10:24:58 +0200 libdrm (2.4.43-0ubuntu1) raring; urgency=low commit 2243b5c84846deedd3e0ad6542a17644a6c8ca2d Author: Timo Aaltonen Date: Thu Jun 6 14:10:45 2013 +0300 Added patches to add/fix Haswell pci-id's (LP: #1175533) (cherry picked from commit ef3e0628bf05f9a182c0614a8b14d5bce820acbd) diff --git a/debian/changelog b/debian/changelog index 8ca09a8..c45a477 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +libdrm (2.4.43-0ubuntu1.1) UNRELEASED; urgency=low + + * Added patches to add/fix Haswell pci-id's (LP: #1175533) +- fix-hsw-crw-ids.diff +- fix-hsw-gt3-names.diff +- add-more-reserved-hsw-ids.diff + + -- Maarten Lankhorst Wed, 19 Jun 2013 10:19:21 +0200 + libdrm (2.4.43-0ubuntu1) raring; urgency=low * Sync from unreleased debian git. diff --git a/debian/patches/add-more-reserved-hsw-ids.diff b/debian/patches/add-more-reserved-hsw-ids.diff new file mode 100644 index 000..5586818 --- /dev/null +++ b/debian/patches/add-more-reserved-hsw-ids.diff @@ -0,0 +1,136 @@ +commit 1669a67d063e82a58dae4d906015172d471e9a2a +Author: Rodrigo Vivi +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 +Acked-by: Kenneth Graunke + +diff --git a/intel/intel_chipset.h b/intel/intel_chipset.h +index 3350def..aeb439e 100644 +--- a/intel/intel_chipset.h b/intel/intel_chipset.h +@@ -97,6 +97,12 @@ + #define PCI_CHIP_HASWELL_S_GT10x040A /* Server */ + #define PCI_CHIP_HASWELL_S_GT20x041A + #define PCI_CHIP_HASWELL_S_GT30x042A ++#define PCI_CHIP_HASWELL_B_GT10x040B /* Reserved */ ++#define PCI_CHIP_HASWELL_B_GT20x041B ++#define PCI_CHIP_HASWELL_B_GT30x042B ++#define PCI_CHIP_HASWELL_E_GT10x040E /* Reserved */ ++#define PCI_CHIP_HASWELL_E_GT20x041E ++#define PCI_CHIP_HASWELL_E_GT30x042E + #define PCI_CHIP_HASWELL_SDV_GT1 0x0C02 /* Desktop */ + #define PCI_CHIP_HASWELL_SDV_GT2 0x0C12 + #define PCI_CHIP_HASWELL_SDV_GT3 0x0C22 +@@ -106,6 +112,12 @@ + #define PCI_CHIP_HASWELL_SDV_S_GT10x0C0A /* Server */ + #define PCI_CHIP_HASWELL_SDV_S_GT20x0C1A + #define PCI_CHIP_HASWELL_SDV_S_GT30x0C2A ++#define PCI_CHIP_HASWELL_SDV_B_GT10x0C0B /* Reserved */ ++#define PCI_CHIP_HASWELL_SDV_B_GT20x0C1B ++#define PCI_CHIP_HASWELL_SDV_B_GT30x0C2B ++#define PCI_CHIP_HASWELL_SDV_E_GT10x0C0E /* Reserved */ ++#define PCI_CHIP_HASWELL_SDV_E_GT20x0C1E ++#define PCI_CHIP_HASWELL_SDV_E_GT30x0C2E + #define PCI_CHIP_HASWELL_ULT_GT1 0x0A02 /* Desktop */ + #define PCI_CHIP_HASWELL_ULT_GT2 0x0A12 + #define PCI_CHIP_HASWELL_ULT_GT3 0x0A22 +@@ -115,6 +127,12 @@ + #define PCI_CHIP_HASWELL_ULT_S_GT10x0A0A /* Server */ + #define PCI_CHIP_HASWELL_ULT_S_GT20x0A1A + #define PCI_CHIP_HASWELL_ULT_S_GT30x0A2A ++#define PCI_CHIP_HASWELL_ULT_B_GT10x0A0B /* Reserved */ ++#define PCI_CHIP_HASWELL_ULT_B_GT20x0A1B ++#define PCI_CHIP_HASWELL_ULT_B_GT30x0A2B ++#define PCI_CHIP_HASWELL_ULT_E_GT10x0A0E /* Reserved */ ++#define PCI_CHIP_HASWELL_ULT_E_GT20x0A1E ++#define PCI_CHIP_HASWELL_ULT_E_GT30x0A2E + #define PCI_CHIP_HASWELL_CRW_GT1 0x0D02 /* Desktop */ + #define PCI_CHIP_HASWELL_CRW_GT2 0x0D12 + #define PCI_CHIP_HASWELL_CRW_GT3 0x0D22 +@@ -124,6 +142,12 @@ + #define PCI_CHIP_HASWELL_CRW_S_GT10x0D0A /* Server */ + #define PCI_CHIP_HASWELL_CRW_S_GT20x0D1A + #define PCI_CHIP_HASWELL_CRW_S_GT30x0D2A ++#define PCI_CHIP_HASWELL_CRW_B_GT10x0D0B /* Reserved */ ++#define PCI_CHIP_HASWELL_CRW_B_GT20x0D1B +
libdrm: Changes to 'ubuntu-raring'
debian/changelog |9 + debian/patches/add-more-reserved-hsw-ids.diff | 136 ++ debian/patches/fix-hsw-crw-ids.diff | 40 +++ debian/patches/fix-hsw-gt3-names.diff | 110 + debian/patches/series |3 5 files changed, 298 insertions(+) New commits: commit a58ab9b24e75e0131af8167f5c00db05dd4f7560 Author: Maarten Lankhorst Date: Wed Jun 19 10:25:17 2013 +0200 release to raring-proposed diff --git a/debian/changelog b/debian/changelog index c45a477..064431e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -libdrm (2.4.43-0ubuntu1.1) UNRELEASED; urgency=low +libdrm (2.4.43-0ubuntu1.1) raring-proposed; urgency=low * Added patches to add/fix Haswell pci-id's (LP: #1175533) - fix-hsw-crw-ids.diff - fix-hsw-gt3-names.diff - add-more-reserved-hsw-ids.diff - -- Maarten Lankhorst Wed, 19 Jun 2013 10:19:21 +0200 + -- Maarten Lankhorst Wed, 19 Jun 2013 10:24:58 +0200 libdrm (2.4.43-0ubuntu1) raring; urgency=low commit 2243b5c84846deedd3e0ad6542a17644a6c8ca2d Author: Timo Aaltonen Date: Thu Jun 6 14:10:45 2013 +0300 Added patches to add/fix Haswell pci-id's (LP: #1175533) (cherry picked from commit ef3e0628bf05f9a182c0614a8b14d5bce820acbd) diff --git a/debian/changelog b/debian/changelog index 8ca09a8..c45a477 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +libdrm (2.4.43-0ubuntu1.1) UNRELEASED; urgency=low + + * Added patches to add/fix Haswell pci-id's (LP: #1175533) +- fix-hsw-crw-ids.diff +- fix-hsw-gt3-names.diff +- add-more-reserved-hsw-ids.diff + + -- Maarten Lankhorst Wed, 19 Jun 2013 10:19:21 +0200 + libdrm (2.4.43-0ubuntu1) raring; urgency=low * Sync from unreleased debian git. diff --git a/debian/patches/add-more-reserved-hsw-ids.diff b/debian/patches/add-more-reserved-hsw-ids.diff new file mode 100644 index 000..5586818 --- /dev/null +++ b/debian/patches/add-more-reserved-hsw-ids.diff @@ -0,0 +1,136 @@ +commit 1669a67d063e82a58dae4d906015172d471e9a2a +Author: Rodrigo Vivi +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 +Acked-by: Kenneth Graunke + +diff --git a/intel/intel_chipset.h b/intel/intel_chipset.h +index 3350def..aeb439e 100644 +--- a/intel/intel_chipset.h b/intel/intel_chipset.h +@@ -97,6 +97,12 @@ + #define PCI_CHIP_HASWELL_S_GT10x040A /* Server */ + #define PCI_CHIP_HASWELL_S_GT20x041A + #define PCI_CHIP_HASWELL_S_GT30x042A ++#define PCI_CHIP_HASWELL_B_GT10x040B /* Reserved */ ++#define PCI_CHIP_HASWELL_B_GT20x041B ++#define PCI_CHIP_HASWELL_B_GT30x042B ++#define PCI_CHIP_HASWELL_E_GT10x040E /* Reserved */ ++#define PCI_CHIP_HASWELL_E_GT20x041E ++#define PCI_CHIP_HASWELL_E_GT30x042E + #define PCI_CHIP_HASWELL_SDV_GT1 0x0C02 /* Desktop */ + #define PCI_CHIP_HASWELL_SDV_GT2 0x0C12 + #define PCI_CHIP_HASWELL_SDV_GT3 0x0C22 +@@ -106,6 +112,12 @@ + #define PCI_CHIP_HASWELL_SDV_S_GT10x0C0A /* Server */ + #define PCI_CHIP_HASWELL_SDV_S_GT20x0C1A + #define PCI_CHIP_HASWELL_SDV_S_GT30x0C2A ++#define PCI_CHIP_HASWELL_SDV_B_GT10x0C0B /* Reserved */ ++#define PCI_CHIP_HASWELL_SDV_B_GT20x0C1B ++#define PCI_CHIP_HASWELL_SDV_B_GT30x0C2B ++#define PCI_CHIP_HASWELL_SDV_E_GT10x0C0E /* Reserved */ ++#define PCI_CHIP_HASWELL_SDV_E_GT20x0C1E ++#define PCI_CHIP_HASWELL_SDV_E_GT30x0C2E + #define PCI_CHIP_HASWELL_ULT_GT1 0x0A02 /* Desktop */ + #define PCI_CHIP_HASWELL_ULT_GT2 0x0A12 + #define PCI_CHIP_HASWELL_ULT_GT3 0x0A22 +@@ -115,6 +127,12 @@ + #define PCI_CHIP_HASWELL_ULT_S_GT10x0A0A /* Server */ + #define PCI_CHIP_HASWELL_ULT_S_GT20x0A1A + #define PCI_CHIP_HASWELL_ULT_S_GT30x0A2A ++#define PCI_CHIP_HASWELL_ULT_B_GT10x0A0B /* Reserved */ ++#define PCI_CHIP_HASWELL_ULT_B_GT20x0A1B ++#define PCI_CHIP_HASWELL_ULT_B_GT30x0A2B ++#define PCI_CHIP_HASWELL_ULT_E_GT10x0A0E /* Reserved */ ++#define PCI_CHIP_HASWELL_ULT_E_GT20x0A1E ++#define PCI_CHIP_HASWELL_ULT_E_GT30x0A2E + #define PCI_CHIP_HASWELL_CRW_GT1 0x0D02 /* Desktop */ + #define PCI_CHIP_HASWELL_CRW_GT2 0x0D12 + #define PCI_CHIP_HASWELL_CRW_GT3 0x0D22 +@@ -124,6 +142,12 @@ + #define PCI_CHIP_HASWELL_CRW_S_GT10x0D0A /* Server */ + #define PCI_CHIP_HASWELL_CRW_S_GT20x0D1A + #define PCI_CHIP_HASWELL_CRW_S_GT30x0D2A ++#define PCI_CHIP_HASWELL_CRW_B_GT10x0D0B /* Reserved */ ++#define PCI_CHIP_HASWELL_CRW_B_GT20x0D1B +
libdrm: Changes to 'ubuntu-raring'
New branch 'ubuntu-raring' available with the following commits: -- 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/e1updbc-0006zx...@vasks.debian.org
libdrm: Changes to 'ubuntu'
.gitignore|1 ChangeLog | 116 +++ configure.ac |2 debian/changelog | 30 - debian/control|2 debian/patches/add-more-reserved-hsw-ids.diff | 136 +++ debian/patches/fix-hsw-gt3-names.diff | 110 ++ debian/patches/series |2 freedreno/freedreno_bo.c | 68 +++ freedreno/freedreno_drmif.h |1 freedreno/freedreno_pipe.c| 26 freedreno/freedreno_priv.h| 10 + freedreno/freedreno_ringbuffer.c |4 include/drm/Makefile.am |4 include/drm/i915_drm.h|2 include/drm/qxl_drm.h | 152 ++ intel/intel_bufmgr_gem.c |9 + radeon/r600_pci_ids.h | 12 ++ radeon/radeon_surface.c | 10 + radeon/radeon_surface.h |1 20 files changed, 682 insertions(+), 16 deletions(-) New commits: commit 03d6c82578112b7ee436b332d1cdbaa9c8abcc30 Author: Timo Aaltonen Date: Thu Jun 6 14:12:14 2013 +0300 release to saucy diff --git a/debian/changelog b/debian/changelog index c8ec82a..22121be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libdrm (2.4.45-2ubuntu1) UNRELEASED; urgency=low +libdrm (2.4.45-2ubuntu1) saucy; urgency=low * Merge from debian experimental. * Added patches to add/fix Haswell pci-id's (LP: #1175533) - -- Timo Aaltonen Thu, 06 Jun 2013 14:08:52 +0300 + -- Timo Aaltonen Thu, 06 Jun 2013 14:10:48 +0300 libdrm (2.4.45-2) experimental; urgency=low commit ef3e0628bf05f9a182c0614a8b14d5bce820acbd Author: Timo Aaltonen Date: Thu Jun 6 14:10:45 2013 +0300 Added patches to add/fix Haswell pci-id's (LP: #1175533) diff --git a/debian/changelog b/debian/changelog index 028f434..c8ec82a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdrm (2.4.45-2ubuntu1) UNRELEASED; urgency=low + + * Merge from debian experimental. + * Added patches to add/fix Haswell pci-id's (LP: #1175533) + + -- Timo Aaltonen Thu, 06 Jun 2013 14:08:52 +0300 + libdrm (2.4.45-2) experimental; urgency=low [ Sven Joachim ] diff --git a/debian/patches/add-more-reserved-hsw-ids.diff b/debian/patches/add-more-reserved-hsw-ids.diff new file mode 100644 index 000..5586818 --- /dev/null +++ b/debian/patches/add-more-reserved-hsw-ids.diff @@ -0,0 +1,136 @@ +commit 1669a67d063e82a58dae4d906015172d471e9a2a +Author: Rodrigo Vivi +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 +Acked-by: Kenneth Graunke + +diff --git a/intel/intel_chipset.h b/intel/intel_chipset.h +index 3350def..aeb439e 100644 +--- a/intel/intel_chipset.h b/intel/intel_chipset.h +@@ -97,6 +97,12 @@ + #define PCI_CHIP_HASWELL_S_GT10x040A /* Server */ + #define PCI_CHIP_HASWELL_S_GT20x041A + #define PCI_CHIP_HASWELL_S_GT30x042A ++#define PCI_CHIP_HASWELL_B_GT10x040B /* Reserved */ ++#define PCI_CHIP_HASWELL_B_GT20x041B ++#define PCI_CHIP_HASWELL_B_GT30x042B ++#define PCI_CHIP_HASWELL_E_GT10x040E /* Reserved */ ++#define PCI_CHIP_HASWELL_E_GT20x041E ++#define PCI_CHIP_HASWELL_E_GT30x042E + #define PCI_CHIP_HASWELL_SDV_GT1 0x0C02 /* Desktop */ + #define PCI_CHIP_HASWELL_SDV_GT2 0x0C12 + #define PCI_CHIP_HASWELL_SDV_GT3 0x0C22 +@@ -106,6 +112,12 @@ + #define PCI_CHIP_HASWELL_SDV_S_GT10x0C0A /* Server */ + #define PCI_CHIP_HASWELL_SDV_S_GT20x0C1A + #define PCI_CHIP_HASWELL_SDV_S_GT30x0C2A ++#define PCI_CHIP_HASWELL_SDV_B_GT10x0C0B /* Reserved */ ++#define PCI_CHIP_HASWELL_SDV_B_GT20x0C1B ++#define PCI_CHIP_HASWELL_SDV_B_GT30x0C2B ++#define PCI_CHIP_HASWELL_SDV_E_GT10x0C0E /* Reserved */ ++#define PCI_CHIP_HASWELL_SDV_E_GT20x0C1E ++#define PCI_CHIP_HASWELL_SDV_E_GT30x0C2E + #define PCI_CHIP_HASWELL_ULT_GT1 0x0A02 /* Desktop */ + #define PCI_CHIP_HASWELL_ULT_GT2 0x0A12 + #define PCI_CHIP_HASWELL_ULT_GT3 0x0A22 +@@ -115,6 +127,12 @@ + #define PCI_CHIP_HASWELL_ULT_S_GT10x0A0A /* Server */ + #define PCI_CHIP_HASWELL_ULT_S_GT20x0A1A + #define PCI_CHIP_HASWELL_ULT_S_GT30x0A2A ++#define PCI_CHIP_HASWELL_ULT_B_GT10x0A0B /* Reserved */ ++#define PCI_CHIP_HASWELL_ULT_B_GT20x0A1B ++#define
libdrm: Changes to 'ubuntu'
ChangeLog | 194 +++
configure.ac |2
debian/changelog | 12
exynos/Makefile.am|6
freedreno/Makefile.am | 10
freedreno/freedreno_ringbuffer.c | 12
freedreno/freedreno_ringbuffer.h |2
include/drm/radeon_drm.h | 81
intel/intel_chipset.h | 18 -
intel/intel_decode.c |2
intel/tests/gen6-3d.batch-ref.txt |6
libkms/api.c |2
libkms/libkms.h |8
radeon/radeon_surface.c | 658 +++---
radeon/radeon_surface.h | 31 +
tests/modetest/buffers.c | 195 ---
tests/modetest/modetest.c | 10
xf86drm.c |2
xf86mm.h | 198 ---
19 files changed, 1138 insertions(+), 311 deletions(-)
New commits:
commit fc9887f6609d7247445cce6fd07ba7017fb968b1
Author: Maarten Lankhorst
Date: Fri May 3 08:12:47 2013 +0200
release to saucy
diff --git a/debian/changelog b/debian/changelog
index 5a47438..b4e5064 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.44-0ubuntu1) saucy; urgency=low
+
+ * Sync from unreleased debian git.
+
+ -- Maarten Lankhorst Thu, 02 May 2013
09:17:38 +0200
+
libdrm (2.4.44-1) UNRELEASED; urgency=low
[ Julien Cristau ]
commit d54a4da2c89a72f308bb56e20265aa11a5093954
Author: Maarten Lankhorst
Date: Thu May 2 09:15:44 2013 +0200
bump changelog
diff --git a/ChangeLog b/ChangeLog
index 4f07fdb..74b1902 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,197 @@
+commit 9768af201e9aba2093c80a8da3632fe9e4c044fe
+Author: Jerome Glisse
+Date: Thu Apr 18 15:01:19 2013 -0400
+
+libdrm 2.4.44
+
+commit 83e77461249d535a77c3ed055d198e26f0c1b390
+Author: Ville Syrjälä
+Date: Thu Apr 18 15:26:59 2013 +
+
+modetest: Add YUV420 support and fix YVU420 Cb/Cr ordering
+
+YUV420 support is trivial to add since the code already supports
+YVU420.
+
+But it looks like the YVU420 support is a bit broken. The chroma
+planes are passed in the wrong order to the fill functions, so
+fix that while were at it.
+
+Signed-off-by: Ville Syrjälä
+
+commit 3f024f85d816a648473373bccc8ccc915951886a
+Author: Ville Syrjälä
+Date: Thu Apr 18 15:26:57 2013 +
+
+modetest: Pass format_info to fill_tiles functions
+
+The fourcc is inside the format_info structure, so if we want to use
+it inside the various fill_tiles functions, we need to pass down the
+whole format_info, not just the rgb/yuv infos.
+
+Signed-off-by: Ville Syrjälä
+Acked-by: Laurent Pinchart
+
+commit 2c26a106fcfb692badef4c42faaed46508a3d1d3
+Author: Ville Syrjälä
+Date: Wed Apr 17 19:18:05 2013 +
+
+modetest: Reduce the length of the connector type string
+
+Spelling out eDP or DP make for a ridicilously long string which plays
+havoc with formatting. Just say eDP or DP.
+
+Signed-off-by: Ville Syrjälä
+Acked-by: Laurent Pinchart
+
+commit 8e56579b203a11c718c5e3da6fdb03b4f9b9fe56
+Author: Ville Syrjälä
+Date: Wed Apr 17 19:18:04 2013 +
+
+modetest: Print possible_crtcs for planes
+
+Signed-off-by: Ville Syrjälä
+Acked-by: Laurent Pinchart
+
+commit fa2925aa342158037ef972f3ef095442fb1fe430
+Author: Ville Syrjälä
+Date: Wed Apr 17 19:18:03 2013 +
+
+modetest: Add support for all 16/32 bpp RGB formats
+
+Signed-off-by: Ville Syrjälä
+Acked-by: Laurent Pinchart
+
+commit c2988eb211ecad2db60081f1000cf19b350703db
+Author: Ville Syrjälä
+Date: Wed Apr 17 19:18:02 2013 +
+
+modetest: Fix pitches, somewhat
+
+libkms only has the xrgb format, so we're overallocating the bo by
+quite a lot in some cases. But we still need to get the pitch from the
+libkms since it's the driver that decides how to align it.
+
+Signed-off-by: Ville Syrjälä
+Acked-by: Laurent Pinchart
+
+commit aa4afdf0b3be20aa6037b64f90983ea0146b2893
+Author: Laurent Pinchart
+Date: Thu Nov 1 09:38:42 2012 +
+
+kms: Return a negative error code in kms_bo_create()
+
+The function returns returns 0 on success or a negative value in case of an
+error, except when given invalid attributes in which case it returns the
+positive EINVAL value. Replace that with -EINVAL to allow the caller to
detect
+errors with a < 0 check.
+
+Signed-off-by: Laurent Pinchart
+Reviewed-by: Jakob Bornecrantz
+
+commit 9fa4a4b1a894fa8fffe2075bc3376b7fa5e18104
+Author: Laurent Pinchart
+Date: Thu Nov 1 09:40:30 2012 +
+
+kms: Make libkms.h usable in C++
+
+Wrap the header in extern "C" { ... };.
+
+Signed-off-by: Laurent Pinchart
+Reviewed-by: Jakob Bornecrantz
+
+commit e5d8a9c1d6375feb74feb52f419a025f1abf94d1
+Author: Rob Clark
+Da
libdrm: Changes to 'ubuntu-quantal'
.gitignore | 10 ChangeLog | 733 Makefile.am |8 configure.ac| 76 + debian/changelog| 50 - debian/control |5 debian/libdrm-dev.install |2 debian/libdrm-nouveau2.symbols |1 debian/patches/02_build_libkms_against_in_tree_drm.diff | 17 debian/patches/series |1 debian/rules|6 exynos/Makefile.am |2 exynos/exynos_drm.h | 52 + exynos/exynos_fimg2d.c | 630 + exynos/fimg2d.h | 325 +++ exynos/fimg2d_reg.h | 114 ++ freedreno/Makefile.am | 19 freedreno/README| 16 freedreno/freedreno_bo.c| 274 + freedreno/freedreno_device.c| 45 freedreno/freedreno_drmif.h | 99 ++ freedreno/freedreno_pipe.c | 227 freedreno/freedreno_priv.h | 117 ++ freedreno/freedreno_ringbuffer.c| 249 + freedreno/freedreno_ringbuffer.h| 87 + freedreno/kgsl_drm.h| 192 freedreno/libdrm_freedreno.pc.in| 11 freedreno/list.h| 137 ++ freedreno/msm_kgsl.h| 519 +++ intel/intel_bufmgr_gem.c| 22 intel/intel_chipset.h | 379 intel/intel_decode.c|4 libkms/Makefile.am |2 libkms/intel.c |1 libkms/linux.c |2 libkms/nouveau.c|1 man/Makefile.am | 63 + man/drm-kms.xml | 342 +++ man/drm-memory.xml | 430 + man/drm.xml | 137 ++ man/drmAvailable.xml| 75 + man/drmHandleEvent.xml | 102 ++ man/drmModeGetResources.xml | 139 +++ nouveau/abi16.c | 28 nouveau/libdrm_nouveau.pc.in|4 nouveau/nouveau.c | 21 nouveau/nouveau.h | 16 nouveau/private.h |2 nouveau/pushbuf.c | 16 omap/omap_drm.c |2 radeon/r600_pci_ids.h | 29 radeon/radeon_bo_gem.c | 16 radeon/radeon_cs_gem.c |2 radeon/radeon_surface.c | 405 +++- radeon/radeon_surface.h |2 tests/Makefile.am |4 tests/exynos/Makefile.am| 19 tests/exynos/exynos_fimg2d_test.c | 695 +++ tests/kmstest/Makefile.am |5 tests/modeprint/Makefile.am |5 tests/modetest/Makefile.am | 16 tests/vbltest/Makefile.am |6 xf86drmMode.c |5 63 files changed, 6697 insertions(+), 324 deletions(-) New commits: commit 7c88e4544a079a590a6fac05cd63f2441e9e619a Author: Maarten Lankhorst Date: Mon Apr 22 15:46:59 2013 +0200 release to quantal diff --git a/debian/changelog b/debian/changelog index d884e8e..2b54bb3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libdrm (2.4.43-0ubuntu0.1) UNRELEASED; urgency=low +libdrm (2.4.43-0ubuntu0.1) quantal-proposed; urgency=low * Copy package from raring, and re-enable libdrm-nouveau1a. (LP: #1171340) commit 645deada451406398728c7ce524b40579cbc824d Author: Maarten Lankhorst Date: Mon Apr 22 11:09:36 2013 +0200 Copy package from raring, and re-enable libdrm-nouveau1a. (LP: #1171340) diff --git a/debian/changelog b/deb
libdrm: Changes to 'ubuntu-precise'
New branch 'ubuntu-precise' available with the following commits: commit 02c7db2c15f9b02bad6a0f7b1d8920073b7b602b Author: Maarten Lankhorst Date: Mon Apr 22 15:46:59 2013 +0200 release to precise commit 645deada451406398728c7ce524b40579cbc824d Author: Maarten Lankhorst Date: Mon Apr 22 11:09:36 2013 +0200 Copy package from raring, and re-enable libdrm-nouveau1a. (LP: #1171340) commit dbf1e1a339a5c7c6a4c1e61b7300ab7863f1f1b2 Merge: 7f1aba0 29e7b2f Author: Maarten Lankhorst Date: Mon Apr 22 11:05:37 2013 +0200 Merge branch 'ubuntu' into ubuntu-quantal -- 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/e1uuh6f-00032i...@vasks.debian.org
libdrm: Changes to 'ubuntu-quantal'
New branch 'ubuntu-quantal' available with the following commits: -- 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/e1uucfn-0003gm...@vasks.debian.org
libdrm: Changes to 'ubuntu'
.gitignore|1 ChangeLog | 209 +++ Makefile.am |6 configure.ac | 28 + debian/changelog | 26 - exynos/Makefile.am|2 exynos/exynos_drm.h | 52 ++ exynos/exynos_fimg2d.c| 630 ++ exynos/fimg2d.h | 325 + exynos/fimg2d_reg.h | 114 ++ freedreno/Makefile.am | 19 + freedreno/README | 16 freedreno/freedreno_bo.c | 274 ++ freedreno/freedreno_device.c | 45 ++ freedreno/freedreno_drmif.h | 99 + freedreno/freedreno_pipe.c| 227 freedreno/freedreno_priv.h| 117 ++ freedreno/freedreno_ringbuffer.c | 249 + freedreno/freedreno_ringbuffer.h | 87 freedreno/kgsl_drm.h | 192 ++ freedreno/libdrm_freedreno.pc.in | 11 freedreno/list.h | 137 +++ freedreno/msm_kgsl.h | 519 intel/intel_bufmgr_gem.c |2 intel/intel_chipset.h | 378 +++- intel/intel_decode.c |2 nouveau/nouveau.c | 18 nouveau/private.h |1 nouveau/pushbuf.c |8 radeon/r600_pci_ids.h | 11 radeon/radeon_surface.c |8 tests/Makefile.am |4 tests/exynos/Makefile.am | 19 + tests/exynos/exynos_fimg2d_test.c | 695 ++ tests/kmstest/Makefile.am |5 tests/modeprint/Makefile.am |5 tests/modetest/Makefile.am|5 tests/vbltest/Makefile.am |6 38 files changed, 4354 insertions(+), 198 deletions(-) New commits: commit 29e7b2fb2489115cb7d877a55c77d7ae191c9452 Author: Maarten Lankhorst Date: Wed Mar 27 11:22:12 2013 +0100 release to raring diff --git a/debian/changelog b/debian/changelog index b8b609d..8ca09a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libdrm (2.4.43-0ubuntu1) raring; urgency=low + + * Sync from unreleased debian git. + + -- Maarten Lankhorst Wed, 27 Mar 2013 11:16:57 +0100 + libdrm (2.4.43-1) UNRELEASED; urgency=low [ Julien Cristau ] commit 2f54887cd7a0fcb6f8f913c9e828e842960d4e5d Author: Maarten Lankhorst Date: Wed Mar 27 11:08:01 2013 +0100 bump changelogs diff --git a/ChangeLog b/ChangeLog index 275a4de..4f07fdb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,212 @@ +commit c005f043dcb4df5ed8a36b9f4b70fcf9e92d52a5 +Author: Maarten Lankhorst +Date: Wed Mar 27 10:42:20 2013 +0100 + +configure.ac: bump version to 2.4.43 for release + +Signed-off-by: Maarten Lankhorst + +commit 93d12593e5f1b251a09b112d7beaf5cfca026896 +Author: Ville Syrjälä +Date: Mon Feb 18 20:50:01 2013 +0200 + +intel_chipset: Fix up VLV confusion + +Signed-off-by: Ville Syrjälä + +commit 6e55fd7dee48dabcd46939df1aa8729eba426298 +Author: Ville Syrjälä +Date: Mon Feb 18 20:22:21 2013 +0200 + +intel_chipset: Use parens around macro arguments + +Protect the macro argument evaluations with parens. + +This is already touching most lines, so while at it, fix up all white +space to uniform style throughout the file. + +Signed-off-by: Ville Syrjälä + +commit f92d7969bf6ba636d193423cf2388956badde3ff +Author: Marcin Slusarz +Date: Sun Mar 3 22:34:38 2013 +0100 + +nouveau: add a way to override single pushbuffer memory limits + +Currently single pushbuffer can take up to 80% of VRAM and 80% of GART. +As this value seems to be arbitrary (and user may need to set it differently) +this patch adds support for 2 environment variables: +NOUVEAU_LIBDRM_VRAM_LIMIT_PERCENT (default 80) +NOUVEAU_LIBDRM_GART_LIMIT_PERCENT (default 80) +which will let users override pushbuffer VRAM/GART limits. + +Signed-off-by: Marcin Slusarz + +commit 284421a56921337aaabcec7ad2790034249c7b31 +Author: Marcin Slusarz +Date: Sun Mar 3 22:13:38 2013 +0100 + +nouveau: return error from pushbuf_validate + +Signed-off-by: Marcin Slusarz + +commit 9b0c7f23a261d9bfa857a7e0efd2c5f97d404485 +Author: Benjamin Gaignard +Date: Tue Mar 26 11:11:41 2013 +0100 + +tests: allow tests programs to be installed (cumulative patch) + +fix error in previous patch + +Signed-off-by: Benjamin Gaignard +Signed-off-by: Andreas Boll + +commit 62d8866021f04bc8afc8e63d366c71d11c817bc9 +Author: Benjamin Gaignard +Date: Wed Jan 30 14:34:00 2013 +0100 + +tests: allow tests programs to be installed + +Install test programs is useful in cross compilation case. By default +the behavior is the same and test programs aren't installed in $bindir. +If --enable-install-test-
libdrm: Changes to 'ubuntu'
debian/changelog |6 -- debian/control |1 + 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit a4b7a09e281eebbfe52b44242af4b4fa1e7d1d7e Author: Maarten Lankhorst Date: Thu Mar 14 12:44:44 2013 +0100 Release to raring. diff --git a/debian/changelog b/debian/changelog index d8ea62a..00f22a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -libdrm (2.4.42-0ubuntu2) UNRELEASED; urgency=low +libdrm (2.4.42-0ubuntu2) raring; urgency=low * Re-enable building of manpages, and build-depend on xsltproc + * Add valgrind to build-depends - -- Maarten Lankhorst Fri, 08 Feb 2013 13:22:03 +0100 + -- Maarten Lankhorst Thu, 14 Mar 2013 12:44:09 +0100 libdrm (2.4.42-0ubuntu1) raring; urgency=low commit 647589f568aa5b4991f38c70c5e111608f7f9d1d Author: Maarten Lankhorst Date: Thu Mar 14 12:42:35 2013 +0100 Add valgrind to build-depends. diff --git a/debian/changelog b/debian/changelog index bac4ec0..d8ea62a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ libdrm (2.4.42-1) UNRELEASED; urgency=low [ Maarten Lankhorst ] * New upstream release. * Build-depend on xsltproc and docbook-xsl. + * Add valgrind to build-depends. [ Timo Aaltonen ] * control: Bump policy to 3.9.4, no changes. diff --git a/debian/control b/debian/control index e06f686..4e3f61f 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,7 @@ Build-Depends: libpthread-stubs0-dev, libudev-dev [linux-any], libpciaccess-dev, + valgrind, Standards-Version: 3.9.4 Section: libs Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdrm -- 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/e1ug6cv-0005uy...@vasks.debian.org
libdrm: Changes to 'ubuntu'
debian/changelog |1 +
tests/Makefile.am |2 --
xf86drm.h |2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 9558055d7feb654b34fe45082e33adfe32ae8423
Author: Sven Joachim
Date: Fri Feb 8 18:52:48 2013 +0100
Undo accidental changes to upstream files
Made in commit 2434d92d8d36dac8a94a76ab21f014d562b6deb1.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ea9026e..a3a59bd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,8 +10,6 @@ check_PROGRAMS = \
dristat \
drmstat
-dristat_LDADD = $(CLOCK_LIB)
-
SUBDIRS = modeprint
if HAVE_LIBKMS
diff --git a/xf86drm.h b/xf86drm.h
index ad9653e..5ecb284 100644
--- a/xf86drm.h
+++ b/xf86drm.h
@@ -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)
-#define DRM_DEV_MODE(S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
+#define DRM_DEV_MODE(S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP)
#define DRM_DIR_NAME "/dev/dri"
#define DRM_DEV_NAME "%s/card%d"
commit b3fd78c9285cdc7d4eee01c1ee97f9ffe94622d9
Author: Sven Joachim
Date: Fri Feb 8 19:00:41 2013 +0100
Fix up debian/changelog
Manpages were never disabled in versions uploaded to Debian, and
docbook-xsl build dependency was added in commit
2434d92d8d36dac8a94a76ab21f014d562b6deb1.
diff --git a/debian/changelog b/debian/changelog
index 835fac9..49574f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ libdrm (2.4.42-1) UNRELEASED; urgency=low
[ Maarten Lankhorst ]
* New upstream release.
- * Re-enable building of manpages, and build-depend on xsltproc
+ * Build-depend on xsltproc and docbook-xsl.
[ Timo Aaltonen ]
* control: Bump policy to 3.9.4, no changes.
commit 63bcd055b68839354145c4e09beda855ad05ea36
Author: Sven Joachim
Date: Fri Feb 8 18:52:48 2013 +0100
Undo accidental changes to upstream files
Made in commit 2434d92d8d36dac8a94a76ab21f014d562b6deb1.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ea9026e..a3a59bd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,8 +10,6 @@ check_PROGRAMS = \
dristat \
drmstat
-dristat_LDADD = $(CLOCK_LIB)
-
SUBDIRS = modeprint
if HAVE_LIBKMS
diff --git a/xf86drm.h b/xf86drm.h
index ad9653e..5ecb284 100644
--- a/xf86drm.h
+++ b/xf86drm.h
@@ -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)
-#define DRM_DEV_MODE(S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
+#define DRM_DEV_MODE(S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP)
#define DRM_DIR_NAME "/dev/dri"
#define DRM_DEV_NAME "%s/card%d"
commit 1c2190cb05ebbe7a76905de6a4051387ac2c3904
Author: Maarten Lankhorst
Date: Fri Feb 8 13:30:56 2013 +0100
add docbook-xsl to build-depends too
diff --git a/debian/control b/debian/control
index acfa4f3..d634ed5 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends:
dh-autoreconf,
quilt,
xsltproc,
+ docbook-xsl,
libx11-dev,
pkg-config,
libpthread-stubs0-dev,
commit 2434d92d8d36dac8a94a76ab21f014d562b6deb1
Author: Maarten Lankhorst
Date: Fri Feb 8 13:22:23 2013 +0100
Re-enable building of manpages, and build-depend on xsltproc
diff --git a/debian/changelog b/debian/changelog
index 1982623..835fac9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libdrm (2.4.42-1) UNRELEASED; urgency=low
[ Maarten Lankhorst ]
* New upstream release.
+ * Re-enable building of manpages, and build-depend on xsltproc
[ Timo Aaltonen ]
* control: Bump policy to 3.9.4, no changes.
diff --git a/debian/control b/debian/control
index 8ae824c..acfa4f3 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Build-Depends:
debhelper (>= 9),
dh-autoreconf,
quilt,
+ xsltproc,
libx11-dev,
pkg-config,
libpthread-stubs0-dev,
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a3a59bd..ea9026e 100644
--- 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/xf86drm.h b/xf86drm.h
index 5ecb284..ad9653e 100644
--- a/xf86drm.h
+++ b/xf86drm.h
@@ -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)
-#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"
commit 34041b5572dd4ad7057cc6d801a17f2ac8d02679
Author: Maarten Lankhorst
Date: Fri Feb 8 13:17:35 2013 +0100
add manpages back to libdrm-dev
libdrm: Changes to 'ubuntu'
debian/control |1 + 1 file changed, 1 insertion(+) New commits: commit d46ef1219e862a5b448400d8f14ffea93c101b42 Author: Maarten Lankhorst Date: Fri Feb 8 13:30:56 2013 +0100 add docbook-xsl to build-depends too diff --git a/debian/control b/debian/control index e07dd9b..e06f686 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends: dh-autoreconf, quilt, xsltproc, + docbook-xsl, libx11-dev, pkg-config, libpthread-stubs0-dev, -- 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/e1u3nag-0008nx...@vasks.debian.org
libdrm: Changes to 'ubuntu'
debian/libdrm-dev.install |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 62f232d551ac75ebd3ece203adb659565c5f753c Author: Maarten Lankhorst Date: Fri Feb 8 13:17:35 2013 +0100 add manpages back to libdrm-dev diff --git a/debian/libdrm-dev.install b/debian/libdrm-dev.install index 078a4c3..50b9af9 100644 --- a/debian/libdrm-dev.install +++ b/debian/libdrm-dev.install @@ -2,5 +2,5 @@ usr/include/* usr/lib/*/lib*.a usr/lib/*/lib*.so usr/lib/*/pkgconfig/* -#usr/share/man/man3 -#usr/share/man/man7 +usr/share/man/man3/* +usr/share/man/man7/* -- 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/e1u3mtn-0007ge...@vasks.debian.org
libdrm: Changes to 'ubuntu'
.gitignore |1 ChangeLog| 96 + Makefile.am |4 - configure.ac | 22 ++- debian/changelog | 10 ++- debian/control |2 debian/patches/02_fix_build.diff | 12 debian/patches/series|1 intel/intel_chipset.h|8 ++ man/Makefile.am | 37 nouveau/libdrm_nouveau.pc.in |2 radeon/r600_pci_ids.h| 14 radeon/radeon_surface.c | 112 ++- 13 files changed, 259 insertions(+), 62 deletions(-) New commits: commit b823cf2338e7d64e1cee88f138830b23dbad2540 Author: Timo Aaltonen Date: Thu Feb 7 10:53:28 2013 +0200 release to raring and drop 02_fix_build.diff diff --git a/debian/changelog b/debian/changelog index 1982623..146bdcc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libdrm (2.4.42-0ubuntu1) raring; urgency=low + + * Sync from unreleased debian git. + + -- Timo Aaltonen Thu, 07 Feb 2013 10:52:58 +0200 + libdrm (2.4.42-1) UNRELEASED; urgency=low [ Julien Cristau ] diff --git a/debian/patches/02_fix_build.diff b/debian/patches/02_fix_build.diff deleted file mode 100644 index 234101b..000 --- a/debian/patches/02_fix_build.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 10cc9a4..1776610 100644 a/configure.ac -+++ b/configure.ac -@@ -348,7 +348,6 @@ AC_CONFIG_FILES([ - tests/vbltest/Makefile - include/Makefile - include/drm/Makefile -- man/Makefile - libdrm.pc]) - AC_OUTPUT - diff --git a/debian/patches/series b/debian/patches/series index e64f736..2e425c0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 01_default_perms.diff -02_fix_build.diff 03_build_against_librt.diff commit 98e413f259a029f8cd30d73c346331c6627f0832 Author: Timo Aaltonen Date: Thu Feb 7 10:51:25 2013 +0200 control: Bump policy to 3.9.4, no changes. diff --git a/debian/changelog b/debian/changelog index 180ebf5..1982623 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ libdrm (2.4.42-1) UNRELEASED; urgency=low [ Maarten Lankhorst ] * New upstream release. + [ Timo Aaltonen ] + * control: Bump policy to 3.9.4, no changes. + -- Julien Cristau Tue, 25 Dec 2012 13:17:28 +0100 libdrm (2.4.40-1) experimental; urgency=low diff --git a/debian/control b/debian/control index 12171e7..8ae824c 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: libpthread-stubs0-dev, libudev-dev [linux-any], libpciaccess-dev, -Standards-Version: 3.9.2 +Standards-Version: 3.9.4 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 b133b92d52fe8c5b0becd29c6a5072209526 Author: Timo Aaltonen Date: Thu Feb 7 10:50:54 2013 +0200 drop 02_fix_build.diff, FTBFS with sbuild diff --git a/debian/changelog b/debian/changelog index 11b7635..180ebf5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,6 @@ libdrm (2.4.42-1) UNRELEASED; urgency=low [ Maarten Lankhorst ] * New upstream release. - * Add 02_fix_build.diff fix a build error. -- Julien Cristau Tue, 25 Dec 2012 13:17:28 +0100 diff --git a/debian/patches/02_fix_build.diff b/debian/patches/02_fix_build.diff deleted file mode 100644 index 234101b..000 --- a/debian/patches/02_fix_build.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 10cc9a4..1776610 100644 a/configure.ac -+++ b/configure.ac -@@ -348,7 +348,6 @@ AC_CONFIG_FILES([ - tests/vbltest/Makefile - include/Makefile - include/drm/Makefile -- man/Makefile - libdrm.pc]) - AC_OUTPUT - diff --git a/debian/patches/series b/debian/patches/series index e64f736..2e425c0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 01_default_perms.diff -02_fix_build.diff 03_build_against_librt.diff commit ce6151da5bc5d767adff7f36f5b9f473286d1209 Author: Timo Aaltonen Date: Thu Feb 7 10:39:56 2013 +0200 update the changelogs diff --git a/ChangeLog b/ChangeLog index e1df3ae..275a4de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,99 @@ +commit 183b5f20b59c83f57967b41d1e3a90c073e8df76 +Author: Maarten Lankhorst +Date: Tue Feb 5 14:08:41 2013 +0100 + +configure.ac: bump version to 2.4.42 for release + +Signed-off-by: Maarten Lankhorst + +commit f9a9311c5e96606de9726ae4021209897b9bb2d7 +Author: Maarten Lankhorst +Date: Tue Feb 5 14:12:06 2013 +0100 + +libdrm: remove DISTCHECK_CONFIGURE_FLAGS + +I'm fairly sure the extra flags it specifies no longer exist, so +there is no point in keeping it. It only adds a warning when +running make distcheck. + +Signed-off-by: Maarte
libdrm: Changes to 'ubuntu'
ChangeLog| 68 +++ configure.ac |2 debian/changelog | 25 +-- debian/libdrm-nouveau2.lintian-overrides |1 debian/libdrm-nouveau2.symbols | 15 +++--- debian/libdrm-radeon1.symbols|2 debian/rules |2 intel/intel_bufmgr_gem.c |2 omap/omap_drm.h |3 - radeon/Makefile.am |2 radeon/radeon_bo_gem.c | 48 + radeon/radeon_bo_gem.h |4 + radeon/radeon_surface.c |4 - tests/modetest/modetest.c|1 14 files changed, 153 insertions(+), 26 deletions(-) New commits: commit 7f1aba00aca34402f7449a5a14ece02038f9b270 Author: Timo Aaltonen Date: Mon Sep 3 17:33:26 2012 +0300 release to quantal diff --git a/debian/changelog b/debian/changelog index 11f33a7..8891c7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libdrm (2.4.39-0ubuntu1) quantal; urgency=low + + * Sync from unreleased debian git. + + -- Timo Aaltonen Mon, 03 Sep 2012 17:26:35 +0300 + libdrm (2.4.39-1) UNRELEASED; urgency=low [ Maarten Lankhorst ] commit f1c5b014206e6eac3cf5b9db55f6cf3d12d20475 Author: Sven Joachim Date: Sat Sep 1 18:31:02 2012 +0200 Mark symbols declared in nouveau/private.h as private Those are not part of the public API. diff --git a/debian/changelog b/debian/changelog index 3157335..11f33a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ libdrm (2.4.39-1) UNRELEASED; urgency=low [ Sven Joachim ] * Bump libdrm-radeon1's symbols and shlibs. + * Mark some internal libdrm-nouveau2 symbols as private. -- Christopher James Halse Rogers Tue, 21 Aug 2012 14:05:52 +1000 diff --git a/debian/libdrm-nouveau2.lintian-overrides b/debian/libdrm-nouveau2.lintian-overrides new file mode 100644 index 000..730972c --- /dev/null +++ b/debian/libdrm-nouveau2.lintian-overrides @@ -0,0 +1 @@ +libdrm-nouveau2: symbols-declares-dependency-on-other-package libdrm-nouveau-private diff --git a/debian/libdrm-nouveau2.symbols b/debian/libdrm-nouveau2.symbols index 8fbd8a9..1b5ee4c 100644 --- a/debian/libdrm-nouveau2.symbols +++ b/debian/libdrm-nouveau2.symbols @@ -1,10 +1,11 @@ libdrm_nouveau.so.2 libdrm-nouveau2 #MINVER# - abi16_bo_info@Base 2.4.34 - abi16_bo_init@Base 2.4.34 - abi16_chan_nv04@Base 2.4.34 - abi16_chan_nvc0@Base 2.4.34 - abi16_engobj@Base 2.4.34 - abi16_ntfy@Base 2.4.34 +| 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_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 @@ -24,7 +25,7 @@ libdrm_nouveau.so.2 libdrm-nouveau2 #MINVER# nouveau_debug@Base 2.4.34 nouveau_device_del@Base 2.4.34 nouveau_device_open@Base 2.4.34 - nouveau_device_open_existing@Base 2.4.34 + nouveau_device_open_existing@Base 0 1 nouveau_device_wrap@Base 2.4.34 nouveau_getparam@Base 2.4.34 nouveau_object_del@Base 2.4.34 commit 1f1e50dc6ce624c39a1f2c08c93acfb0eca4bca1 Author: Sven Joachim Date: Sat Sep 1 18:07:06 2012 +0200 Bump libdrm-radeon1's symbols and shlibs As per commit 3163cfe4db925429760407e77140e2d595338bc2. diff --git a/debian/changelog b/debian/changelog index c95d22e..3157335 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,7 +16,10 @@ libdrm (2.4.39-1) UNRELEASED; urgency=low [ Christopher James Halse Rogers ] * Add libdrm2-udeb; Xserver 1.13 wants libdrm for hotplug config, so will be needed for the 1.13 xserver-xorg-core-udeb. - + + [ Sven Joachim ] + * Bump libdrm-radeon1's symbols and shlibs. + -- Christopher James Halse Rogers Tue, 21 Aug 2012 14:05:52 +1000 libdrm (2.4.33-3) unstable; urgency=low diff --git a/debian/libdrm-radeon1.symbols b/debian/libdrm-radeon1.symbols index 557be89..e9578a6 100644 --- a/debian/libdrm-radeon1.symbols +++ b/debian/libdrm-radeon1.symbols @@ -52,9 +52,11 @@ libdrm_radeon.so.1 libdrm-radeon1 #MINVER# radeon_cs_space_reset_bos@Base 2.4.17 radeon_cs_space_set_flush@Base 2.4.17 radeon_cs_write_reloc@Base 2.4.17 + radeon_gem_bo_open_prime@Base 2.4.39 radeon_gem_get_kernel_name@Base 2.4.17 radeon_gem_get_reloc_in_cs@Base 2.4.20 radeon_gem_name_bo@Base 2.4.17 + radeon_gem_prime_share_bo@Base 2.4.39 radeon_gem_set_domain@Base 2.4.17 radeon_surface_best@Base 2.4.31 radeon_surface_init@Base 2.4.31 diff --git a/debian/rules b/debian/rules index 95e94d6..2a2708f 100755 --- a/debian/rules +++ b/debian/rules @@ -104,7 +104,7 @@ 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 (>
libdrm: Changes to 'ubuntu'
debian/changelog|7 +++
debian/control | 10 ++
debian/libdrm2-udeb.install |1 +
debian/rules|2 +-
4 files changed, 19 insertions(+), 1 deletion(-)
New commits:
commit 53a27a9f8e553e93c201be87959a5fba04299a1e
Author: Christopher James Halse Rogers
Date: Tue Aug 21 14:13:39 2012 +1000
Add a libdrm2-udeb for Xserver 1.13
diff --git a/debian/changelog b/debian/changelog
index 06f0613..1bb6798 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdrm (2.4.38-0ubuntu2) quantal; urgency=low
+
+ * Add libdrm2-udeb; Xserver 1.13 wants libdrm for hotplug config, so
+will be needed for the 1.13 xserver-xorg-core-udeb.
+
+ -- Christopher James Halse Rogers Tue, 21 Aug 2012
14:15:30 +1000
+
libdrm (2.4.38-0ubuntu1) quantal; urgency=low
* Sync from unreleased debian git branch.
diff --git a/debian/control b/debian/control
index fef4a23..75c1a07 100644
--- a/debian/control
+++ b/debian/control
@@ -57,6 +57,16 @@ Description: Userspace interface to kernel DRM services --
runtime
.
This package provides the runtime environment for libdrm.
+Package: libdrm2-udeb
+XC-Package-Type: udeb
+Section: debian-installer
+Architecture: any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Description: Userspace interface to kernel DRM services -- runtime
+ This is a udeb, or a microdeb, for the debian-installer.
+
Package: libdrm2-dbg
Section: debug
Priority: extra
diff --git a/debian/libdrm2-udeb.install b/debian/libdrm2-udeb.install
new file mode 100644
index 000..6e2fd9b
--- /dev/null
+++ b/debian/libdrm2-udeb.install
@@ -0,0 +1 @@
+usr/lib/*/libdrm.so.2*
diff --git a/debian/rules b/debian/rules
index bcda3a7..95e94d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -95,7 +95,7 @@ endif
dh_strip -s --remaining-packages
override_dh_makeshlibs:
- dh_makeshlibs -plibdrm2 -V'libdrm2 (>= 2.4.31)' -- -c4
+ dh_makeshlibs -plibdrm2 -V'libdrm2 (>= 2.4.31)' --add-udeb=libdrm2-udeb
-- -c4
ifeq ($(INTEL), yes)
dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (>= 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/e1t3hma-0007ru...@vasks.debian.org
libdrm: Changes to 'ubuntu'
debian/changelog |1 + debian/rules |2 +- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 5f06d43a684f6ca69124bade4233b7df905cecc1 Author: Timo Aaltonen Date: Mon Aug 13 12:34:10 2012 +0300 Hardcode the version for libdrm-omap1's shlibs. diff --git a/debian/changelog b/debian/changelog index f4f1367..c1fbd3a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ libdrm (2.4.38-1) UNRELEASED; urgency=low [ Timo Aaltonen ] * Bump libdrm-intel1's and libdrm-nouveau2's shlibs due to new symbols. + * Hardcode the version for libdrm-omap1's shlibs. -- Maarten Lankhorst Tue, 03 Jul 2012 10:34:04 +0200 diff --git a/debian/rules b/debian/rules index ca97948..bcda3a7 100755 --- a/debian/rules +++ b/debian/rules @@ -107,7 +107,7 @@ 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 + dh_makeshlibs -plibdrm-omap1 -V'libdrm-omap1 (>= 2.4.38)' -- -c4 endif ifeq ($(LIBKMS), yes) dh_makeshlibs -plibkms1 -V'libkms1' -- -c4 -- 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/e1t0r3c-0002jv...@vasks.debian.org
libdrm: Changes to 'ubuntu'
ChangeLog | 397 +++ configure.ac |6 debian/changelog | 14 debian/libdrm-intel1.symbols |3 debian/libdrm-nouveau2.symbols |2 debian/libdrm-omap1.symbols|3 debian/libdrm2.symbols |2 debian/rules |4 exynos/exynos_drm.h|4 include/drm/drm.h | 12 include/drm/i915_drm.h | 33 + intel/Makefile.am |2 intel/intel_bufmgr.h |7 intel/intel_bufmgr_gem.c | 97 +++ intel/intel_chipset.h | 68 ++ intel/test_decode.c|2 nouveau/nouveau.c | 35 + nouveau/nouveau.h |3 omap/omap_drm.c| 176 ++- omap/omap_drmif.h |3 radeon/r600_pci_ids.h |6 radeon/radeon_surface.c| 93 ++- tests/modetest/Makefile.am |3 tests/modetest/buffers.c | 1021 + tests/modetest/buffers.h | 45 + tests/modetest/modetest.c | 445 +++-- xf86drm.c | 31 + xf86drm.h |3 28 files changed, 2088 insertions(+), 432 deletions(-) New commits: commit 5c0a95a6291848f30112181e8100443e9e01db11 Author: Timo Aaltonen Date: Mon Aug 13 12:28:34 2012 +0300 Bump libdrm-intel1's and libdrm-nouveau2's shlibs due to new symbols. diff --git a/debian/changelog b/debian/changelog index b0ef02f..f4f1367 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ libdrm (2.4.38-1) UNRELEASED; urgency=low - This is done to allow building upstream unmodified, while retaining compatibility with mesa stable + [ Timo Aaltonen ] + * Bump libdrm-intel1's and libdrm-nouveau2's shlibs due to new symbols. + -- Maarten Lankhorst Tue, 03 Jul 2012 10:34:04 +0200 libdrm (2.4.33-3) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 24d7986..ca97948 100755 --- a/debian/rules +++ b/debian/rules @@ -97,11 +97,11 @@ 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.32)' -- -c4 + dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (>= 2.4.38)' -- -c4 endif ifeq ($(NOUVEAU), yes) dh_makeshlibs -plibdrm-nouveau1a -V'libdrm-nouveau1a (>= 2.4.23)' -- -c4 - dh_makeshlibs -plibdrm-nouveau2 -V'libdrm-nouveau2 (>= 2.4.34)' -- -c4 + dh_makeshlibs -plibdrm-nouveau2 -V'libdrm-nouveau2 (>= 2.4.38)' -- -c4 endif ifeq ($(RADEON), yes) dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (>= 2.4.31)' -- -c4 commit eb434cca791bec5bd5fb3fc4232f7dd7fe4ff6db Author: Timo Aaltonen Date: Mon Aug 13 12:07:56 2012 +0300 update the changelog for upload diff --git a/debian/changelog b/debian/changelog index b0ef02f..40c1fce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libdrm (2.4.38-0ubuntu1) quantal; urgency=low + + * Sync from unreleased debian git branch. + + -- Timo Aaltonen Mon, 13 Aug 2012 12:07:10 +0300 + libdrm (2.4.38-1) UNRELEASED; urgency=low [ Maarten Lankhorst ] commit 0061694cb071e8a9a476a0f02c1c2563137bc543 Author: Maarten Lankhorst Date: Mon Aug 13 10:52:29 2012 +0200 Add new symbols for 2.4.38 diff --git a/debian/libdrm-intel1.symbols b/debian/libdrm-intel1.symbols index 21887ca..8f5b9fe 100644 --- a/debian/libdrm-intel1.symbols +++ b/debian/libdrm-intel1.symbols @@ -11,6 +11,8 @@ libdrm_intel.so.1 libdrm-intel1 #MINVER# drm_intel_bo_fake_disable_backing_store@Base 2.4.1 drm_intel_bo_flink@Base 2.4.1 drm_intel_bo_gem_create_from_name@Base 2.4.1 + drm_intel_bo_gem_create_from_prime@Base 2.4.38 + drm_intel_bo_gem_export_to_prime@Base 2.4.38 drm_intel_bo_get_subdata@Base 2.4.1 drm_intel_bo_get_tiling@Base 2.4.1 drm_intel_bo_is_reusable@Base 2.4.21 @@ -62,6 +64,7 @@ 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_pipe_from_crtc_id@Base 2.4.11 + 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 diff --git a/debian/libdrm-nouveau2.symbols b/debian/libdrm-nouveau2.symbols index 4433983..8fbd8a9 100644 --- a/debian/libdrm-nouveau2.symbols +++ b/debian/libdrm-nouveau2.symbols @@ -9,7 +9,9 @@ libdrm_nouveau.so.2 libdrm-nouveau2 #MINVER# nouveau_bo_name_get@Base 2.4.34 nouveau_bo_name_ref@Base 2.4.34 nouveau_bo_new@Base 2.4.34 + nouveau_bo_prime_handle_ref@Base 2.4.38 nouveau_bo_ref@Base 2.4.34 + nouveau_bo_set_prime@Base 2.4.38 nouveau_bo_wait@Base 2.4.34 nouveau_bo_wrap@Base 2.4.34 nouveau_bufctx_del@Base 2.4.34 diff --git a/debian/libdrm-omap1.symbols b/debian/libdrm-omap1.symbols index c15e79c..0c12475 100644 --- a/debian/libdrm-omap1.symbols +++ b/debian/libdrm-omap1.symbols @@ -3,14 +3
libdrm: Changes to 'ubuntu'
debian/changelog | 552 --- debian/control |2 2 files changed, 10 insertions(+), 544 deletions(-) New commits: commit 77e7af73305e57eaabfd695b79ffcb5392c9591f Author: Christopher James Halse Rogers Date: Wed Jul 11 22:36:48 2012 +1000 Release to Quantal diff --git a/debian/changelog b/debian/changelog index f8b5432..0167942 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -libdrm (2.4.37-1) UNRELEASED; urgency=low +libdrm (2.4.37-0ubuntu1) quantal; urgency=low - [ Maarten Lankhorst ] + * Pre-sync from Debian experimental branch * New upstream release. * Modify libdrm-2.4.37-nouveau-1.patch from fedora 17 - Allows building libdrm_nouveau.so.1 and 2 simultaneously diff --git a/debian/control b/debian/control index 21ce5bf..fef4a23 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,7 @@ Source: libdrm Priority: optional -Maintainer: Debian X Strike Force +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian X Strike Force Uploaders: Cyril Brulebois Build-Depends: debhelper (>= 9), -- 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/e1srjb7-0004u2...@vasks.debian.org
libdrm: Changes to 'ubuntu'
debian/control |6 +++---
debian/rules |9 ++---
2 files changed, 9 insertions(+), 6 deletions(-)
New commits:
commit c44dd5f11702cfc07f828d7f4716dc9cb7d257d0
Author: Maarten Lankhorst
Date: Wed Jul 18 12:40:40 2012 +0200
Nuke libdrm-intel1 on arm
No longer needed since plymouth update
diff --git a/debian/control b/debian/control
index 3c51513..93d8454 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Section: libdevel
Architecture: any
Depends:
libdrm2 (= ${binary:Version}),
- libdrm-intel1 (= ${binary:Version}) [linux-any kfreebsd-any],
+ libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
libdrm-radeon1 (= ${binary:Version}) [linux-any],
libdrm-nouveau1a (= ${binary:Version}) [linux-any],
libdrm-nouveau2 (= ${binary:Version}) [linux-any],
@@ -76,7 +76,7 @@ Description: Userspace interface to kernel DRM services --
debugging symbols
Package: libdrm-intel1
Section: libs
-Architecture: linux-any kfreebsd-any
+Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
Depends:
${shlibs:Depends},
${misc:Depends},
@@ -91,7 +91,7 @@ Description: Userspace interface to intel-specific kernel DRM
services -- runtim
Package: libdrm-intel1-dbg
Section: debug
Priority: extra
-Architecture: linux-any kfreebsd-any
+Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
Depends:
libdrm-intel1 (= ${binary:Version}),
${misc:Depends},
diff --git a/debian/rules b/debian/rules
index 648e64f..24d7986 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,9 +18,6 @@ ifeq (linux, $(DEB_HOST_ARCH_OS))
NOUVEAU = yes
confflags += --enable-radeon
RADEON = yes
-# Plymouth wants libdrm-intel1, even on architectures where it's guaranteed
-# to be useless. Satisfy it's depraved yearnings.
- INTEL = yes
else
confflags += --disable-udev
confflags += --disable-libkms
@@ -32,6 +29,12 @@ else
RADEON = no
endif
+# Intel is only 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
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/e1srrgg-0004gw...@vasks.debian.org
libdrm: Changes to 'ubuntu'
debian/libdrm-omap1.symbols |1 + 1 file changed, 1 insertion(+) New commits: commit dfd2321060f7e78753003ae8238f825a572d9d8e Author: Maarten Lankhorst Date: Thu Jul 12 13:13:01 2012 +0200 add missing symbol for omap1 to fix arm build diff --git a/debian/libdrm-omap1.symbols b/debian/libdrm-omap1.symbols index 5ad0f17..c15e79c 100644 --- a/debian/libdrm-omap1.symbols +++ b/debian/libdrm-omap1.symbols @@ -2,6 +2,7 @@ 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_dmabuf@Base 2.4.34 omap_bo_from_name@Base 2.4.33 omap_bo_get_name@Base 2.4.33 omap_bo_handle@Base 2.4.33 -- 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/e1sqh6v-0007im...@vasks.debian.org
libdrm: Changes to 'ubuntu'
Rebased ref, commits from common ancestor: -- 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/e1sou06-0006fq...@vasks.debian.org
libdrm: Changes to 'ubuntu'
debian/changelog |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 85d24d47f35fbdf458b808836c7f6141b45b0f47 Author: Timo Aaltonen Date: Thu Mar 22 19:59:50 2012 +0200 release to precise diff --git a/debian/changelog b/debian/changelog index f8127bd..a234412 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -libdrm (2.4.32-1ubuntu1) UNRELEASED; urgency=low +libdrm (2.4.32-1ubuntu1) precise; urgency=low + [ Robert Hooker ] * Merge from Debian unstable, remaining changes: - debian/rules - debian/control: @@ -10,7 +11,7 @@ libdrm (2.4.32-1ubuntu1) UNRELEASED; urgency=low + Add patch series to reenable building libdrm-intel1 on !i386/amd64, (drop when plymouth is updated to 0.8.4.) - -- Robert Hooker Thu, 22 Mar 2012 13:10:48 -0400 + -- Timo Aaltonen Thu, 22 Mar 2012 19:59:34 +0200 libdrm (2.4.32-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/e1samqo-0001h0...@vasks.debian.org
libdrm: Changes to 'ubuntu'
ChangeLog| 557 +++
configure.ac | 22
debian/changelog | 25
debian/libdrm-intel1.symbols |4
debian/libdrm-radeon1.symbols|4
debian/libdrm2.symbols |1
debian/patches/100-revert-intel-fix-build-of-intel-drm.patch | 28
debian/patches/101-revert-dont-build-intel-drm.patch | 30
debian/patches/series|4
debian/rules |6
include/drm/drm_fourcc.h |6
include/drm/i915_drm.h | 37
include/drm/radeon_drm.h | 24
intel/Makefile.am|3
intel/intel_aub.h| 123
intel/intel_bufmgr.h | 19
intel/intel_bufmgr_gem.c | 532 +++
intel/intel_decode.c | 1708 ++-
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|binary
intel/tests/gen7-3d.batch-ref.txt| 1504 +
radeon/Makefile.am |5
radeon/r600_pci_ids.h| 271 +
radeon/radeon_cs_space.c | 15
radeon/radeon_surface.c | 1007 ++
radeon/radeon_surface.h | 114
xf86drmMode.c| 21
xf86drmMode.h|6
30 files changed, 3949 insertions(+), 2142 deletions(-)
New commits:
commit 05fa7aab66a25009b754b6a93def5aff582e6d18
Author: Robert Hooker
Date: Thu Mar 22 13:18:48 2012 -0400
Add patch series allowing libdrm-intel1 to build on powerpc/armel until
plymouth is updated.
diff --git a/debian/changelog b/debian/changelog
index b84d11c..f8127bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-libdrm (2.4.32-1ubuntu1) precise; urgency=low
+libdrm (2.4.32-1ubuntu1) UNRELEASED; urgency=low
* Merge from Debian unstable, remaining changes:
- debian/rules
- debian/control:
+ Build libdrm-intel1 everywhere rather than just {i386,amd64}
for Plymouth
+- 100-revert-intel-fix-build-of-intel-drm.patch
+ 101-revert-dont-build-intel-drm.patch
+ + Add patch series to reenable building libdrm-intel1 on !i386/amd64,
+(drop when plymouth is updated to 0.8.4.)
-- Robert Hooker Thu, 22 Mar 2012 13:10:48 -0400
diff --git a/debian/patches/100-revert-intel-fix-build-of-intel-drm.patch
b/debian/patches/100-revert-intel-fix-build-of-intel-drm.patch
new file mode 100644
index 000..fb99a1f
--- /dev/null
+++ b/debian/patches/100-revert-intel-fix-build-of-intel-drm.patch
@@ -0,0 +1,28 @@
+From eeaba3a4430f711e3dfddb9210ade1038854f13d Mon Sep 17 00:00:00 2001
+From: Robert Hooker
+Date: Thu, 22 Mar 2012 13:09:59 -0400
+Subject: [PATCH 1/2] Revert "intel: Fix build of Intel DRM on x86 systems"
+
+This reverts commit 82c6938d232327233caac743a07639ac91bceb7e.
+---
+ configure.ac |4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ff2c840..38aae0d 100644
+--- a/configure.ac
b/configure.ac
+@@ -246,8 +246,8 @@ if test "x$INTEL" != "xno" -o "x$RADEON" != "xno"; then
+
+ else
+if test "x$INTEL" != "xno"; then
+- case $host_cpu in
+- i?86|x86_64) INTEL=yes ;;
++ case $host_os in
++ i?86-*|x86_64-*) INTEL=yes ;;
+*) INTEL=no ;;
+esac
+fi
+--
+1.7.9.1
+
diff --git a/debian/patches/101-revert-dont-build-intel-drm.patch
b/debian/patches/101-revert-dont-build-intel-drm.patch
new file mode 100644
index 000..d413194
--- /dev/null
+++ b/debian/patches/101-revert-dont-build-intel-drm.patch
@@ -0,0 +1,30 @@
+From 1e13e415ca07b27d0ab064ff1ed8b4dd022d2065 Mon Sep 17 00:00:00 2001
+From: Robert Hooker
+Date: Thu, 22 Mar 2012 13:10:03 -0400
+Subject: [PATCH 2/2] Revert "Don't build Intel DRM if $CHOST is not i?86-* or
+ x86_64-*"
+
+This reverts commit efd6e81e2ba112105457887ae18a58dfa4bbc8ef.
+---
+ configure.ac |5 +
+ 1 files changed, 1 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 38aae0d..f7
libdrm: Changes to 'ubuntu'
ChangeLog | 273 ++
configure.ac |4
debian/README.source |6
debian/changelog | 18
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, 8575 insertions(+), 52 deletions(-)
New commits:
commit 389cc25e58ebf6d7ea0ae4e5c07b4146ec91726f
Author: Robert Hooker
Date: Fri Jan 6 17:01:25 2012 -0500
Bump changelog.
diff --git a/debian/changelog b/debian/changelog
index c75cb65..75990a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libdrm (2.4.30-1ubuntu1) precise; urgency=low
+
+ * Merge from Debian unstable, remaining changes:
+- debian/rules
+- debian/control:
+ + Build libdrm-intel1 everywhere rather than just {i386,amd64}
+for Plymouth
+
+ -- Robert Hooker Fri, 06 Jan 2012 17:00:29 -0500
+
libdrm (2.4.30-1) unstable; urgency=low
* New upstream release.
commit e91400b4219caf5d63a59e40c4585308ed30326c
Author: Cyril Brulebois
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 Fri, 06 Jan 2012 19:47:07 +0100
+ -- Cyril Brulebois Fri, 06 Jan 2012 20:04:37 +0100
libdrm (2.4.29-1) unstable; urgency=low
commit f40e3394471d158b4af5780e258813b3d2ed8764
Author: Cyril Brulebois
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 Fri, 06 Jan 2012 19:47:07 +0100
commit 9ce84e5c243f6403f0d39e2e5cf13c8ced51b471
Author: Cyril Brulebois
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 Brulebo
libdrm: Changes to 'ubuntu'
ChangeLog| 136 ++
configure.ac |3
debian/changelog | 24 ++
debian/libdrm-intel1.symbols |1
debian/rules |2
intel/intel_bufmgr.h |2
intel/intel_bufmgr_gem.c | 141 +--
nouveau/nouveau_grobj.c |3
tests/Makefile.am|4 +
tests/radeon/Makefile.am | 14 +++
tests/radeon/list.h | 137 ++
tests/radeon/radeon_ttm.c| 75 ++
tests/radeon/rbo.c | 171 +++
tests/radeon/rbo.h | 50
xf86drm.c|8 +-
15 files changed, 758 insertions(+), 13 deletions(-)
New commits:
commit 9aa066b3b3dcc3f202db15d9779be23ed321101f
Author: Robert Hooker
Date: Mon Dec 19 21:41:17 2011 -0500
Bump changelog.
diff --git a/debian/changelog b/debian/changelog
index d5afc3c..5b14171 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libdrm (2.4.29-1ubuntu1) precise; urgency=low
+
+ * Merge from Debian unstable, remaining changes:
+- debian/rules
+- debian/control:
+ + Build libdrm-intel1 everywhere rather than just {i386,amd64}
+for Plymouth
+
+ -- Robert Hooker Mon, 19 Dec 2011 21:33:42 -0500
+
libdrm (2.4.29-1) unstable; urgency=low
* New upstream release:
commit 26cdd1d4dc6e19ae317c977490835b854f94f874
Author: Cyril Brulebois
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 Tue, 13 Dec 2011 13:06:03 +0100
+ -- Cyril Brulebois Tue, 13 Dec 2011 13:16:22 +0100
libdrm (2.4.28-1) unstable; urgency=low
commit 60911644f90be10e4f92b6f7c641c8ee31bfdf5f
Author: Cyril Brulebois
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 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
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
+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
+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
+
+commit c5f0ed1d296f11367febd0e1b7dce8789308bf35
+Author: Chris Wilson
+Date: Tue Dec 13 10:30:54 2011 +
+
+intel: Update map-count for an early error return during mapping
+
+Signed-off-by: Chris Wilson
+
+commit dd9a5b4f7fb07c78db4e7481bedca1b981030e3f
+Author: Chris Wilson
+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
libdrm: Changes to 'ubuntu'
ChangeLog| 271 +++
configure.ac |2
debian/changelog | 19 +++
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, 517 insertions(+), 86 deletions(-)
New commits:
commit a7e4604cb5ac0a306303bc23ec3a8656f12330af
Author: Robert Hooker
Date: Tue Nov 8 11:36:08 2011 -0500
Bump changelog.
diff --git a/debian/changelog b/debian/changelog
index 257cb36..7f24a51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libdrm (2.4.27-1ubuntu1) precise; urgency=low
+
+ * Merge from Debian unstable, remaining changes:
+- debian/rules
+- debian/control:
+ + Build libdrm-intel1 everywhere rather than just {i386,amd64}
+for Plymouth
+
+ -- Robert Hooker Tue, 08 Nov 2011 11:33:07 -0500
+
libdrm (2.4.27-1) unstable; urgency=low
* New upstream release:
commit 8141c4828219490f43317e92796999f77c916c46
Author: Cyril Brulebois
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 Tue, 01 Nov 2011 19:16:18 +0100
+ -- Cyril Brulebois Tue, 01 Nov 2011 19:30:54 +0100
libdrm (2.4.26-1) unstable; urgency=low
commit 3020c976670166b5e2ae9bf24a05a01143429aef
Author: Cyril Brulebois
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 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
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
+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
+
+commit d0ae6837d117881d9f1f9cc12d3f1012b6a46103
+Author: Eric Anholt
+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
+Reviewed-by: Chris Wilson
+
+commit 4cb01eeccfa6a5169edea07c339117cac1f7b261
+Author: Eric Anholt
+Date: Fri Oct 28 13:12:16 2011 -0700
+
+in
libdrm: Changes to 'ubuntu'
ChangeLog | 30 +++
configure.ac|6 +++
debian/changelog| 33 +
debian/compat |2 -
debian/control | 17 ++
debian/libdrm-dev.links.in |5 ---
debian/libdrm-intel1.install|1
debian/libdrm-intel1.install.in |1
debian/libdrm-intel1.symbols|1
debian/libdrm-nouveau1a.install |1
debian/libdrm-nouveau1a.install.in |1
debian/libdrm-radeon1.install |1
debian/libdrm-radeon1.install.in|1
debian/libdrm-radeon1.lintian-overrides |1
debian/libdrm2.install |1
debian/libdrm2.install.in |1
debian/libkms1.install |1
debian/libkms1.install.in |1
debian/libkms1.lintian-overrides|1
debian/rules| 31 +--
intel/Makefile.am |3 +
intel/intel_bufmgr.c| 50
intel/intel_bufmgr.h|2 +
libkms/dumb.c |3 +
24 files changed, 145 insertions(+), 50 deletions(-)
New commits:
commit b67d5cb536bc4e6bc5e15c6d2c3fa60e6b1f2b21
Author: Timo Aaltonen
Date: Sat Jul 2 01:00:39 2011 +0300
Update the changelog.
diff --git a/debian/changelog b/debian/changelog
index 8ea08b6..2ba633c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libdrm (2.4.26-1ubuntu1) oneiric; urgency=low
+
+ * Merge from Debian unstable, remaining changes:
+- debian/rules
+- debian/control:
+ + Build libdrm-intel everywhere rather than just {i386,amd64}
+for Plymouth
+
+ -- Timo Aaltonen Sat, 02 Jul 2011 01:00:31 +0300
+
libdrm (2.4.26-1) unstable; urgency=low
* New upstream release:
commit 19803bf92b66e116fe50ab443d269dbbfd9681f4
Author: Timo Aaltonen
Date: Sat Jul 2 00:42:10 2011 +0300
clean up old multiarch cruft
diff --git a/debian/libdrm-dev.links.in b/debian/libdrm-dev.links.in
deleted file mode 100644
index f3b4f97..000
--- a/debian/libdrm-dev.links.in
+++ /dev/null
@@ -1,5 +0,0 @@
-/lib/${DEB_HOST_MULTIARCH}/libdrm.so.2 /usr/lib/${DEB_HOST_MULTIARCH}/libdrm.so
-/lib/${DEB_HOST_MULTIARCH}/libdrm_intel.so.1
/usr/lib/${DEB_HOST_MULTIARCH}/libdrm_intel.so
-/lib/${DEB_HOST_MULTIARCH}/libdrm_nouveau.so.1
/usr/lib/${DEB_HOST_MULTIARCH}/libdrm_nouveau.so
-/lib/${DEB_HOST_MULTIARCH}/libdrm_radeon.so.1
/usr/lib/${DEB_HOST_MULTIARCH}/libdrm_radeon.so
-/lib/${DEB_HOST_MULTIARCH}/libkms.so.1 /usr/lib/${DEB_HOST_MULTIARCH}/libkms.so
diff --git a/debian/libdrm-intel1.install.in b/debian/libdrm-intel1.install.in
deleted file mode 100644
index 00a0524..000
--- a/debian/libdrm-intel1.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/libdrm_intel.so.1* /lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/libdrm-nouveau1a.install.in
b/debian/libdrm-nouveau1a.install.in
deleted file mode 100644
index 289a854..000
--- a/debian/libdrm-nouveau1a.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/libdrm_nouveau.so.1* /lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/libdrm-radeon1.install.in b/debian/libdrm-radeon1.install.in
deleted file mode 100644
index bd5bae4..000
--- a/debian/libdrm-radeon1.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/libdrm_radeon.so.1* /lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/libdrm2.install.in b/debian/libdrm2.install.in
deleted file mode 100644
index 9c3e62d..000
--- a/debian/libdrm2.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/libdrm.so.2* /lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/libkms1.install.in b/debian/libkms1.install.in
deleted file mode 100644
index 60cb59f..000
--- a/debian/libkms1.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/libkms.so.1* /lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/rules b/debian/rules
index b6bebbe..e4efdb9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,19 +8,6 @@
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_ARCH_OS?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- confflags += --build=$(DEB_HOST_GNU_TYPE)
-else
- confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
-endif
-
# Linux vs. the rest:
ifeq
libdrm: Changes to 'ubuntu'
debian/changelog |9 - debian/rules | 10 +++--- 2 files changed, 11 insertions(+), 8 deletions(-) New commits: commit 9a6d637545f073051ef8ae09cfe7c44b7a582757 Author: Christopher James Halse Rogers Date: Thu May 26 12:10:29 2011 +1000 Really build libdrm-intel everywhere. That'll teach me for not having an armel oneiric chroot! diff --git a/debian/changelog b/debian/changelog index 4b9d882..c3169ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdrm (2.4.25-2ubuntu2) oneiric; urgency=low + + * debian/rules: +- Really build libdrm-intel everywhere. Fixes arm/powerpc FTBFS. + + -- Christopher James Halse Rogers Thu, 26 May 2011 12:09:35 +1000 + libdrm (2.4.25-2ubuntu1) oneiric; urgency=low * Merge from Debian unstable. remaining Ubuntu changes: diff --git a/debian/rules b/debian/rules index a54481a..b1260fe 100755 --- a/debian/rules +++ b/debian/rules @@ -31,6 +31,9 @@ ifeq (linux, $(DEB_HOST_ARCH_OS)) NOUVEAU = yes confflags += --enable-radeon RADEON = yes +# Plymouth wants libdrm-intel1, even on architectures where it's guaranteed +# to be useless. Satisfy it's depraved yearnings. + INTEL = yes else confflags += --disable-udev confflags += --disable-libkms @@ -42,13 +45,6 @@ else RADEON = no endif -# Intel is only 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 else commit 417aa96bff7745c09e1fc23931c9e71bf4eca026 Author: Christopher James Halse Rogers Date: Thu May 26 09:42:37 2011 +1000 Upload to oneiric diff --git a/debian/changelog b/debian/changelog index 721894c..4b9d882 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libdrm (2.4.25-2ubuntu1) UNRELEASED; urgency=low +libdrm (2.4.25-2ubuntu1) oneiric; urgency=low * Merge from Debian unstable. remaining Ubuntu changes: - debian/rules -- 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/e1qbc0d-00080u...@vasks.debian.org
libdrm: Changes to 'ubuntu'
configure.ac |5
debian/changelog | 54 +
debian/control |2
debian/libdrm-intel1.symbols |2
debian/libkms1.symbols |1
debian/patches/100_intel_remember_named_bo.patch | 99 -
debian/patches/series|1
debian/rules |2
include/drm/i915_drm.h | 14 +
intel/intel_bufmgr.c |8
intel/intel_bufmgr.h |2
intel/intel_bufmgr_gem.c | 51 +++-
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 +++--
28 files changed, 680 insertions(+), 246 deletions(-)
New commits:
commit 9006cee7b62dce23e57639701fe3a54a910392ea
Author: Christopher James Halse Rogers
Date: Mon Apr 4 11:21:22 2011 +1000
Drop intel cherry-pick present in 2.4.24
diff --git a/debian/changelog b/debian/changelog
index e21923a..2e93104 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ libdrm (2.4.24-1ubuntu1) UNRELEASED; urgency=low
- debian/*.install.in:
- debian/*.links.in:
+ Multiarchify
+ * debian/patches/100_intel_remember_named_bo.patch:
+- Drop this cherry-pick; included in 2.4.24
-- Christopher James Halse Rogers Mon, 04 Apr 2011
11:07:04 +1000
diff --git a/debian/patches/100_intel_remember_named_bo.patch
b/debian/patches/100_intel_remember_named_bo.patch
deleted file mode 100644
index 5c76ce5..000
--- a/debian/patches/100_intel_remember_named_bo.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-commit 36d4939343d8789d9066f7245fa2d4fe69119dd8
-Author: Chris Wilson
-Date: Mon Feb 14 09:39:06 2011 +
-
-intel: Remember named bo
-
-... and if asked to open a bo by the same global name, return a fresh
-reference to the previously allocated buffer.
-
-Signed-off-by: Chris Wilson
-
-diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
-index 092b56a..3cdffce 100644
a/intel/intel_bufmgr_gem.c
-+++ b/intel/intel_bufmgr_gem.c
-@@ -95,6 +95,8 @@ typedef struct _drm_intel_bufmgr_gem {
- int num_buckets;
- time_t time;
-
-+ drmMMListHead named;
-+
- uint64_t gtt_size;
- int available_fences;
- int pci_device;
-@@ -124,6 +126,7 @@ struct _drm_intel_bo_gem {
-* Kenel-assigned global name for this object
-*/
- unsigned int global_name;
-+ drmMMListHead name_list;
-
- /**
-* Index of the buffer within the validation list while preparing a
-@@ -690,6 +693,8 @@ retry:
- drm_intel_gem_bo_free(&bo_gem->bo);
- return NULL;
- }
-+
-+ DRMINITLISTHEAD(&bo_gem->name_list);
- }
-
- bo_gem->name = name;
-@@ -792,6 +797,23 @@ drm_intel_bo_gem_create_from_name(drm_intel_bufmgr
*bufmgr,
- int ret;
- struct drm_gem_open open_arg;
- struct drm_i915_gem_get_tiling get_tiling;
-+ drmMMListHead *list;
-+
-+ /* At the moment most applications only have a few named bo.
-+ * For instance, in a DRI client only the render buffers passed
-+ * between X and the client are named. And since X returns the
-+ * alternating names for the front/back buffer a linear search
-+ * provides a sufficiently fast match.
-+ */
-+ for (list = bufmgr_gem->named.next;
-+ list != &bufmgr_gem->named;
-+ list = list->next) {
-+ bo_gem = DRMLISTENTRY(drm_intel_bo_gem, list, name_list);
-+ if (bo_gem->global_name == handle) {
-+ drm_intel_gem_bo_reference(&bo_gem->bo);
-+ return &bo_gem->bo;
-+ }
-+ }
-
- bo_gem = calloc(1, sizeof(*bo_gem));
- if (!bo_gem)
-@@ -834,6 +856,7 @@ drm_intel_bo_gem_create_from_name(drm_intel_bufmgr *bufmgr,
- /* XXX stride is unknown */
- drm_intel_bo_ge
libdrm: Changes to 'ubuntu'
debian/changelog | 14 ++-
debian/patches/100_intel_remember_named_bo.patch | 99 +++
debian/patches/series|1
3 files changed, 112 insertions(+), 2 deletions(-)
New commits:
commit 75fa93e6f343689d87dcfd2de76f32319e43b058
Author: Bryce Harrington
Date: Fri Apr 1 17:53:49 2011 -0700
Looks like u5 was in the archive but not in git, updating to u6
diff --git a/debian/changelog b/debian/changelog
index 319c05a..6d5d78f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,18 @@
-libdrm (2.4.23-1ubuntu5) UNRELEASED; urgency=low
+libdrm (2.4.23-1ubuntu6) natty; urgency=low
+
+ * Add 100_intel_remember_named_bo.patch: Reuse already requested buffer
+objects if re-requested. Fixes error where dmesg shows "Object
+... appears more than once in object list". Cherrypick from upstream
+libdrm 2.4.24 tree.
+(LP: #747205)
+
+ -- Bryce Harrington Fri, 01 Apr 2011 17:53:28 -0700
+
+libdrm (2.4.23-1ubuntu5) natty; urgency=low
* Fix up libdrm-dev symlinks for multiarch.
- -- Steve Langasek Sat, 19 Mar 2011 20:59:37 -0700
+ -- Bryce Harrington Fri, 01 Apr 2011 11:44:30 -0700
libdrm (2.4.23-1ubuntu4) natty; urgency=low
diff --git a/debian/patches/100_intel_remember_named_bo.patch
b/debian/patches/100_intel_remember_named_bo.patch
new file mode 100644
index 000..5c76ce5
--- /dev/null
+++ b/debian/patches/100_intel_remember_named_bo.patch
@@ -0,0 +1,99 @@
+commit 36d4939343d8789d9066f7245fa2d4fe69119dd8
+Author: Chris Wilson
+Date: Mon Feb 14 09:39:06 2011 +
+
+intel: Remember named bo
+
+... and if asked to open a bo by the same global name, return a fresh
+reference to the previously allocated buffer.
+
+Signed-off-by: Chris Wilson
+
+diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
+index 092b56a..3cdffce 100644
+--- a/intel/intel_bufmgr_gem.c
b/intel/intel_bufmgr_gem.c
+@@ -95,6 +95,8 @@ typedef struct _drm_intel_bufmgr_gem {
+ int num_buckets;
+ time_t time;
+
++ drmMMListHead named;
++
+ uint64_t gtt_size;
+ int available_fences;
+ int pci_device;
+@@ -124,6 +126,7 @@ struct _drm_intel_bo_gem {
+* Kenel-assigned global name for this object
+*/
+ unsigned int global_name;
++ drmMMListHead name_list;
+
+ /**
+* Index of the buffer within the validation list while preparing a
+@@ -690,6 +693,8 @@ retry:
+ drm_intel_gem_bo_free(&bo_gem->bo);
+ return NULL;
+ }
++
++ DRMINITLISTHEAD(&bo_gem->name_list);
+ }
+
+ bo_gem->name = name;
+@@ -792,6 +797,23 @@ drm_intel_bo_gem_create_from_name(drm_intel_bufmgr
*bufmgr,
+ int ret;
+ struct drm_gem_open open_arg;
+ struct drm_i915_gem_get_tiling get_tiling;
++ drmMMListHead *list;
++
++ /* At the moment most applications only have a few named bo.
++ * For instance, in a DRI client only the render buffers passed
++ * between X and the client are named. And since X returns the
++ * alternating names for the front/back buffer a linear search
++ * provides a sufficiently fast match.
++ */
++ for (list = bufmgr_gem->named.next;
++ list != &bufmgr_gem->named;
++ list = list->next) {
++ bo_gem = DRMLISTENTRY(drm_intel_bo_gem, list, name_list);
++ if (bo_gem->global_name == handle) {
++ drm_intel_gem_bo_reference(&bo_gem->bo);
++ return &bo_gem->bo;
++ }
++ }
+
+ bo_gem = calloc(1, sizeof(*bo_gem));
+ if (!bo_gem)
+@@ -834,6 +856,7 @@ drm_intel_bo_gem_create_from_name(drm_intel_bufmgr *bufmgr,
+ /* XXX stride is unknown */
+ drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem);
+
++ DRMLISTADDTAIL(&bo_gem->name_list, &bufmgr_gem->named);
+ DBG("bo_create_from_handle: %d (%s)\n", handle, bo_gem->name);
+
+ return &bo_gem->bo;
+@@ -925,6 +948,8 @@ drm_intel_gem_bo_unreference_final(drm_intel_bo *bo,
time_t time)
+ bo_gem->relocs = NULL;
+ }
+
++ DRMLISTDEL(&bo_gem->name_list);
++
+ bucket = drm_intel_gem_bo_bucket_for_size(bufmgr_gem, bo->size);
+ /* Put the buffer into our internal cache for reuse if we can. */
+ if (bufmgr_gem->bo_reuse && bo_gem->reusable && bucket != NULL &&
+@@ -1771,6 +1796,8 @@ drm_intel_gem_bo_flink(drm_intel_bo *bo, uint32_t * name)
+ return -errno;
+ bo_gem->global_name = flink.name;
+ bo_gem->reusable = 0;
++
++ DRMLISTADDTAIL(&bo_gem->name_list, &bufmgr_gem->named);
+ }
+
+ *name = bo_gem->global_name;
+@@ -2217,6 +2244,7 @@ drm_intel_bufmgr_gem_init(int fd, int batch_size)
+ drm_intel_gem_get_pipe_from_crtc_id;
+ bufmgr_gem->bufmgr.bo_references = drm_intel_gem_bo
libdrm: Changes to 'ubuntu'
debian/changelog |6 ++
debian/libdrm-dev.links|5 -
debian/libdrm-dev.links.in |5 +
debian/rules |5 +++--
4 files changed, 14 insertions(+), 7 deletions(-)
New commits:
commit d67ab9b5773c590cbb877c7404a3ba94e1335ae9
Author: Steve Langasek
Date: Sat Mar 19 21:00:30 2011 -0700
Fix up libdrm-dev symlinks for multiarch.
diff --git a/debian/changelog b/debian/changelog
index 45825fb..319c05a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.23-1ubuntu5) UNRELEASED; urgency=low
+
+ * Fix up libdrm-dev symlinks for multiarch.
+
+ -- Steve Langasek Sat, 19 Mar 2011 20:59:37 -0700
+
libdrm (2.4.23-1ubuntu4) natty; urgency=low
* Build for multiarch.
diff --git a/debian/libdrm-dev.links b/debian/libdrm-dev.links
deleted file mode 100644
index b104b83..000
--- a/debian/libdrm-dev.links
+++ /dev/null
@@ -1,5 +0,0 @@
-/lib/libdrm.so.2 /usr/lib/libdrm.so
-/lib/libdrm_intel.so.1 /usr/lib/libdrm_intel.so
-/lib/libdrm_nouveau.so.1 /usr/lib/libdrm_nouveau.so
-/lib/libdrm_radeon.so.1 /usr/lib/libdrm_radeon.so
-/lib/libkms.so.1 /usr/lib/libkms.so
diff --git a/debian/libdrm-dev.links.in b/debian/libdrm-dev.links.in
new file mode 100644
index 000..f3b4f97
--- /dev/null
+++ b/debian/libdrm-dev.links.in
@@ -0,0 +1,5 @@
+/lib/${DEB_HOST_MULTIARCH}/libdrm.so.2 /usr/lib/${DEB_HOST_MULTIARCH}/libdrm.so
+/lib/${DEB_HOST_MULTIARCH}/libdrm_intel.so.1
/usr/lib/${DEB_HOST_MULTIARCH}/libdrm_intel.so
+/lib/${DEB_HOST_MULTIARCH}/libdrm_nouveau.so.1
/usr/lib/${DEB_HOST_MULTIARCH}/libdrm_nouveau.so
+/lib/${DEB_HOST_MULTIARCH}/libdrm_radeon.so.1
/usr/lib/${DEB_HOST_MULTIARCH}/libdrm_radeon.so
+/lib/${DEB_HOST_MULTIARCH}/libkms.so.1 /usr/lib/${DEB_HOST_MULTIARCH}/libkms.so
diff --git a/debian/rules b/debian/rules
index 80a1435..afa0b6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -103,7 +103,7 @@ clean: xsfclean
rm -f libdrm.pc libdrm/config.h.in
rm -f debian/libdrm-intel1.install debian/libdrm-nouveau1a.install \
debian/libdrm-radeon1.install debian/libdrm2.install \
- debian/libkms1.install
+ debian/libkms1.install debian/libdrm-dev.links
dh_clean
@@ -112,7 +112,8 @@ install: build
dh_testroot
dh_prep
for file in libdrm-intel1.install libdrm-nouveau1a.install \
- libdrm-radeon1.install libdrm2.install libkms1.install; \
+ libdrm-radeon1.install libdrm2.install libkms1.install \
+ libdrm-dev.links; \
do \
sed -e"s,\$${DEB_HOST_MULTIARCH},${DEB_HOST_MULTIARCH},g" \
debian/$${file}.in > debian/$$file; \
--
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/e1q19ss-0001ui...@alioth.debian.org
libdrm: Changes to 'ubuntu'
debian/changelog |6 ++
debian/control | 17 -
debian/libdrm-dev.install |6 +++---
debian/libdrm-intel1.install |1 -
debian/libdrm-intel1.install.in|1 +
debian/libdrm-nouveau1a.install|1 -
debian/libdrm-nouveau1a.install.in |1 +
debian/libdrm-radeon1.install |1 -
debian/libdrm-radeon1.install.in |1 +
debian/libdrm2.install |1 -
debian/libdrm2.install.in |1 +
debian/libkms1.install |1 -
debian/libkms1.install.in |1 +
debian/rules | 11 +++
14 files changed, 41 insertions(+), 9 deletions(-)
New commits:
commit d21b4bac7d3d2fa0c1346665325d2b58919d5dca
Author: Steve Langasek
Date: Sat Mar 19 20:53:09 2011 -0700
releasing version 2.4.23-1ubuntu4
diff --git a/debian/changelog b/debian/changelog
index 5c40f52..45825fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libdrm (2.4.23-1ubuntu4) UNRELEASED; urgency=low
+libdrm (2.4.23-1ubuntu4) natty; urgency=low
* Build for multiarch.
- -- Steve Langasek Sat, 19 Mar 2011 20:43:29 -0700
+ -- Steve Langasek Sat, 19 Mar 2011 20:53:05 -0700
libdrm (2.4.23-1ubuntu3) natty; urgency=low
commit f515ccc61b617c435f7ddb32550c855d155a45f2
Author: Steve Langasek
Date: Sat Mar 19 20:53:01 2011 -0700
the rest of these packages are also now multi-arch: same for free
diff --git a/debian/control b/debian/control
index 859c3c1..e402c2c 100644
--- a/debian/control
+++ b/debian/control
@@ -76,6 +76,8 @@ Package: libdrm-intel1
Section: libs
Architecture: linux-any kfreebsd-any
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 is the
@@ -87,6 +89,7 @@ Section: debug
Priority: extra
Architecture: linux-any kfreebsd-any
Depends: libdrm-intel1 (= ${binary:Version}), ${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
@@ -102,6 +105,8 @@ Depends: ${shlibs:Depends},
${misc:Depends},
Breaks: libdrm-nouveau1
Replaces: libdrm-nouveau1
+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
@@ -116,6 +121,7 @@ Depends: libdrm-nouveau1a (= ${binary:Version}),
${misc:Depends},
Breaks: libdrm-nouveau1-dbg
Replaces: libdrm-nouveau1-dbg
+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
@@ -130,6 +136,8 @@ Architecture: linux-any
Depends:
${shlibs:Depends},
${misc: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
@@ -143,6 +151,7 @@ Architecture: linux-any
Depends:
libdrm-radeon1 (= ${binary:Version}),
${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
commit 42e5e23fbdb2874e32a843631cead7bc2e7420db
Author: Steve Langasek
Date: Sat Mar 19 20:43:44 2011 -0700
Build for multiarch.
diff --git a/debian/changelog b/debian/changelog
index d55cf91..5c40f52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.23-1ubuntu4) UNRELEASED; urgency=low
+
+ * Build for multiarch.
+
+ -- Steve Langasek Sat, 19 Mar 2011 20:43:29 -0700
+
libdrm (2.4.23-1ubuntu3) natty; urgency=low
* Change Conflicts to Breaks/Replaces as per debian policy 7.4
diff --git a/debian/control b/debian/control
index c72ccf0..859c3c1 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Maintainer: Ubuntu X-SWAT
XSBC-Original-Maintainer: Debian X Strike Force
Uploaders: David Nusinow , Brice Goglin
, Cyril Brulebois
Build-Depends:
- debhelper (>= 7.2.7),
+ debhelper (>= 8.1.2ubuntu2),
libx11-dev,
dpkg-dev (>= 1.13.19),
quilt (>= 0.40),
@@ -44,6 +44,8 @@ Architecture:
libdrm: Changes to 'ubuntu'
debian/changelog |7 +++
debian/control |4 +++-
2 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 3b1a1774c954f39cba8ec9e9350dee0772fbe6a4
Author: Robert Hooker
Date: Tue Jan 25 11:36:25 2011 -0500
Bump changelog for release.
diff --git a/debian/changelog b/debian/changelog
index b8290c6..d55cf91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdrm (2.4.23-1ubuntu3) natty; urgency=low
+
+ * Change Conflicts to Breaks/Replaces as per debian policy 7.4
+for libdrm-nouveau1a/libdrm-nouveau1a-dbg
+
+ -- Robert Hooker Tue, 25 Jan 2011 11:35:22 -0500
+
libdrm (2.4.23-1ubuntu2) natty; urgency=low
* Temporarily lower libdrm-nouveau1 Conflicts: to Replaces: libdrm-nouveau1
commit 6ad936ceaa815845f1816ce88fab3aa288c877c8
Author: Robert Hooker
Date: Tue Jan 25 11:32:32 2011 -0500
Change Conflicts: to Breaks:/Replaces: as per Debian policy 7.4
`Breaks' should be used when moving a file from
one package to another (see Section 7.6,
`Overwriting files and replacing packages - `Replaces'')
diff --git a/debian/control b/debian/control
index 824c6b8..c72ccf0 100644
--- a/debian/control
+++ b/debian/control
@@ -97,6 +97,7 @@ Section: libs
Architecture: linux-any
Depends: ${shlibs:Depends},
${misc:Depends},
+Breaks: libdrm-nouveau1
Replaces: libdrm-nouveau1
Description: Userspace interface to nouveau-specific kernel DRM services --
runtime
This library implements the userspace interface to the nouveau-specific kernel
@@ -110,7 +111,8 @@ Priority: extra
Architecture: linux-any
Depends: libdrm-nouveau1a (= ${binary:Version}),
${misc:Depends},
-Conflicts: libdrm-nouveau1-dbg
+Breaks: libdrm-nouveau1-dbg
+Replaces: libdrm-nouveau1-dbg
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
--
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/e1phlsz-00070p...@alioth.debian.org
libdrm: Changes to 'ubuntu'
debian/changelog |7 +++
debian/control |2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 8ce15a0ba33622119281968de5d87fd0fe86155d
Author: Robert Hooker
Date: Tue Jan 25 11:26:33 2011 -0500
Bump changelog for release.
diff --git a/debian/changelog b/debian/changelog
index 5418b2e..b8290c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdrm (2.4.23-1ubuntu2) natty; urgency=low
+
+ * Temporarily lower libdrm-nouveau1 Conflicts: to Replaces: libdrm-nouveau1
+to allow bootstrapping a new plymouth build.
+
+ -- Robert Hooker Tue, 25 Jan 2011 11:03:37 -0500
+
libdrm (2.4.23-1ubuntu1) natty; urgency=low
* Merge from Debian experimental. Remaining Ubuntu changes:
commit 0b8ad86d78b219ae839fee68d24ef9063618d35c
Author: Robert Hooker
Date: Tue Jan 25 11:26:08 2011 -0500
Temporarily change Conflicts: to Replaces: libdrm-nouveau1a to allow a
plymouth rebuild.
diff --git a/debian/control b/debian/control
index 6be949a..824c6b8 100644
--- a/debian/control
+++ b/debian/control
@@ -97,7 +97,7 @@ Section: libs
Architecture: linux-any
Depends: ${shlibs:Depends},
${misc:Depends},
-Conflicts: libdrm-nouveau1
+Replaces: libdrm-nouveau1
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
--
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/e1phljc-0004qs...@alioth.debian.org
libdrm: Changes to 'ubuntu'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 497b5e7b99d65e54f2e4e99d4f3f35626aa340ef Author: Christopher James Halse Rogers Date: Tue Jan 25 14:56:52 2011 +1100 Release to Natty diff --git a/debian/changelog b/debian/changelog index e4ce477..5418b2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libdrm (2.4.23-1ubuntu1) UNRELASED; urgency=low +libdrm (2.4.23-1ubuntu1) natty; urgency=low * Merge from Debian experimental. Remaining Ubuntu changes: - Enable libdrm-intel for ports architectures until plymouth is fixed to -- 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/e1pha2g-00043f...@alioth.debian.org
libdrm: Changes to 'ubuntu'
ChangeLog | 243 ++
configure.ac |2
debian/changelog | 23 ++
debian/control| 13 -
debian/libdrm-nouveau1.install|1
debian/libdrm-nouveau1.lintian-overrides |1
debian/libdrm-nouveau1.symbols| 46 -
debian/libdrm-nouveau1a.install |1
debian/libdrm-nouveau1a.lintian-overrides |1
debian/libdrm-nouveau1a.symbols | 46 +
debian/rules |6
include/drm/nouveau_drm.h |8
intel/intel_bufmgr.c | 14 -
intel/intel_bufmgr.h |6
intel/intel_bufmgr_fake.c | 18 ++
intel/intel_bufmgr_gem.c | 144 -
nouveau/nouveau_bo.c | 12 +
nouveau/nouveau_bo.h |6
nouveau/nouveau_channel.c |5
nouveau/nouveau_channel.h |2
nouveau/nouveau_device.c |5
nouveau/nouveau_drmif.h |1
nouveau/nouveau_grobj.c |2
nouveau/nouveau_notifier.c|2
nouveau/nouveau_private.h |7
nouveau/nouveau_pushbuf.c |8
radeon/radeon_bo_gem.c|2
radeon/radeon_cs_gem.c|2
tests/gem_flink.c |2
tests/gem_mmap.c |2
tests/gem_readwrite.c |4
xf86drm.c | 27 ---
32 files changed, 478 insertions(+), 184 deletions(-)
New commits:
commit 27afd439e485e6ed52290d4114604eca2f28bc58
Author: Julien Cristau
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 Tue, 14 Dec 2010 14:28:11 +0100
+ -- Julien Cristau Thu, 23 Dec 2010 17:56:54 +0100
libdrm (2.4.22-2) experimental; urgency=low
commit 2abd407d29cc6509728e2897e7b50f0d7f9a924e
Author: Sven Joachim
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 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
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-nouveau shlibs and symbols versions to 2.4.23.
-- Sven Joachim Tue, 14 Dec 2010 14:28:11 +0100
diff --git a/debian/libdrm-nouveau1a.symbols b/debian/libdrm-nouveau1a.symbols
index 4da10ea..a2ba922 100644
--- a/debian/libdrm-nouveau1a.symbols
+++ b/debian/libdrm-nouveau1a.symbols
@@ -1,46 +1,46 @@
libdrm_nouveau.so.1 libdrm-nouveau1a #MINVER#
- nouveau_bo_busy@Base 2.4.21-1
- nouveau_bo_emit_buffer@Base 2.4.21-1
- nouveau_bo_handle_get@Base 2.4.21-1
- nouveau_bo_handle_ref@Base 2.4.21-1
- nouveau_bo_init@Base 2.4.21-1
- nouveau_bo_map@Base 2.4.21-1
- nouveau_bo_map_flush@Base 2.4.21-1
- nouveau_bo_map_range@Base 2.4.21-1
- nouveau_
libdrm: Changes to 'ubuntu'
debian/changelog | 14 --
include/drm/i915_drm.h |8 +++-
intel/intel_bufmgr_gem.c | 40 +---
3 files changed, 52 insertions(+), 10 deletions(-)
New commits:
commit 2589d4b9c64fb34dbcd4b0d815806b4fd2731b16
Author: Cyril Brulebois
Date: Sun Nov 7 22:51:31 2010 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 8c05b22..40aaf55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.22-2) UNRELEASED; urgency=low
+libdrm (2.4.22-2) experimental; urgency=low
* Cherry-pick some commits from upstream to make the intel video driver
2.13.901 buildable:
@@ -6,7 +6,7 @@ libdrm (2.4.22-2) UNRELEASED; urgency=low
- 36245771: intel: enable relaxed fence allocation for i915
- 49447a9b: intel: initialize bufmgr.bo_mrb_exec unconditionally
- -- Cyril Brulebois Sun, 07 Nov 2010 22:41:56 +0100
+ -- Cyril Brulebois Sun, 07 Nov 2010 22:51:12 +0100
libdrm (2.4.22-1) experimental; urgency=low
commit bb47f01566c9bb6c73d99b3649cf617366ccd941
Author: Cyril Brulebois
Date: Sun Nov 7 22:47:37 2010 +0100
Document the cherry-pick.
diff --git a/debian/changelog b/debian/changelog
index 3f87190..8c05b22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libdrm (2.4.22-2) UNRELEASED; urgency=low
+
+ * Cherry-pick some commits from upstream to make the intel video driver
+2.13.901 buildable:
+ - 057fab33: intel: Prepare for BLT ring split
+ - 36245771: intel: enable relaxed fence allocation for i915
+ - 49447a9b: intel: initialize bufmgr.bo_mrb_exec unconditionally
+
+ -- Cyril Brulebois Sun, 07 Nov 2010 22:41:56 +0100
+
libdrm (2.4.22-1) experimental; urgency=low
[ Sven Joachim ]
commit afce75cb0902190c35627ecfdc14da2fb545dd3a
Author: Albert Damen
Date: Sun Nov 7 15:54:32 2010 +0100
intel: initialize bufmgr.bo_mrb_exec unconditionally
If bufmgr.bo_mrb_exec is not set, drm_intel_bo_mrb_exec returns ENODEV
even though drm_intel_gem_bo_mrb_exec2 will work fine for the RENDER ring.
Fixes xf86-video-intel after commit 'add BLT ring support' (5bed685f76)
with kernels without BSD or BLT ring support (2.6.34 and before).
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=31443
Signed-off-by: Albert Damen
Signed-off-by: Chris Wilson
(cherry picked from commit 49447a9b957047db2549b8a929e763bbd87808ba)
Signed-off-by: Cyril Brulebois
diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index 56e0183..7aff867 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -2201,8 +2201,7 @@ drm_intel_bufmgr_gem_init(int fd, int batch_size)
/* Use the new one if available */
if (exec2) {
bufmgr_gem->bufmgr.bo_exec = drm_intel_gem_bo_exec2;
- if (bufmgr_gem->has_bsd|bufmgr_gem->has_blt)
- bufmgr_gem->bufmgr.bo_mrb_exec =
drm_intel_gem_bo_mrb_exec2;
+ bufmgr_gem->bufmgr.bo_mrb_exec = drm_intel_gem_bo_mrb_exec2;
} else
bufmgr_gem->bufmgr.bo_exec = drm_intel_gem_bo_exec;
bufmgr_gem->bufmgr.bo_busy = drm_intel_gem_bo_busy;
commit ef3a6654bee1aa76a2b95b0a2c7653230537e00c
Author: Chris Wilson
Date: Fri Oct 29 10:49:54 2010 +0100
intel: enable relaxed fence allocation for i915
The kernel has always allowed userspace to underallocate objects
supplied for fencing. However, the kernel only allocated the object size
for the fence in the GTT and so caused tiling corruption. More recently
the kernel does allocate the full fence region in the GTT for an
under-sized object and so advertises that clients may finally make use
of this feature. The biggest benefit is for texture-heavy GL games on
i945 such as World of Padman which go from needing over 1GiB of RAM to
play to fitting in the GTT!
Signed-off-by: Chris Wilson
(cherry picked from commit 362457715faacd3101929e5f0d8ae250d0ad09df)
Signed-off-by: Cyril Brulebois
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
index bd93061..19da2c0 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -278,6 +278,7 @@ typedef struct drm_i915_irq_wait {
#define I915_PARAM_HAS_EXECBUF2 9
#define I915_PARAM_HAS_BSD 10
#define I915_PARAM_HAS_BLT 11
+#define I915_PARAM_HAS_RELAXED_FENCING 12
typedef struct drm_i915_getparam {
int param;
diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index 161a007..56e0183 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -99,9 +99,10 @@ typedef struct _drm_intel_bufmgr_gem {
int available_fences;
int pci_device;
int gen;
- char has_bsd;
- char has_blt;
- char bo_reuse;
+ unsigned int has_bsd : 1;
+ unsigned int has_blt : 1;
+ unsigned
libdrm: Changes to 'ubuntu'
ChangeLog | 245 +++
configure.ac |2
debian/changelog | 27 ++
debian/compat |2
debian/libdrm-nouveau1.lintian-overrides |1
debian/libdrm-nouveau1.symbols| 90 +++
debian/patches/03_intel_limit_tiled_pitches.patch | 64
debian/patches/series |1
debian/rules |3
include/drm/drm.h |4
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 +
intel/intel_bufmgr.h |6
intel/intel_bufmgr_gem.c | 282 +++---
nouveau/nouveau_device.c | 21 -
tests/modetest/modetest.c | 96 +++
xf86drm.c | 30 +-
xf86drmMode.c | 44 +--
21 files changed, 658 insertions(+), 342 deletions(-)
New commits:
commit 24c39b93e1b84a6640d4114bfd54d7f07ee0ede0
Author: Robert Hooker
Date: Fri Oct 15 21:12:21 2010 -0400
Update debian/changelog.
diff --git a/debian/changelog b/debian/changelog
index 00458e5..72d8c77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libdrm (2.4.22-1ubuntu1) natty; urgency=low
+
+ * Merge from debian experimental. Remaining Ubuntu changes:
+- Enable libdrm-intel for ports architectures until plymouth is fixed to
+ not need it unconditionally.
+- Move runtime libraries to /lib for plymouth.
+
+ -- Robert Hooker Fri, 15 Oct 2010 21:08:44
-0400
+
libdrm (2.4.22-1) experimental; urgency=low
[ Sven Joachim ]
commit 4fd296a8e2be17e23846251a4fc35d458d9ed06b
Author: Robert Hooker
Date: Fri Oct 15 21:08:39 2010 -0400
Drop 03_intel_limit_tiled_pitches.patch (upstream)
diff --git a/debian/patches/03_intel_limit_tiled_pitches.patch
b/debian/patches/03_intel_limit_tiled_pitches.patch
deleted file mode 100644
index 3e81ff0..000
--- a/debian/patches/03_intel_limit_tiled_pitches.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 726210f87d558d558022f35bc8c839e798a19f0c Mon Sep 17 00:00:00 2001
-From: Chris Wilson
-Date: Thu, 24 Jun 2010 10:38:00 +
-Subject: intel: Limit tiled pitches to 8192 on pre-i965.
-
-Fixes:
-
- Bug 28515 - Failed to allocate framebuffer when exceed 2048 width
- https://bugs.freedesktop.org/show_bug.cgi?id=28515
-
-Signed-off-by: Chris Wilson
-diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
-index a1a0806..26dc334 100644
a/intel/intel_bufmgr_gem.c
-+++ b/intel/intel_bufmgr_gem.c
-@@ -254,7 +254,7 @@ drm_intel_gem_bo_tile_size(drm_intel_bufmgr_gem
*bufmgr_gem, unsigned long size,
- */
- static unsigned long
- drm_intel_gem_bo_tile_pitch(drm_intel_bufmgr_gem *bufmgr_gem,
-- unsigned long pitch, uint32_t tiling_mode)
-+ unsigned long pitch, uint32_t *tiling_mode)
- {
- unsigned long tile_width;
- unsigned long i;
-@@ -262,10 +262,10 @@ drm_intel_gem_bo_tile_pitch(drm_intel_bufmgr_gem
*bufmgr_gem,
- /* If untiled, then just align it so that we can do rendering
-* to it with the 3D engine.
-*/
-- if (tiling_mode == I915_TILING_NONE)
-+ if (*tiling_mode == I915_TILING_NONE)
- return ALIGN(pitch, 64);
-
-- if (tiling_mode == I915_TILING_X)
-+ if (*tiling_mode == I915_TILING_X)
- tile_width = 512;
- else
- tile_width = 128;
-@@ -274,6 +274,14 @@ drm_intel_gem_bo_tile_pitch(drm_intel_bufmgr_gem
*bufmgr_gem,
- if (bufmgr_gem->gen >= 4)
- return ROUND_UP_TO(pitch, tile_width);
-
-+ /* The older hardware has a maximum pitch of 8192 with tiled
-+ * surfaces, so fallback to untiled if it's too large.
-+ */
-+ if (pitch > 8192) {
-+ *tiling_mode = I915_TILING_NONE;
-+ return ALIGN(pitch, 64);
-+ }
-+
- /* Pre-965 needs power of two tile width */
- for (i = tile_width; i < pitch; i <<= 1)
- ;
-@@ -738,7 +746,7 @@ drm_intel_gem_bo_alloc_tiled(drm_intel_bufmgr *bufmgr,
const char *name,
- aligned_y = ALIGN(y, 32);
-
- stride = x * cpp;
-- stride = drm_intel_gem_bo_tile_pitch(bufmgr_gem, stride,
tiling);
-+ stride = drm_intel_gem_bo_tile_pitch(bufmgr_gem, stride,
tiling_mode);
- size = stride * aligned_y;
- size = drm_intel_gem_bo_tile_size(bufmgr_gem, size,
tiling_mode);
- } while (*tiling_mode != ti
libdrm: Changes to 'ubuntu'
debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 5d284f1830a6d25a3ab8f9add6203485eec78e52 Author: Robert Hooker Date: Fri Oct 8 12:10:39 2010 -0400 debian/changelog: adjust bug closer. diff --git a/debian/changelog b/debian/changelog index d61f7eb..bd19fb7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,9 +3,9 @@ libdrm (2.4.21-1ubuntu2.1) maverick-proposed; urgency=low * Add 03_intel_limit_tiled_pitches.patch: Fixes a problem where framebuffers with a width greater than 2048 pixels could not be allocated on pre-i965 generation intel GPUs, which is common for multi-monitor setups. Backport -of upstream commit 726210f87. (LP: #654619) +of upstream commit 726210f87. (LP: #619663) - -- Robert Hooker Thu, 07 Oct 2010 10:30:37 -0400 + -- Robert Hooker Fri, 08 Oct 2010 12:08:09 -0400 libdrm (2.4.21-1ubuntu2) maverick; 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/e1p4fxd-0003lv...@alioth.debian.org
libdrm: Changes to 'ubuntu'
debian/changelog | 16 +
debian/patches/03_intel_limit_tiled_pitches.patch | 64 ++
debian/patches/series |1
debian/rules |2
4 files changed, 82 insertions(+), 1 deletion(-)
New commits:
commit 9c56ba9567155997f1b100366445d4ffca05fb00
Author: Robert Hooker
Date: Thu Oct 7 10:37:00 2010 -0400
Backport fix for allocating framebuffers with >2048 width on intel.
diff --git a/debian/changelog b/debian/changelog
index d6ebd1f..d61f7eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libdrm (2.4.21-1ubuntu2.1) maverick-proposed; urgency=low
+
+ * Add 03_intel_limit_tiled_pitches.patch: Fixes a problem where framebuffers
+with a width greater than 2048 pixels could not be allocated on pre-i965
+generation intel GPUs, which is common for multi-monitor setups. Backport
+of upstream commit 726210f87. (LP: #654619)
+
+ -- Robert Hooker Thu, 07 Oct 2010 10:30:37
-0400
+
libdrm (2.4.21-1ubuntu2) maverick; urgency=low
* debian/rules: Don't install upstream changelog. This saves > 1 MB of CD
diff --git a/debian/patches/03_intel_limit_tiled_pitches.patch
b/debian/patches/03_intel_limit_tiled_pitches.patch
new file mode 100644
index 000..3e81ff0
--- /dev/null
+++ b/debian/patches/03_intel_limit_tiled_pitches.patch
@@ -0,0 +1,64 @@
+From 726210f87d558d558022f35bc8c839e798a19f0c Mon Sep 17 00:00:00 2001
+From: Chris Wilson
+Date: Thu, 24 Jun 2010 10:38:00 +
+Subject: intel: Limit tiled pitches to 8192 on pre-i965.
+
+Fixes:
+
+ Bug 28515 - Failed to allocate framebuffer when exceed 2048 width
+ https://bugs.freedesktop.org/show_bug.cgi?id=28515
+
+Signed-off-by: Chris Wilson
+---
+diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
+index a1a0806..26dc334 100644
+--- a/intel/intel_bufmgr_gem.c
b/intel/intel_bufmgr_gem.c
+@@ -254,7 +254,7 @@ drm_intel_gem_bo_tile_size(drm_intel_bufmgr_gem
*bufmgr_gem, unsigned long size,
+ */
+ static unsigned long
+ drm_intel_gem_bo_tile_pitch(drm_intel_bufmgr_gem *bufmgr_gem,
+- unsigned long pitch, uint32_t tiling_mode)
++ unsigned long pitch, uint32_t *tiling_mode)
+ {
+ unsigned long tile_width;
+ unsigned long i;
+@@ -262,10 +262,10 @@ drm_intel_gem_bo_tile_pitch(drm_intel_bufmgr_gem
*bufmgr_gem,
+ /* If untiled, then just align it so that we can do rendering
+* to it with the 3D engine.
+*/
+- if (tiling_mode == I915_TILING_NONE)
++ if (*tiling_mode == I915_TILING_NONE)
+ return ALIGN(pitch, 64);
+
+- if (tiling_mode == I915_TILING_X)
++ if (*tiling_mode == I915_TILING_X)
+ tile_width = 512;
+ else
+ tile_width = 128;
+@@ -274,6 +274,14 @@ drm_intel_gem_bo_tile_pitch(drm_intel_bufmgr_gem
*bufmgr_gem,
+ if (bufmgr_gem->gen >= 4)
+ return ROUND_UP_TO(pitch, tile_width);
+
++ /* The older hardware has a maximum pitch of 8192 with tiled
++ * surfaces, so fallback to untiled if it's too large.
++ */
++ if (pitch > 8192) {
++ *tiling_mode = I915_TILING_NONE;
++ return ALIGN(pitch, 64);
++ }
++
+ /* Pre-965 needs power of two tile width */
+ for (i = tile_width; i < pitch; i <<= 1)
+ ;
+@@ -738,7 +746,7 @@ drm_intel_gem_bo_alloc_tiled(drm_intel_bufmgr *bufmgr,
const char *name,
+ aligned_y = ALIGN(y, 32);
+
+ stride = x * cpp;
+- stride = drm_intel_gem_bo_tile_pitch(bufmgr_gem, stride,
tiling);
++ stride = drm_intel_gem_bo_tile_pitch(bufmgr_gem, stride,
tiling_mode);
+ size = stride * aligned_y;
+ size = drm_intel_gem_bo_tile_size(bufmgr_gem, size,
tiling_mode);
+ } while (*tiling_mode != tiling);
+--
+cgit v0.8.3-6-g21f6
diff --git a/debian/patches/series b/debian/patches/series
index e23f0b1..895d177 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01_default_perms.diff
02_build_libkms_against_in_tree_drm.diff
+03_intel_limit_tiled_pitches.patch
commit 123aa3d9456328266768042c402ab863ffc233a6
Author: Robert Hooker
Date: Thu Oct 7 10:39:39 2010 -0400
Import changes from 2.4.21-1ubuntu2 release dropping changelog installation.
diff --git a/debian/changelog b/debian/changelog
index 88d8701..d6ebd1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdrm (2.4.21-1ubuntu2) maverick; urgency=low
+
+ * debian/rules: Don't install upstream changelog. This saves > 1 MB of CD
+space.
+
+ -- Martin Pitt Sun, 01 Aug 2010 20:46:42 +0200
+
libdrm (2.4.21-1ubuntu1) maverick; urgency=low
* Merge from debian experimental. Remaining Ubuntu changes:
diff --git a/debian/rules b/debian/rules
index ee1c73a..d3b4c0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -118
libdrm: Changes to 'ubuntu'
.gitignore |1 ChangeLog | 280 configure.ac| 18 debian/README.source|2 debian/changelog| 51 debian/control | 20 debian/copyright| 291 debian/libdrm-dev.links |1 debian/libdrm-intel1.symbols|2 debian/libdrm-nouveau1.install |2 debian/libdrm-nouveau1.symbols | 105 debian/libdrm-radeon1.symbols | 19 debian/libkms1.install |1 debian/libkms1.symbols | 14 debian/patches/02_build_libkms_against_in_tree_drm.diff | 17 debian/patches/series |1 debian/rules| 16 debian/xsfbs/xsfbs.mk | 35 include/drm/drm.h |2 include/drm/drm_mode.h | 37 include/drm/i915_drm.h |5 intel/intel_bufmgr.c| 20 intel/intel_bufmgr.h|4 intel/intel_bufmgr_fake.c |4 intel/intel_bufmgr_gem.c| 197 intel/intel_bufmgr_priv.h | 14 libkms/Makefile.am |3 nouveau/Makefile.am |1 nouveau/nouveau_class.h | 9019 radeon/Makefile.am |4 radeon/bof.c| 477 radeon/bof.h| 90 radeon/radeon_cs.h |2 radeon/radeon_cs_gem.c | 102 tests/Makefile.am | 10 tests/vbltest/Makefile.am | 11 tests/vbltest/vbltest.c | 188 xf86atomic.h|4 38 files changed, 1863 insertions(+), 9207 deletions(-) New commits: commit 7c70d8d55f8feb40d07c9eeb495b5bfcbebe9301 Author: Robert Hooker Date: Thu Jun 10 18:58:41 2010 -0400 Update changelog. diff --git a/debian/changelog b/debian/changelog index 37967b7..88d8701 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +libdrm (2.4.21-1ubuntu1) maverick; urgency=low + + * Merge from debian experimental. Remaining Ubuntu changes: +- Enable libdrm-intel for ports architectures until plymouth is fixed to + not need it unconditionally. +- Move runtime libraries to /lib for plymouth. + + -- Robert Hooker Thu, 10 Jun 2010 18:52:09 -0400 + libdrm (2.4.21-1) experimental; urgency=low [ Christopher James Halse Rogers ] commit 119602662fcb75d635d79445a96ad68ab08ed58f Author: Julien Cristau Date: Thu Jun 10 23:09:44 2010 +0200 Upload to experimental Also adjust patch description to fit its update. diff --git a/debian/changelog b/debian/changelog index 533ae0e..c937346 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libdrm (2.4.21-1) UNRELEASED; urgency=low +libdrm (2.4.21-1) experimental; urgency=low [ Christopher James Halse Rogers ] * debian/rules: @@ -8,8 +8,7 @@ libdrm (2.4.21-1) UNRELEASED; urgency=low * debian/control: - Add libkms1, libkms1-dbg packages on linux * debian/patches/02_build_libkms_against_in_tree_drm: -- Build libkms against in-tree headers and link against libdrm as it - uses symbols from libdrm. +- Link libkms against libdrm as it uses symbols from libdrm. [ Robert Hooker ] * New upstream release. @@ -24,7 +23,7 @@ libdrm (2.4.21-1) UNRELEASED; urgency=low * Same with libkms. Also don't set a minimum version to 2.4.20, since we didn't ship it before anyway. - -- Robert Hooker Thu, 10 Jun 2010 14:44:36 -0400 + -- Julien Cristau Thu, 10 Jun 2010 23:24:54 +0200 libdrm (2.4.20-3) experimental; urgency=low diff --git a/debian/patches/02_build_libkms_against_in_tree_drm.diff b/debian/patches/02_build_libkms_against_in_tree_drm.diff index 7cbde37..25f8e43 100644 --- a/debian/patches/02_build_libkms_against_in_tree_drm.diff +++ b/debian/patches/02_build_libkms_against_in_tree_drm.diff @@ -1,6 +1,4 @@ -Description: Build libkms against in-tree xf86drm.h header - libkms requires xf86drm.h, and uses symbols from libdrm. Add - libdrm to LIBADD. +Description: Add libdrm to LIBADD as libkms uses symbols from libdrm Author
Re: libdrm: Changes to 'ubuntu'
On 2010-05-14 22:16 +0200, Julien Cristau wrote: > On Fri, May 14, 2010 at 21:16:03 +0200, Sven Joachim wrote: > >> On 2010-05-14 20:27 +0200, Robert Hooker wrote: >> >> > libdrm (2.4.20-2ubuntu1) maverick; urgency=low >> > >> > - * Merge from debian unstable, remaining changes: >> > + * Merge from debian experimental, remaining changes: >> > - Dropped patches: >> >02_fix_kms_detection_with_linux_backport_modules.diff - Obsolete >> >03_revert_abi_change.diff - Obsolete >> >04_git_nouveau_fix_sigsegv_in_nouveau_bo_new_tile.patch - Upstream >> > + * Refresh libdrm-nouveau1 symbols >> >> You will get interesting segfaults in xserver-xorg-video-nouveau (and >> other rdepends of libdrm-nouveau1, if there are any) after this ABI >> break without soname bump. Anyone who has a bright idea what to do >> about that problem? >> > Two solutions, afaict: > Breaks: xserver-xorg-video-nouveau (<< some-version) We can use some-version = 0.0.16 to reflect the ABI break. Any versions of xserver-xorg-video-nouveau that might get uploaded to sid before the Squeeze release will have to start with 0.0.15 then. > or changing the package name to libdrm-nouveau1with2.6.34abi (well, ok, > not that one, but you get the idea). > There probably aren't any other rdepends at this point since we don't > build the 3d driver yet, so Breaks seems easiest. 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/87eih478d8@turtle.gmx.de
Re: libdrm: Changes to 'ubuntu'
On Fri, May 14, 2010 at 22:33:27 +0200, Sven Joachim wrote: > On 2010-05-14 22:16 +0200, Julien Cristau wrote: > > > On Fri, May 14, 2010 at 21:16:03 +0200, Sven Joachim wrote: > > > >> You will get interesting segfaults in xserver-xorg-video-nouveau (and > >> other rdepends of libdrm-nouveau1, if there are any) after this ABI > >> break without soname bump. Anyone who has a bright idea what to do > >> about that problem? > >> > > Two solutions, afaict: > > Breaks: xserver-xorg-video-nouveau (<< some-version) > > or changing the package name to libdrm-nouveau1with2.6.34abi (well, ok, > > not that one, but you get the idea). > > I had tried something like this and failed because libtool does not > accept non-numeric versions. > I meant changing the package name without changing the actual soname. > > There probably aren't any other rdepends at this point since we don't > > build the 3d driver yet, so Breaks seems easiest. > > Yes, we can probably get away with that. Would also be good to bump the > version of all symbols in libdrm-nouveau1.symbols to ensure that > packages built against the new libdrm are not accidentally used with an > older version of libdrm-nouveau1. > Yes, if the package isn't renamed then that will be necessary. Cheers, Julien signature.asc Description: Digital signature
Re: libdrm: Changes to 'ubuntu'
On 2010-05-14 22:16 +0200, Julien Cristau wrote: > On Fri, May 14, 2010 at 21:16:03 +0200, Sven Joachim wrote: > >> You will get interesting segfaults in xserver-xorg-video-nouveau (and >> other rdepends of libdrm-nouveau1, if there are any) after this ABI >> break without soname bump. Anyone who has a bright idea what to do >> about that problem? >> > Two solutions, afaict: > Breaks: xserver-xorg-video-nouveau (<< some-version) > or changing the package name to libdrm-nouveau1with2.6.34abi (well, ok, > not that one, but you get the idea). I had tried something like this and failed because libtool does not accept non-numeric versions. > There probably aren't any other rdepends at this point since we don't > build the 3d driver yet, so Breaks seems easiest. Yes, we can probably get away with that. Would also be good to bump the version of all symbols in libdrm-nouveau1.symbols to ensure that packages built against the new libdrm are not accidentally used with an older version of libdrm-nouveau1. 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/87zl02z0iw@turtle.gmx.de
Re: libdrm: Changes to 'ubuntu'
On Fri, May 14, 2010 at 21:16:03 +0200, Sven Joachim wrote: > On 2010-05-14 20:27 +0200, Robert Hooker wrote: > > > libdrm (2.4.20-2ubuntu1) maverick; urgency=low > > > > - * Merge from debian unstable, remaining changes: > > + * Merge from debian experimental, remaining changes: > > - Dropped patches: > >02_fix_kms_detection_with_linux_backport_modules.diff - Obsolete > >03_revert_abi_change.diff - Obsolete > >04_git_nouveau_fix_sigsegv_in_nouveau_bo_new_tile.patch - Upstream > > + * Refresh libdrm-nouveau1 symbols > > You will get interesting segfaults in xserver-xorg-video-nouveau (and > other rdepends of libdrm-nouveau1, if there are any) after this ABI > break without soname bump. Anyone who has a bright idea what to do > about that problem? > Two solutions, afaict: Breaks: xserver-xorg-video-nouveau (<< some-version) or changing the package name to libdrm-nouveau1with2.6.34abi (well, ok, not that one, but you get the idea). There probably aren't any other rdepends at this point since we don't build the 3d driver yet, so Breaks seems easiest. Cheers, Julien signature.asc Description: Digital signature
Re: libdrm: Changes to 'ubuntu'
On 2010-05-14 20:27 +0200, Robert Hooker wrote: > libdrm (2.4.20-2ubuntu1) maverick; urgency=low > > - * Merge from debian unstable, remaining changes: > + * Merge from debian experimental, remaining changes: > - Dropped patches: >02_fix_kms_detection_with_linux_backport_modules.diff - Obsolete >03_revert_abi_change.diff - Obsolete >04_git_nouveau_fix_sigsegv_in_nouveau_bo_new_tile.patch - Upstream > + * Refresh libdrm-nouveau1 symbols You will get interesting segfaults in xserver-xorg-video-nouveau (and other rdepends of libdrm-nouveau1, if there are any) after this ABI break without soname bump. Anyone who has a bright idea what to do about that problem? 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/87vdaq2t1o@turtle.gmx.de
libdrm: Changes to 'ubuntu'
ChangeLog | 397 +++ Makefile.am|1 configure.ac | 51 debian/changelog | 61 debian/control | 34 debian/libdrm-intel1.install |2 debian/libdrm-intel1.symbols |2 debian/libdrm-nouveau1.symbols |6 debian/libdrm-radeon1.symbols |2 debian/libdrm2.install |2 debian/patches/02_fix_kms_detection_with_linux_backport_modules.diff | 33 debian/patches/03_revert_abi_change.diff | 1220 -- debian/patches/04_git_nouveau_fix_sigsegv_in_nouveau_bo_new_tile.patch | 27 debian/patches/series |3 debian/rules | 15 include/drm/Makefile.am|2 include/drm/i915_drm.h | 56 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 | 12 intel/intel_bufmgr.h |5 intel/intel_bufmgr_gem.c | 348 ++ intel/intel_bufmgr_priv.h |5 intel/intel_chipset.h | 90 intel/libdrm_intel.pc.in |2 libdrm.pc.in |2 libkms/Makefile.am |5 libkms/intel.c |2 libkms/internal.h |2 libkms/libkms.pc.in|2 libkms/linux.c |4 libkms/nouveau.c | 220 + nouveau/Makefile.am|2 nouveau/libdrm_nouveau.pc.in |3 nouveau/nouveau_bo.c |2 nouveau/nouveau_channel.c |2 nouveau/nouveau_class.h| 544 ++-- nouveau/nouveau_private.h |1 nouveau/nouveau_reloc.c|6 radeon/Makefile.am |2 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 |2 radeon/radeon_cs_gem.c | 129 - radeon/radeon_cs_int.h |1 tests/kmstest/main.c |1 tests/modeprint/modeprint.c|4 tests/modetest/modetest.c | 29 xf86atomic.h | 99 xf86drmMode.h |2 55 files changed, 1740 insertions(+), 1881 deletions(-) New commits: commit 14355c24519c0b8de1d2745c49bb2e01846da3a9 Author: Robert Hooker Date: Fri May 14 14:06:03 2010 -0400 Update changelog. diff --git a/debian/changelog b/debian/changelog index 39a47bf..485e71e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ libdrm (2.4.20-2ubuntu1) maverick; urgency=low - * Merge from debian unstable, remaining changes: + * Merge from debian experimental, remaining changes: - Dropped patches: 02_fix_kms_detection_with_linux_backp
libdrm: Changes to 'ubuntu'
debian/changelog |8
++
debian/patches/04_git_nouveau_fix_sigsegv_in_nouveau_bo_new_tile.patch | 27
++
debian/patches/series |1
3 files changed, 36 insertions(+)
New commits:
commit 81d02451389f814eae81eec578ea84f36e79e6ac
Author: Christopher James Halse Rogers
Date: Mon Apr 12 18:18:21 2010 +1000
* Cherry pick fix for LP: #547124 from upstream.
* Edit to also fix the 0.0.15 API path dropped in the 0.0.16 API
diff --git a/debian/changelog b/debian/changelog
index f63398c..a80aff9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libdrm (2.4.18-1ubuntu3) lucid; urgency=low
+
+ * debian/patches/04_git_nouveau_fix_sigsegv_in_nouveau_bo_new_tile.patch:
++ Cherry pick from upstream git. Fixes a segfault in libdrm_nouveau on
+ X start for some cards (LP: #547124)
+
+ -- Christopher James Halse Rogers Mon, 12 Apr 2010
11:14:11 +1000
+
libdrm (2.4.18-1ubuntu2) lucid; urgency=low
* libdrm-nouveau1.symbols: Add a missing symbol introduced in 2.4.18.
diff --git
a/debian/patches/04_git_nouveau_fix_sigsegv_in_nouveau_bo_new_tile.patch
b/debian/patches/04_git_nouveau_fix_sigsegv_in_nouveau_bo_new_tile.patch
new file mode 100644
index 000..731b52c
--- /dev/null
+++ b/debian/patches/04_git_nouveau_fix_sigsegv_in_nouveau_bo_new_tile.patch
@@ -0,0 +1,27 @@
+commit df32c307e8f81b46ee8aa4dd7222fc18f175bbb3
+Author: Ben Skeggs
+Date: Fri Mar 19 10:17:19 2010 +1000
+
+nouveau: fix segfault in nouveau_bo_new_tile() failure path
+
+Index: libdrm/nouveau/nouveau_bo.c
+===
+--- libdrm.orig/nouveau/nouveau_bo.c 2010-04-12 16:25:05.273755445 +1000
libdrm/nouveau/nouveau_bo.c2010-04-12 16:27:51.0 +1000
+@@ -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 bf7b2ff..c834409 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
01_default_perms.diff
02_fix_kms_detection_with_linux_backport_modules.diff
03_revert_abi_change.diff
+04_git_nouveau_fix_sigsegv_in_nouveau_bo_new_tile.patch
--
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/e1o1eqw-0005or...@alioth.debian.org
libdrm: Changes to 'ubuntu'
debian/changelog |6 ++ debian/libdrm-nouveau1.symbols |1 + 2 files changed, 7 insertions(+) New commits: commit 9da735b971fadcb459da459a6fca8bf7315482f2 Author: Timo Aaltonen Date: Fri Feb 19 14:34:14 2010 +0200 libdrm-nouveau1.symbols: Add a missing symbol introduced in 2.4.18. diff --git a/debian/changelog b/debian/changelog index 2692d93..f63398c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libdrm (2.4.18-1ubuntu2) lucid; urgency=low + + * libdrm-nouveau1.symbols: Add a missing symbol introduced in 2.4.18. + + -- Timo Aaltonen Fri, 19 Feb 2010 14:34:02 +0200 + libdrm (2.4.18-1ubuntu1) lucid; urgency=low * Merge from Debian unstable. diff --git a/debian/libdrm-nouveau1.symbols b/debian/libdrm-nouveau1.symbols index 538e61e..48ce118 100644 --- a/debian/libdrm-nouveau1.symbols +++ b/debian/libdrm-nouveau1.symbols @@ -54,5 +54,6 @@ libdrm_nouveau.so.1 libdrm-nouveau1 #MINVER# nouveau_pushbuf_marker_e...@base 2.4.16 nouveau_pushbuf_marker_u...@base 2.4.16 nouveau_resource_al...@base 2.4.4 + nouveau_resource_dest...@base 2.4.18 nouveau_resource_f...@base 2.4.4 nouveau_resource_i...@base 2.4.4 -- 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/e1nis6m-0004tf...@alioth.debian.org
libdrm: Changes to 'ubuntu'
.gitignore |2 ChangeLog | 469 Makefile.am|6 configure.ac | 40 debian/changelog | 53 debian/patches/03_revert_abi_change.diff | 1220 ++ debian/patches/03_update_nouveau_defines_1.diff| 1620 -- debian/patches/04_update_nouveau_defines_2.diff| 4032 --- debian/patches/05_update_nouveau_defines_3.diff| 117 debian/patches/06_nouveau_free_objects_on_channel_close.diff | 78 debian/patches/07_nouveau_fix_mem_leak_on_channel_free.diff| 28 debian/patches/08_nouveau_no_flush_notify_on_channel_free.diff | 22 debian/patches/09_add_BEGIN_RING_NI.diff | 25 debian/patches/series |8 include/drm/Makefile.am|5 include/drm/nouveau_drm.h | 87 include/drm/vmwgfx_drm.h | 574 + intel/intel_atomic.h | 15 intel/intel_bufmgr_fake.c |5 intel/intel_bufmgr_gem.c | 27 intel/libdrm_intel.pc.in |3 libkms/Makefile.am | 29 libkms/api.c | 138 libkms/intel.c | 240 libkms/internal.h | 71 libkms/libkms.h| 74 libkms/libkms.pc.in| 10 libkms/linux.c | 215 libkms/vmwgfx.c| 207 nouveau/Makefile.am|6 nouveau/nouveau_bo.c | 83 nouveau/nouveau_bo.h | 14 nouveau/nouveau_channel.c | 12 nouveau/nouveau_channel.h |5 nouveau/nouveau_class.h| 5408 +- nouveau/nouveau_device.c |8 nouveau/nouveau_private.h | 15 nouveau/nouveau_pushbuf.c | 385 nouveau/nouveau_pushbuf.h | 34 nouveau/nouveau_reloc.c| 132 nouveau/nouveau_reloc.h| 32 nouveau/nouveau_resource.c |9 nouveau/nouveau_resource.h |3 radeon/libdrm_radeon.pc.in |2 radeon/radeon_bo.c | 60 radeon/radeon_bo.h | 24 radeon/radeon_bo_gem.c | 32 radeon/radeon_bo_gem.h |8 radeon/radeon_bo_int.h |4 radeon/radeon_cs.c | 38 radeon/radeon_cs.h | 48 radeon/radeon_cs_gem.c | 153 radeon/radeon_cs_gem.h |8 radeon/radeon_cs_space.c | 170 tests/Makefile.am |4 tests/dristat.c|3 tests/drmstat.c| 10 tests/drmtest.c|4 tests/kmstest/Makefile.am | 17 tests/kmstest/main.c | 90 tests/modeprint/modeprint.c|8 tests/modetest/modetest.c | 38 xf86drmMode.c | 129 xf86drmMode.h |2 xf86drmSL.c|3 65 files changed, 7246 insertions(+), 9175 deletions(-) New commits: commit ed306d4f575b18b8f0981fee2e23ca06d577af94 Author: Timo Aaltonen Date: Fri Feb 19 14:19:17 2010 +0200 Release 2.4.18-1ubuntu1 diff --git a/debian/changelog b/debian/changelog index aed09ba..2692d93 100644 --- a/
libdrm: Changes to 'ubuntu'
debian/changelog |6 ++ debian/libdrm-dev.links|4 debian/libdrm-intel1.install |2 +- debian/libdrm-nouveau1.install |2 +- debian/libdrm-radeon1.install |2 +- debian/libdrm2.install |2 +- 6 files changed, 14 insertions(+), 4 deletions(-) New commits: commit 2e0f887d89eee6add4ae62b8947b2011ae27778e Author: Steve Langasek Date: Thu Feb 18 08:18:48 2010 + Move runtime libraries to /lib (needed by plymouth) diff --git a/debian/changelog b/debian/changelog index 8a0f5eb..3de0386 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libdrm (2.4.17-1ubuntu2) UNRELEASED; urgency=low + + * Move runtime libraries to /lib (needed by plymouth) + + -- Steve Langasek Thu, 18 Feb 2010 01:17:12 -0800 + libdrm (2.4.17-1ubuntu1) lucid; urgency=low * Merge from Debian unstable. Previous merge was from the unreleased diff --git a/debian/libdrm-dev.links b/debian/libdrm-dev.links new file mode 100644 index 000..1d45277 --- /dev/null +++ b/debian/libdrm-dev.links @@ -0,0 +1,4 @@ +/lib/libdrm.so.2 /usr/lib/libdrm.so +/lib/libdrm_intel.so.1 /usr/lib/libdrm_intel.so +/lib/libdrm_nouveau.so.1 /usr/lib/libdrm_nouveau.so +/lib/libdrm_radeon.so.1 /usr/lib/libdrm_radeon.so diff --git a/debian/libdrm-intel1.install b/debian/libdrm-intel1.install index 49a26fc..e55b2e5 100644 --- a/debian/libdrm-intel1.install +++ b/debian/libdrm-intel1.install @@ -1 +1 @@ -usr/lib/libdrm_intel.so.* +usr/lib/libdrm_intel.so.* /lib diff --git a/debian/libdrm-nouveau1.install b/debian/libdrm-nouveau1.install index 7650858..ab96364 100644 --- a/debian/libdrm-nouveau1.install +++ b/debian/libdrm-nouveau1.install @@ -1 +1 @@ -usr/lib/libdrm_nouveau.so.* +usr/lib/libdrm_nouveau.so.* /lib diff --git a/debian/libdrm-radeon1.install b/debian/libdrm-radeon1.install index 24e5a6b..4aa8bb7 100644 --- a/debian/libdrm-radeon1.install +++ b/debian/libdrm-radeon1.install @@ -1 +1 @@ -usr/lib/libdrm_radeon.so.1* +usr/lib/libdrm_radeon.so.1* /lib diff --git a/debian/libdrm2.install b/debian/libdrm2.install index 9a2ba56..e3a63ee 100644 --- a/debian/libdrm2.install +++ b/debian/libdrm2.install @@ -1 +1 @@ -usr/lib/libdrm.so.* +usr/lib/libdrm.so.* /lib -- 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/e1ni3g2-0001gf...@alioth.debian.org
libdrm: Changes to 'ubuntu'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 52eec03069c341dda60566fd8bf9c66f6e09b736 Author: Christopher James Halse Rogers Date: Thu Feb 18 20:06:40 2010 +1100 Release 2.4.17-1ubuntu1 diff --git a/debian/changelog b/debian/changelog index 41195f2..8a0f5eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libdrm (2.4.17-1ubuntu1) UNRELEASED; urgency=low +libdrm (2.4.17-1ubuntu1) lucid; urgency=low * Merge from Debian unstable. Previous merge was from the unreleased 2.4.17-1 in pkg-xorg git. This merge picks up the finalised changelog -- 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/e1ni2me-ii...@alioth.debian.org
libdrm: Changes to 'ubuntu'
debian/control |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a62420d20155b23e2e8a80c82431526cb1c410be
Author: Christopher James Halse Rogers
Date: Wed Feb 3 20:29:21 2010 +1100
Add missing comma in libdrm-dev Depends
diff --git a/debian/control b/debian/control
index cdd6c2d..e75f604 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}) [linux-any kfreebsd-any]
+ 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
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
libdrm: Changes to 'ubuntu'
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
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 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 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
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
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.
-
- -
libdrm: Changes to 'ubuntu'
debian/changelog | 60 debian/control |4 debian/copyright | 46 debian/libdrm-nouveau1.symbols |1 debian/libdrm-radeon1.symbols| 37 debian/patches/02_fix_kms_detection_with_linux_backport_modules.diff | 33 debian/patches/03_update_nouveau_defines_1.diff | 1620 debian/patches/04_update_nouveau_defines_2.diff | 4032 ++ debian/patches/05_update_nouveau_defines_3.diff | 117 debian/patches/06_nouveau_free_objects_on_channel_close.diff | 78 debian/patches/07_nouveau_fix_mem_leak_on_channel_free.diff | 28 debian/patches/08_nouveau_no_flush_notify_on_channel_free.diff | 22 debian/patches/series|7 debian/rules | 16 14 files changed, 6066 insertions(+), 35 deletions(-) New commits: commit 61adb70b692f3746c7386c93bb39dd87e3667d27 Author: Christopher James Halse Rogers Date: Mon Feb 1 14:38:30 2010 +1100 Update libdrm-nouveau1.symbols for new symbol added in 06_nouveau_free_objects_on_channel_close. diff --git a/debian/changelog b/debian/changelog index d5375a3..bf5d8e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,8 @@ libdrm (2.4.17-1ubuntu1) UNRELEASED; urgency=low * debian/patches/07_nouveau_fix_mem_leak_on_channel_free.diff: + Patches taken from git. Fix a couple of memory leaks when freeing channels + * debian/libdrm-nouveau1.symbols: ++ Add new symbol added in 06_nouveau_free_objects_on_channel_close. * 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. diff --git a/debian/libdrm-nouveau1.symbols b/debian/libdrm-nouveau1.symbols index 58eab28..538e61e 100644 --- a/debian/libdrm-nouveau1.symbols +++ b/debian/libdrm-nouveau1.symbols @@ -48,6 +48,7 @@ libdrm_nouveau.so.1 libdrm-nouveau1 #MINVER# nouveau_notifier_sta...@base 2.4.4 nouveau_notifier_wait_sta...@base 2.4.4 nouveau_pushbuf_emit_re...@base 2.4.4 + nouveau_pushbuf_f...@base 2.4.17-1ubuntu1~ nouveau_pushbuf_fl...@base 2.4.4 nouveau_pushbuf_i...@base 2.4.4 nouveau_pushbuf_marker_e...@base 2.4.16 commit 0aeb2401c69f7c755e21d1e2ff75c7734c3ab719 Author: Christopher James Halse Rogers Date: Mon Feb 1 13:54:57 2010 +1100 libdrm-nouveau: Pull some memory-leak fixes from git diff --git a/debian/changelog b/debian/changelog index 6905713..d5375a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,8 +17,16 @@ libdrm (2.4.17-1ubuntu1) UNRELEASED; urgency=low * debian/patches/03_update_nouveau_defines_1.diff: * debian/patches/04_update_nouveau_defines_2.diff: * debian/patches/05_update_nouveau_defines_3.diff: -+ Update #defines in nouveau headers to make allow recent DDXs to build. - ++ Patches taken from git. Update #defines in nouveau headers to make allow + recent DDXs to build. + * debian/patches/06_nouveau_free_objects_on_channel_close.diff: + * debian/patches/07_nouveau_fix_mem_leak_on_channel_free.diff: ++ Patches taken from git. Fix a couple of memory leaks when freeing + channels + * 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 Mon, 01 Feb 2010 12:50:59 +1100 libdrm (2.4.17-1) unstable; urgency=low diff --git a/debian/patches/06_nouveau_free_objects_on_channel_close.diff b/debian/patches/06_nouveau_free_objects_on_channel_close.diff new file mode 100644 index 000..3b847e7 --- /dev/null +++ b/debian/patches/06_nouveau_free_objects_on_channel_close.diff @@ -0,0 +1,78 @@ +commit cd2e4ba9aac65d10cf790990a8b86feed1cdd774 +Author: Younes Manton +Date: Mon Dec 28 18:00:09 2009 -0500 + +nouveau: Unreference pushbuf objects on channel destruction. + +- unreference pushbuf objects on channel destruction + +Based on Krzysztof Smiechowicz's patch. + +diff --git a/nouveau/nouveau_channel.c b/nouveau/nouveau_channel.c +index 674c5c3..638aee3 100644 +--- a/nouveau/nouveau_channel.c b/nouveau/nouveau_channel.c +@@ -111,6 +111,7 @@ nouveau_channel_free(struct nouveau_channel **chan) + + FIRE_RING(&nvchan->base); + ++ nouveau_pushbuf_fini(&nvchan->base); + nouveau_bo_unmap(nvchan->notifier_bo); + nouveau_bo_ref(NULL, &nvchan->notifier_bo); + +diff --git a/nouveau/nouveau_private.h b/nouveau/nouveau_private.h +index 784afc9..39758d1 100644 +--- a/nouveau/nouveau_private.h b/nouveau/nouveau_private.h +@@ -
libdrm: Changes to 'ubuntu'
debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 5b21a7fa18a6dc882fd44b5ef5abe9e2bb701d7d Author: Timo Aaltonen Date: Sat Jan 9 00:00:52 2010 +0200 Release 2.4.17-0ubuntu1 diff --git a/debian/changelog b/debian/changelog index c8ade16..4ff1d1f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -libdrm (2.4.17-0ubuntu1) UNRELEASED; urgency=low +libdrm (2.4.17-0ubuntu1) lucid; urgency=low * Merge with Debian unstable, remaining changes: + control, rules, libdrm-nouveau1.symbols: Enable libdrm_nouveau. * Update libdrm-nouveau1.symbols and shlibs. * Drop 02_silent_master.diff, applied upstream. - -- Timo Aaltonen Tue, 15 Dec 2009 21:09:25 +0200 + -- Timo Aaltonen Sat, 09 Jan 2010 00:00:29 +0200 libdrm (2.4.17-1) UNRELEASED; urgency=low -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
libdrm: Changes to 'ubuntu'
debian/changelog |4 ++-- debian/libdrm-nouveau1.symbols |4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit a10ae48a2424b8e83aa880f8d58d7eadcd5e3d59 Author: Timo Aaltonen Date: Thu Dec 17 00:39:16 2009 +0200 Release 2.4.16-0ubuntu1. diff --git a/debian/changelog b/debian/changelog index 01ff9e1..f087d19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libdrm (2.4.16-1ubuntu1) UNRELEASED; urgency=low +libdrm (2.4.16-0ubuntu1) 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 Tue, 15 Dec 2009 21:09:25 +0200 + -- Timo Aaltonen Thu, 17 Dec 2009 00:24:54 +0200 libdrm (2.4.16-1) UNRELEASED; urgency=low commit cec105c7ec2f5e8d84e83c6f5957fec8eacea10f Author: Timo Aaltonen Date: Thu Dec 17 00:24:22 2009 +0200 Fix libdrm-nouveau1.symbols. diff --git a/debian/libdrm-nouveau1.symbols b/debian/libdrm-nouveau1.symbols index 2ae9229..58eab28 100644 --- a/debian/libdrm-nouveau1.symbols +++ b/debian/libdrm-nouveau1.symbols @@ -50,8 +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_pushbuf_marker_e...@base 2.4.16 + nouveau_pushbuf_marker_u...@base 2.4.16 nouveau_resource_al...@base 2.4.4 nouveau_resource_f...@base 2.4.4 nouveau_resource_i...@base 2.4.4 -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
libdrm: Changes to 'ubuntu'
Rebased ref, commits from common ancestor:
commit 641e0fa33099773f1ed3a974d63b18c0b2ba0c8c
Author: Brice Goglin
Date: Tue Dec 15 11:39:22 2009 +0100
Bump linux-libc-dev dependency to 2.6.32
diff --git a/debian/changelog b/debian/changelog
index 0e6de04..404cdc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ libdrm (2.4.16-1) UNRELEASED; urgency=low
* Enable libdrm_radeon, interface to kernel graphics memory management on
radeon (closes: #558786).
+ [ Brice Goglin ]
+ * Bump linux-libc-dev dependency to 2.6.32, thanks Piotr Engelking,
+closes: #561224.
+
-- Brice Goglin Fri, 11 Dec 2009 22:37:48 +0100
libdrm (2.4.15-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 7ccd43b..55da85b 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Package: libdrm-dev
Section: libdevel
Architecture: any
Depends:
- linux-libc-dev (>= 2.6.28) [linux-any],
+ 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],
commit 1fd8dcd3405cd47cd65d6fb54f5730db5d813a6a
Author: Brice Goglin
Date: Tue Dec 15 11:38:41 2009 +0100
mark 2.4.16-1 back to UNRELEASED since it was rejected from NEW
diff --git a/debian/changelog b/debian/changelog
index a6941a6..0e6de04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.16-1) unstable; urgency=low
+libdrm (2.4.16-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* New upstream release, closes: #560434.
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
libdrm: Changes to 'ubuntu'
.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
libdrm: Changes to 'ubuntu'
debian/changelog | 10 ++
debian/patches/02_silent_master.diff | 20
debian/patches/series|1 +
3 files changed, 31 insertions(+)
New commits:
commit a44318b409653aa36cca087b8c8354d79199d5fc
Author: Robert Hooker
Date: Mon Dec 14 11:56:17 2009 -0500
Import non-vcs release of 2.4.14-1ubuntu2.
diff --git a/debian/changelog b/debian/changelog
index d6e832a..b1180ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libdrm (2.4.14-1ubuntu2) lucid; urgency=low
+
+ * debian/patches/02_silent_master.diff:
+- The library noisily writes to stderr every time the drm master
+ is set or dropped; this can have the side-effect that the kernel
+ repaints all of the console messages over top of whatever you
+ left on the screen. That's fugly.
+
+ -- Scott James Remnant Fri, 11 Dec 2009 04:24:50 +
+
libdrm (2.4.14-1ubuntu1) karmic; urgency=low
* Merge from Debian unstable. (LP: #446080)
diff --git a/debian/patches/02_silent_master.diff
b/debian/patches/02_silent_master.diff
new file mode 100644
index 000..b4cc3db
--- /dev/null
+++ b/debian/patches/02_silent_master.diff
@@ -0,0 +1,20 @@
+diff -rup libdrm-2.4.14~/libdrm/xf86drm.c libdrm-2.4.14/libdrm/xf86drm.c
+--- libdrm-2.4.14~/libdrm/xf86drm.c2009-07-10 04:17:53.0 +0100
libdrm-2.4.14/libdrm/xf86drm.c 2009-12-11 04:22:07.094463655 +
+@@ -2498,7 +2498,6 @@ int drmSetMaster(int fd)
+ {
+ int ret;
+
+- fprintf(stderr,"Setting master \n");
+ ret = ioctl(fd, DRM_IOCTL_SET_MASTER, 0);
+ return ret;
+ }
+@@ -2506,7 +2505,7 @@ int drmSetMaster(int fd)
+ int drmDropMaster(int fd)
+ {
+ int ret;
+- fprintf(stderr,"Dropping master \n");
++
+ ret = ioctl(fd, DRM_IOCTL_DROP_MASTER, 0);
+ return ret;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 8ca2297..4c7eab0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
01_default_perms.diff
+02_silent_master.diff
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
libdrm: Changes to 'ubuntu'
debian/xsfbs/xsfbs.mk | 17 ++---
debian/xsfbs/xsfbs.sh |4 +---
2 files changed, 3 insertions(+), 18 deletions(-)
New commits:
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau
Date: Fri Sep 25 16:39:23 2009 +0200
xsfbs.mk: remove more obsolete code
We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
- rm -rf imports
- dh_clean debian/shlibs.local \
-debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
- sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
- debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+ dh_clean
# Remove files from the upstream source tree that we don't need, or which have
# licensing problems. It must be run before creating the .orig.tar.gz.
commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau
Date: Fri Sep 25 15:43:28 2009 +0200
xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage
These variables aren't set anywhere.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
- rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+ rm -rf $(STAMP_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
debian/po/pothead
@@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
| sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \
-e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \
- -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \
<$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \
rm $$MAINTSCRIPT.tmp; \
fi; \
commit bda208ec00d0b7b3632f57fb27e014684cdf73ba
Author: Julien Cristau
Date: Fri Sep 25 15:33:39 2009 +0200
xsfbs.sh: fix typo and remove svn keyword
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 45acd59..813fd8d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -1,5 +1,3 @@
-# $Id$
-
# This is the X Strike Force shell library for X Window System package
# maintainer scripts. It serves to define shell functions commonly used by
# such packages, and performs some error checking necessary for proper
operation
@@ -8,7 +6,7 @@
# removal tasks.
# If you are reading this within a Debian package maintainer script (e.g.,
-# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
+# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
# skip past this library by scanning forward in this file to the string
# "GOBSTOPPER".
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
libdrm: Changes to 'ubuntu'
debian/changelog |6 ++ 1 file changed, 6 insertions(+) New commits: commit d506fe48035163984b139001fd68e397f5c6d5c8 Author: Timo Aaltonen Date: Thu Oct 8 19:52:20 2009 +0300 Release 2.4.14-1ubuntu1. diff --git a/debian/changelog b/debian/changelog index d3561b6..d6e832a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libdrm (2.4.14-1ubuntu1) karmic; urgency=low + + * Merge from Debian unstable. (LP: #446080) + + -- Timo Aaltonen Thu, 08 Oct 2009 16:35:53 +0300 + libdrm (2.4.14-1) unstable; urgency=low * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
libdrm: Changes to 'ubuntu'
.gitignore|1
ChangeLog | 262 +++
configure.ac |2
debian/changelog | 49 +++
debian/control| 38 ++
debian/libdrm-dev.install | 11
debian/libdrm-intel1.symbols |1
debian/libdrm-nouveau1.symbols| 26 -
debian/libdrm-radeon1.install |2
debian/libdrm-radeon1.symbols | 16 +
debian/rules | 13
debian/xsfbs/xsfbs.mk |4
debian/xsfbs/xsfbs.sh | 229 -
libdrm/intel/Makefile.am |2
libdrm/intel/intel_bufmgr.c |7
libdrm/intel/intel_bufmgr.h |1
libdrm/intel/intel_bufmgr_gem.c | 120 +++--
libdrm/intel/intel_bufmgr_priv.h |8
libdrm/intel/intel_chipset.h | 10
libdrm/nouveau/Makefile.am|3
libdrm/nouveau/nouveau_bo.c | 405 +++---
libdrm/nouveau/nouveau_bo.h |8
libdrm/nouveau/nouveau_channel.c | 66
libdrm/nouveau/nouveau_class.h| 505 +-
libdrm/nouveau/nouveau_device.c | 10
libdrm/nouveau/nouveau_dma.c | 217
libdrm/nouveau/nouveau_dma.h | 154 ---
libdrm/nouveau/nouveau_drmif.h|2
libdrm/nouveau/nouveau_fence.c| 243 --
libdrm/nouveau/nouveau_notifier.c |4
libdrm/nouveau/nouveau_private.h | 92 --
libdrm/nouveau/nouveau_pushbuf.c | 209 ++-
libdrm/radeon/radeon_bo.h | 28 ++
libdrm/radeon/radeon_bo_gem.c | 81 +-
libdrm/radeon/radeon_cs.h |9
libdrm/radeon/radeon_cs_gem.c | 24 -
libdrm/radeon/radeon_cs_space.c |2
libdrm/radeon/radeon_track.c |1
libdrm/xf86drmMode.c |3
shared-core/drm.h |1
shared-core/nouveau_drm.h | 124 +
shared-core/radeon_drm.h | 57 +++-
42 files changed, 1289 insertions(+), 1761 deletions(-)
New commits:
commit 767dfb494eb1bf560d07b9a07fc4a098d13910ff
Author: Timo Aaltonen
Date: Thu Oct 8 16:35:30 2009 +0300
More imported changes.
diff --git a/debian/changelog b/debian/changelog
index 0621293..d3561b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,34 @@ libdrm (2.4.14-1) unstable; urgency=low
-- Julien Cristau Thu, 24 Sep 2009 21:53:09 +0200
+libdrm (2.4.13-1ubuntu1) karmic; urgency=low
+
+ * Merge with Debian. (LP: #420803)
++ Included fixes:
+ - radeon: fix GTT writing space check
+(LP: #45)
++ Remaining Ubuntu changes:
+ - control:
++ libdrm-intel1 Replaces libdrm2 (<= 2.4.1-0ubuntu5)
++ libdrm-dev depends on newer linux-libc-dev on !lpia
++ libdrm-dev depends on libdrm-{radeon1,nouveau1}
++ add libdrm-{radeon1,nouveau1}{,-dbg} source packages
+ - rules:
++ Add libdrm-nouveau1 and libdrm-nouveau1-dbg package
++ Enable radeon and nouveau experimental apis
+ - copyright:
++ Update to include new files from add_libdrm-nouveau.patch
+ - libdrm-dev.install: Also install r300_reg.h, via_3d_reg.h,
+xgi_drm.h, the nouveau headers, and other headers not provided by
+the kernel.
+ - libdrm-{radeon1,nouveau1}.{install,symbols}: Add nouveau and
+radeon
+ * control:
++ Increase linux-libc-dev version dependency to 2.6.30-2.4 for !lpia
++ Drop Replaces on linux-libc-dev
+
+ -- Bryce Harrington Tue, 08 Sep 2009 15:18:34 -0700
+
libdrm (2.4.13-1) unstable; urgency=low
[ Christopher James Halse Rogers ]
diff --git a/debian/libdrm-dev.install b/debian/libdrm-dev.install
index 49b0732..6cd8ddd 100644
--- a/debian/libdrm-dev.install
+++ b/debian/libdrm-dev.install
@@ -1,13 +1,4 @@
-usr/include/nouveau/*
-usr/include/drm/mach64_drm.h
-usr/include/drm/nouveau_drm.h
-usr/include/drm/nouveau_drmif.h
-usr/include/drm/r300_reg.h
-usr/include/drm/via_3d_reg.h
-usr/include/drm/xgi_drm.h
-usr/include/intel_bufmgr.h
-usr/include/xf86drm.h
-usr/include/xf86drmMode.h
+usr/include/*
usr/lib/lib*.a
usr/lib/lib*.so
usr/lib/pkgconfig/*
commit cee87ebd54e2e59d38f760f6aaaf04e498f45337
Author: Timo Aaltonen
Date: Thu Oct 8 16:03:15 2009 +0300
Import changes from the non-vcs fork.
diff --git a/debian/control b/debian/control
index afd891f..2ef6fff 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,9 @@ Architecture: any
Depends: libdrm2 (= ${binary:Version}),
libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
libdrm-nouveau1 (= ${binary:Version}),
- linux-libc-dev (>= 2.6.28-5.15) [amd64 armel i386], linux-libc-dev (>=
2.6.28-2.4) [lpia]
-Replaces: linux-libc-dev (<= 2.6.28-3.4)
+ libdrm-radeon1 (= ${binary:Version}),
+ linux-libc-dev (>= 2.6.30-2.4) [amd64 armel i386],
+ linux-libc-dev (>= 2.6.28-2.4) [lpia]
Description: Userspace interface to kernel DRM s
libdrm: Changes to 'ubuntu'
ChangeLog | 270 configure.ac | 15 debian/changelog | 13 debian/patches/101_update_libdrm-nouveau_interface | 649 - debian/patches/series |1 libdrm/Makefile.am |6 libdrm/intel/intel_bufmgr_gem.c| 82 +- libdrm/nouveau/libdrm_nouveau.pc.in|2 libdrm/nouveau/nouveau_bo.c| 191 -- libdrm/nouveau/nouveau_bo.h| 22 libdrm/nouveau/nouveau_device.c|6 libdrm/nouveau/nouveau_device.h|2 libdrm/nouveau/nouveau_drmif.h |3 libdrm/nouveau/nouveau_private.h |1 libdrm/nouveau/nouveau_pushbuf.c |4 libdrm/nouveau/nouveau_pushbuf.h | 23 libdrm/radeon/Makefile.am | 54 + libdrm/radeon/libdrm_radeon.pc.in | 10 libdrm/radeon/radeon_bo.h | 187 ++ libdrm/radeon/radeon_bo_gem.c | 270 libdrm/radeon/radeon_bo_gem.h | 43 + libdrm/radeon/radeon_cs.h | 237 +++ 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 | 140 libdrm/radeon/radeon_track.h | 64 ++ libdrm/xf86drm.c | 49 + shared-core/drm.h | 319 -- shared-core/i915_drm.h | 52 - shared-core/nouveau_drm.h | 35 - shared-core/radeon_drm.h | 131 tests/modetest/modetest.c |2 33 files changed, 2459 insertions(+), 1156 deletions(-) New commits: commit aebed34cbc1363477e200aa926adea52c3dbc7df Author: Timo Aaltonen Date: Tue Jul 28 14:14:02 2009 +0300 Release 2.4.12-1ubuntu1 diff --git a/debian/changelog b/debian/changelog index 612a6cc..7a8029d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libdrm (2.4.12-1ubuntu1) UNRELEASED; urgency=low +libdrm (2.4.12-1ubuntu1) karmic; urgency=low * Merge from Debian unstable. * Drop 101_update_libdrm-nouveau_interface.patch, included upstream. - -- Timo Aaltonen Tue, 28 Jul 2009 13:56:53 +0300 + -- Timo Aaltonen Tue, 28 Jul 2009 14:13:58 +0300 libdrm (2.4.12-1) unstable; urgency=low commit 73a4b518629626d6bfefb2aa1ea6627f7fdcbc36 Author: Brice Goglin Date: Tue Jul 21 15:29:09 2009 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 1d4bd97..7a53ef3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libdrm (2.4.12-1) UNRELEASED; urgency=low +libdrm (2.4.12-1) unstable; urgency=low * New upstream release. - -- Brice Goglin Tue, 21 Jul 2009 15:28:05 +0200 + -- Brice Goglin Tue, 21 Jul 2009 15:29:03 +0200 libdrm (2.4.11-1) unstable; urgency=low commit 492cd21988fb47252108d859a843a622519b84ce Author: Brice Goglin Date: Tue Jul 21 15:28:57 2009 +0200 New upstream release diff --git a/ChangeLog b/ChangeLog index 026de37..4ef5518 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,273 @@ +commit eea95ed8af24300e5a5d2489dfe0d73c24300651 +Author: Eric Anholt +Date: Wed Jul 15 10:04:44 2009 -0700 + +Bump to version 2.4.12 for release. + +commit 3f3c5be6f908272199ccf53f108b1124bfe0a00e +Author: Eric Anholt +Date: Thu Jul 9 17:49:46 2009 -0700 + +intel: Free buffers in the BO cache that haven't been reused in a while. + +The goal of the BO cache is to keep buffers on hand for fast continuous use, +as in every frame of a game or every batchbuffer of the X Server. Keeping +older buffers on hand not only doesn't serve this purpose, it may hurt +performance by resulting in disk cache getting kicked out, or even driving +the system to swap. + +Bug #20766. + +commit 80179df5f85a2fd39b2544f1b7aae61102800f0f +Author: Dave Airlie +Date: Fri Jul 10 02:38:13 2009 +1000 + +configure: move AC_USE_SYSTEM_EXTENSIONS up higher + +this was giving me a warning on automake 1.11 + +commit f257201c11fd1aff9319aaf47556b184141ac7cb +Author: Ben Skeggs +Date: Thu Jul 9 11:41:47 2009 +1000 + +nouveau: fix pin for buffers created with bo_wrap + +commit 4179c5f0a69b452cf94a507c13021e4918a3e02d +Author: Ian Romanick +Date: Mon Jul 6 15:36:20 2009 -0700 + +s/AC_USE_SYSTEM_MACROS/AC_USE_SYSTEM_EXTENSIONS/ + +Not sure what I was thinking. + +commit c5a5bbbe899400642795c1d95aef78deade9241f +Author: Pauli Nieminen +Da
libdrm: Changes to 'ubuntu'
debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit f3c1782bfc2e642db3bc8a8ac1612405383671a7 Author: Timo Aaltonen Date: Wed Jul 8 14:53:03 2009 +0300 Release 2.4.11-1ubuntu1 diff --git a/debian/changelog b/debian/changelog index 691d145..0c24261 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libdrm (2.4.11-1ubuntu1) UNRELEASED; urgency=low +libdrm (2.4.11-1ubuntu1) karmic; urgency=low [ Timo Aaltonen ] * Merge from Debian unstable. @@ -14,7 +14,7 @@ libdrm (2.4.11-1ubuntu1) UNRELEASED; urgency=low + Remove drm_mode.h from libdrm-dev again; this is shipped in linux-libc-dev. - -- Christopher James Halse Rogers Mon, 06 Jul 2009 14:12:42 +1000 + -- Timo Aaltonen Wed, 08 Jul 2009 14:52:50 +0300 libdrm (2.4.11-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
libdrm: Changes to 'ubuntu'
debian/changelog |3 +++ debian/libdrm-dev.install |1 - debian/libdrm-nouveau1.symbols |8 3 files changed, 7 insertions(+), 5 deletions(-) New commits: commit 3f772f21de44e3f526aff7fca301d163b4a07160 Author: Christopher James Halse Rogers Date: Wed Jul 8 09:26:10 2009 +1000 Version symbols added in -1ubuntu1 with a trailing ~. This quietens lintian, and will make any backports easier. diff --git a/debian/libdrm-nouveau1.symbols b/debian/libdrm-nouveau1.symbols index f4fd0c7..2a8af0a 100644 --- a/debian/libdrm-nouveau1.symbols +++ b/debian/libdrm-nouveau1.symbols @@ -7,10 +7,10 @@ libdrm_nouveau.so.1 libdrm-nouveau1 #MINVER# nouveau_bo_handle_...@base 2.4.4 nouveau_bo_i...@base 2.4.4 nouveau_bo_...@base 2.4.4 - nouveau_bo_map_fl...@base 2.4.11-1ubuntu1 - nouveau_bo_map_ra...@base 2.4.11-1ubuntu1 + nouveau_bo_map_fl...@base 2.4.11-1ubuntu1~ + 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_new_t...@base 2.4.11-1ubuntu1~ nouveau_bo_...@base 2.4.4 nouveau_bo_...@base 2.4.4 nouveau_bo_taked...@base 2.4.4 @@ -19,7 +19,7 @@ libdrm_nouveau.so.1 libdrm-nouveau1 #MINVER# nouveau_bo_un...@base 2.4.4 nouveau_bo_u...@base 2.4.4 nouveau_bo_validate_n...@base 2.4.4 - nouveau_bo_w...@base 2.4.11-1ubuntu1 + nouveau_bo_w...@base 2.4.11-1ubuntu1~ nouveau_channel_al...@base 2.4.4 nouveau_channel_f...@base 2.4.4 nouveau_device_cl...@base 2.4.4 commit 15b2e9c2a9e2a3e7232aaf23f8b39bff73b4ef56 Author: Christopher James Halse Rogers Date: Wed Jul 8 09:13:43 2009 +1000 Fix libdrm-nouveau1.symbols for change in package version. These symbols are being added in this Ubuntu release, so it is appropriate that the dependency version is 2.4.11-1ubuntu1 diff --git a/debian/libdrm-nouveau1.symbols b/debian/libdrm-nouveau1.symbols index 1805968..f4fd0c7 100644 --- a/debian/libdrm-nouveau1.symbols +++ b/debian/libdrm-nouveau1.symbols @@ -7,10 +7,10 @@ libdrm_nouveau.so.1 libdrm-nouveau1 #MINVER# nouveau_bo_handle_...@base 2.4.4 nouveau_bo_i...@base 2.4.4 nouveau_bo_...@base 2.4.4 - nouveau_bo_map_fl...@base 2.4.11-0ubuntu2 - nouveau_bo_map_ra...@base 2.4.11-0ubuntu2 + nouveau_bo_map_fl...@base 2.4.11-1ubuntu1 + nouveau_bo_map_ra...@base 2.4.11-1ubuntu1 nouveau_bo_...@base 2.4.4 - nouveau_bo_new_t...@base 2.4.11-0ubuntu2 + nouveau_bo_new_t...@base 2.4.11-1ubuntu1 nouveau_bo_...@base 2.4.4 nouveau_bo_...@base 2.4.4 nouveau_bo_taked...@base 2.4.4 @@ -19,7 +19,7 @@ libdrm_nouveau.so.1 libdrm-nouveau1 #MINVER# nouveau_bo_un...@base 2.4.4 nouveau_bo_u...@base 2.4.4 nouveau_bo_validate_n...@base 2.4.4 - nouveau_bo_w...@base 2.4.11-0ubuntu2 + nouveau_bo_w...@base 2.4.11-1ubuntu1 nouveau_channel_al...@base 2.4.4 nouveau_channel_f...@base 2.4.4 nouveau_device_cl...@base 2.4.4 commit adfcbb4e9ebc8612a5e68d5ec516939a1a15c067 Author: Christopher James Halse Rogers Date: Wed Jul 8 09:11:46 2009 +1000 Remove drm_mode.h from libdrm-dev again diff --git a/debian/changelog b/debian/changelog index 7018fe3..691d145 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ libdrm (2.4.11-1ubuntu1) UNRELEASED; urgency=low (LP: #395700) * debian/libdrm-nouveau1.symbols: Add new symbols introduced in 101_update_libdrm-nouveau_interface + * debian/libdrm-dev.install: ++ Remove drm_mode.h from libdrm-dev again; this is shipped in + linux-libc-dev. -- Christopher James Halse Rogers Mon, 06 Jul 2009 14:12:42 +1000 diff --git a/debian/libdrm-dev.install b/debian/libdrm-dev.install index e93cc89..49b0732 100644 --- a/debian/libdrm-dev.install +++ b/debian/libdrm-dev.install @@ -1,5 +1,4 @@ usr/include/nouveau/* -usr/include/drm/drm_mode.h usr/include/drm/mach64_drm.h usr/include/drm/nouveau_drm.h usr/include/drm/nouveau_drmif.h -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
libdrm: Changes to 'ubuntu'
debian/changelog | 11
debian/libdrm-nouveau1.symbols |4
debian/patches/101_update_libdrm-nouveau_interface | 649 +
debian/patches/series |1
4 files changed, 664 insertions(+), 1 deletion(-)
New commits:
commit 9b617c80daa7f7a2e3e48d23c58f54d7aa4d5a3d
Author: Christopher James Halse Rogers
Date: Mon Jul 6 14:13:41 2009 +1000
Update libdrm-nouveau for 0.0.14 kernel drm interface
diff --git a/debian/changelog b/debian/changelog
index b2e8211..7018fe3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,17 @@
libdrm (2.4.11-1ubuntu1) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* Merge from Debian unstable.
- -- Timo Aaltonen Fri, 03 Jul 2009 12:04:01 +0300
+ [ Christopher James Halse Rogers ]
+ * Add 101_update_libdrm-nouveau_interface.patch. Backport several
+libdrm-nouveau commits from upstream which are needed to interface with
+the new 0.0.14 nouveau kernel interface provided by recent nouveau.ko
+(LP: #395700)
+ * debian/libdrm-nouveau1.symbols: Add new symbols introduced in
+101_update_libdrm-nouveau_interface
+
+ -- Christopher James Halse Rogers Mon, 06 Jul 2009
14:12:42 +1000
libdrm (2.4.11-1) unstable; urgency=low
diff --git a/debian/libdrm-nouveau1.symbols b/debian/libdrm-nouveau1.symbols
index f9686a7..1805968 100644
--- a/debian/libdrm-nouveau1.symbols
+++ b/debian/libdrm-nouveau1.symbols
@@ -7,7 +7,10 @@ libdrm_nouveau.so.1 libdrm-nouveau1 #MINVER#
nouveau_bo_handle_...@base 2.4.4
nouveau_bo_i...@base 2.4.4
nouveau_bo_...@base 2.4.4
+ nouveau_bo_map_fl...@base 2.4.11-0ubuntu2
+ nouveau_bo_map_ra...@base 2.4.11-0ubuntu2
nouveau_bo_...@base 2.4.4
+ nouveau_bo_new_t...@base 2.4.11-0ubuntu2
nouveau_bo_...@base 2.4.4
nouveau_bo_...@base 2.4.4
nouveau_bo_taked...@base 2.4.4
@@ -16,6 +19,7 @@ libdrm_nouveau.so.1 libdrm-nouveau1 #MINVER#
nouveau_bo_un...@base 2.4.4
nouveau_bo_u...@base 2.4.4
nouveau_bo_validate_n...@base 2.4.4
+ nouveau_bo_w...@base 2.4.11-0ubuntu2
nouveau_channel_al...@base 2.4.4
nouveau_channel_f...@base 2.4.4
nouveau_device_cl...@base 2.4.4
diff --git a/debian/patches/101_update_libdrm-nouveau_interface
b/debian/patches/101_update_libdrm-nouveau_interface
new file mode 100644
index 000..ecfb929
--- /dev/null
+++ b/debian/patches/101_update_libdrm-nouveau_interface
@@ -0,0 +1,649 @@
+Backport changes to libdrm-nouveau since 2.4.11
+
+The nouveau drm kernel interface has changed (twice) since the
+2.4.11 release. We need these updates so that the DDX can
+use a recent nouveau.ko.
+
+The list of git commits imported is:
+c65a343ed29c24f812ca919f40dfeee948b6f14a
+00fae87f96e1fc5198311feec81866bf9c53d0e1
+2cb4c64d7310904b354365c2cbc263211e9eb4a1
+3d4bfe8c893d016ef43d1ebf28e4607aa1f540a4
+Index: libdrm-2.4.11/libdrm/nouveau/libdrm_nouveau.pc.in
+===
+--- libdrm-2.4.11.orig/libdrm/nouveau/libdrm_nouveau.pc.in 2009-07-03
09:44:58.969261108 +1000
libdrm-2.4.11/libdrm/nouveau/libdrm_nouveau.pc.in 2009-07-03
09:45:36.937298103 +1000
+@@ -5,6 +5,6 @@
+
+ Name: libdrm_nouveau
+ Description: Userspace interface to nouveau kernel DRM services
+-Version: 0.5
++Version: 0.6
+ Libs: -L${libdir} -ldrm_nouveau
+ Cflags: -I${includedir} -I${includedir}/drm -I${includedir}/nouveau
+Index: libdrm-2.4.11/libdrm/nouveau/nouveau_bo.c
+===
+--- libdrm-2.4.11.orig/libdrm/nouveau/nouveau_bo.c 2009-07-03
09:44:59.197260823 +1000
libdrm-2.4.11/libdrm/nouveau/nouveau_bo.c 2009-07-03 09:45:36.937298103
+1000
+@@ -20,6 +20,9 @@
+ * SOFTWARE.
+ */
+
++#ifdef HAVE_CONFIG_H
++#include
++#endif
+ #include
+ #include
+ #include
+@@ -42,6 +45,19 @@
+ }
+
+ static int
++nouveau_bo_info(struct nouveau_bo_priv *nvbo, struct drm_nouveau_gem_info
*arg)
++{
++ nvbo->handle = nvbo->base.handle = arg->handle;
++ nvbo->domain = arg->domain;
++ nvbo->size = nvbo->base.size = arg->size;
++ nvbo->offset = arg->offset;
++ nvbo->map_handle = arg->map_handle;
++ nvbo->base.tile_mode = arg->tile_mode;
++ nvbo->base.tile_flags = arg->tile_flags;
++ return 0;
++}
++
++static int
+ nouveau_bo_allocated(struct nouveau_bo_priv *nvbo)
+ {
+ if (nvbo->sysmem || nvbo->handle || (nvbo->flags & NOUVEAU_BO_PIN))
+@@ -152,7 +168,8 @@
+ if (ret)
+ return ret;
+
+- nvbo->handle = req.map_handle;
++ nvbo->handle =
++ nvbo->map_handle = req.map_handle;
+ nvbo->size = req.size;
+ nvbo->offset = req.offset;
+ if (req.flags & (NOUVEAU_MEM_AGP | NOUVEAU_MEM_PCI))
+@@ -169,6 +186,7 @@
+ {
+ struct nouveau_device_priv *nvdev = nouveau_device(nvbo->base.device);
+ struct drm_nouveau_gem_new req;
++ struct drm_nouveau_gem_info *info = &req.info;
+ int ret;
+
+ if (
libdrm: Changes to 'ubuntu'
ChangeLog| 142 +++ configure.ac |2 debian/README.source | 73 debian/changelog | 26 +++ debian/control |4 - debian/libdrm-intel1.symbols |2 debian/rules |2 debian/xsfbs/xsfbs.sh| 12 --- libdrm/Makefile.am |1 libdrm/intel/intel_bufmgr.c | 16 libdrm/intel/intel_bufmgr.h |4 + libdrm/intel/intel_bufmgr_fake.c |2 libdrm/intel/intel_bufmgr_gem.c | 58 ++- libdrm/intel/intel_bufmgr_priv.h | 23 ++ libdrm/nouveau/nouveau_bo.c |3 libdrm/nouveau/nouveau_dma.c |1 libdrm/xf86drmMode.c |3 shared-core/drm.h|6 + shared-core/i915_drm.h | 10 ++ 19 files changed, 366 insertions(+), 24 deletions(-) New commits: commit 5b6af8c0e793e2d465e6786329df7d2d0cf9e61c Author: Timo Aaltonen Date: Fri Jul 3 12:00:10 2009 +0300 add the previous changelog entry. diff --git a/debian/changelog b/debian/changelog index 3e5aa18..431e847 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,20 @@ libdrm (2.4.11-1) unstable; urgency=low -- Julien Cristau Mon, 08 Jun 2009 16:22:04 +0200 +libdrm (2.4.11-0ubuntu1) karmic; urgency=low + + * New upstream release + * Add 100_bo_cache_up_to_64mb.patch. Cherrypick from upstream. +This avoids making objects significantly bigger than they would be +otherwise, which would result in some failing at binding to the GTT. +Fixes issue with hangs viewing large images. +(LP: #330460) + * libdrm-intel1.symbols: Add drm_intel_bo_disable_reuse and +drm_intel_get_pipe_from_crtc_id + * Don't try to install ChangeLog since not included in upstream release. + + -- Bryce Harrington Tue, 02 Jun 2009 17:31:34 -0700 + libdrm (2.4.9-2ubuntu1) karmic; urgency=low * Merge from debian unstable, remaining changes: commit c283da2e66999831a5123fd5e5a5b5dbe4e8c106 Author: Julien Cristau Date: Mon Jun 8 16:22:21 2009 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 9bc0cb2..f3d87a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libdrm (2.4.11-1) UNRELEASED; urgency=low +libdrm (2.4.11-1) unstable; urgency=low * New upstream release. * Also pull in additional fix for libdrm-intel: Only do BO caching up to @@ -8,7 +8,7 @@ libdrm (2.4.11-1) UNRELEASED; urgency=low * Remove Thierry Reding from Uploaders, he doesn't seem to be around anymore :( - -- Julien Cristau Mon, 08 Jun 2009 16:04:56 +0200 + -- Julien Cristau Mon, 08 Jun 2009 16:22:04 +0200 libdrm (2.4.9-2) unstable; urgency=low commit a7f3473bce6057ce77abe64938f221e9b0595acd Author: Julien Cristau Date: Mon Jun 8 16:19:28 2009 +0200 Remove Thierry Reding from Uploaders He doesn't seem to be around anymore :( diff --git a/debian/changelog b/debian/changelog index 225b18f..9bc0cb2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ libdrm (2.4.11-1) UNRELEASED; urgency=low 64MB objects. * Update libdrm-intel1.symbols and bump shlibs. * Add README.source from xsfbs. Bump Standards-Version to 3.8.1. + * Remove Thierry Reding from Uploaders, he doesn't seem to be around anymore +:( -- Julien Cristau Mon, 08 Jun 2009 16:04:56 +0200 diff --git a/debian/control b/debian/control index 57c82de..02666d2 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: libdrm Priority: optional Maintainer: Debian X Strike Force -Uploaders: Thierry Reding , Julien Cristau , David Nusinow , Brice Goglin +Uploaders: Julien Cristau , David Nusinow , Brice Goglin 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.1 Section: libs commit 59cd76c7478f49d3fe6731b019685c1a5f95a93f Author: Julien Cristau Date: Mon Jun 8 16:18:16 2009 +0200 Bump Standards-Version diff --git a/debian/changelog b/debian/changelog index fcf116c..225b18f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ libdrm (2.4.11-1) UNRELEASED; urgency=low * Also pull in additional fix for libdrm-intel: Only do BO caching up to 64MB objects. * Update libdrm-intel1.symbols and bump shlibs. + * Add README.source from xsfbs. Bump Standards-Version to 3.8.1. -- Julien Cristau Mon, 08 Jun 2009 16:04:56 +0200 diff --git a/debian/control b/debian/control index 27c095f..57c82de 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian X Strike Force Uploaders: Thierry Reding , Julien Cristau , David Nusinow , Brice Goglin Build-Depends: debhelper (>= 5.0.0), libx11-dev, dpkg-dev (>= 1.13.19), quilt (>= 0.40), automake, libtool, pkg-c
libdrm: Changes to 'ubuntu'
debian/changelog |6 ++ 1 file changed, 6 insertions(+) New commits: commit ec53fd22f88fd9760d52f2a3a1a95298cd14eff6 Author: Timo Aaltonen Date: Fri Jul 3 12:04:32 2009 +0300 Merge from Debian unstable. diff --git a/debian/changelog b/debian/changelog index 431e847..b2e8211 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libdrm (2.4.11-1ubuntu1) UNRELEASED; urgency=low + + * Merge from Debian unstable. + + -- Timo Aaltonen Fri, 03 Jul 2009 12:04:01 +0300 + libdrm (2.4.11-1) unstable; urgency=low * New upstream release. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
libdrm: Changes to 'ubuntu'
ChangeLog | 911 +---
configure.ac |9
debian/changelog | 54
debian/control|6
debian/libdrm-intel1.symbols |1
debian/patches/02_libdrm_nouveau_update.patch | 160 --
debian/patches/series |1
debian/rules |8
debian/xsfbs/repack.sh| 32
debian/xsfbs/xsfbs.sh | 66 -
libdrm/intel/intel_bufmgr.h |1
libdrm/intel/intel_bufmgr_fake.c | 19
libdrm/intel/intel_bufmgr_gem.c | 72 +
libdrm/nouveau/Makefile.am|4
libdrm/nouveau/nouveau_bo.c | 25
libdrm/nouveau/nouveau_device.c | 18
libdrm/nouveau/nouveau_drmif.h|3
libdrm/nouveau/nouveau_fence.c| 16
libdrm/nouveau/nouveau_private.h |2
shared-core/i915_reg.h| 1422 ++
tests/Makefile.am | 47
tests/drmtest.c | 117 +-
tests/drmtest.h |3
tests/gem_basic.c |6
tests/gem_flink.c |6
tests/gem_mmap.c |6
tests/gem_readwrite.c |6
tests/getversion.c|3
tests/setversion.c|5
tests/updatedraw.c|5
30 files changed, 2532 insertions(+), 502 deletions(-)
New commits:
commit 4f61f406a484ae6741db2d2fa9d98ca0974cb1f8
Author: Timo Aaltonen
Date: Tue May 12 22:48:11 2009 +0300
Release 2.4.9-2ubuntu1.
diff --git a/debian/changelog b/debian/changelog
index db0398c..c0498e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+libdrm (2.4.9-2ubuntu1) karmic; urgency=low
+
+ * Merge from debian unstable, remaining changes:
+- control:
+ + libdrm-intel1 Replaces libdrm2 (<= 2.4.1-0ubuntu5)
+ + libdrm-dev depends on linux-libc-dev => 2.6.28-5.15 on
+[amd64 armel i386] only, and >= 2.6.28-2.4 on lpia
+ + Remove scary 'built from DRM snapshot' warning from long description of
+libdrm-intel1{,-dbg}
+ + libdrm-dev depends on libdrm-nouveau1
+ + add libdrm-nouveau1{,-dbg} source packages
+- rules:
+ + Add libdrm-nouveau1 and libdrm-nouveau1-dbg package
+ + Enable nouveau experimental api
+- copyright:
+ + Update to include new files from add_libdrm-nouveau.patch
+- libdrm-dev.install: Also install r300_reg.h, via_3d_reg.h,
+ xgi_drm.h, the nouveau headers, and other headers not provided by
+ the kernel.
+
+ -- Bryce Harrington Mon, 11 May 2009 18:56:10 -0700
+
libdrm (2.4.9-2) unstable; urgency=low
* Ship all drm headers on kfreebsd, again.
diff --git a/debian/patches/02_libdrm_nouveau_update.patch
b/debian/patches/02_libdrm_nouveau_update.patch
deleted file mode 100644
index 3fef730..000
--- a/debian/patches/02_libdrm_nouveau_update.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-diff --git a/libdrm/nouveau/Makefile.am b/libdrm/nouveau/Makefile.am
-index 80fb780..688eeca 100644
a/libdrm/nouveau/Makefile.am
-+++ b/libdrm/nouveau/Makefile.am
-@@ -19,7 +19,9 @@ libdrm_nouveau_la_SOURCES = \
- nouveau_bo.c \
- nouveau_resource.c \
- nouveau_dma.c \
-- nouveau_fence.c
-+ nouveau_fence.c \
-+ nouveau_dma.h \
-+ nouveau_private.h
-
- libdrm_nouveaucommonincludedir = ${includedir}/nouveau
- libdrm_nouveaucommoninclude_HEADERS = \
-diff --git a/libdrm/nouveau/nouveau_bo.c b/libdrm/nouveau/nouveau_bo.c
-index 6b9877f..023c6be 100644
a/libdrm/nouveau/nouveau_bo.c
-+++ b/libdrm/nouveau/nouveau_bo.c
-@@ -347,24 +347,25 @@ nouveau_bo_handle_get(struct nouveau_bo *bo, uint32_t
*handle)
- if (!bo || !handle)
- return -EINVAL;
-
-- if (!nvdev->mm_enabled)
-- return -ENODEV;
--
- if (!nvbo->global_handle) {
- struct drm_gem_flink req;
-
- ret = nouveau_bo_kalloc(nvbo, NULL);
- if (ret)
- return ret;
--
-- req.handle = nvbo->handle;
-- ret = ioctl(nvdev->fd, DRM_IOCTL_GEM_FLINK, &req);
-- if (ret) {
-- nouveau_bo_kfree(nvbo);
-- return ret;
-+
-+ if (nvdev->mm_enabled) {
-+ req.handle = nvbo->handle;
-+ ret = ioctl(nvdev->fd, DRM_IOCTL_GEM_FLINK, &req);
-+ if (ret) {
-+ nouveau_b
libdrm: Changes to 'ubuntu'
debian/changelog | 10 +
debian/patches/02_libdrm_nouveau_update.patch | 160 ++
debian/patches/series |1
3 files changed, 171 insertions(+)
New commits:
commit 261dc4b4786dca60167ef83bd43ea55efa1e1682
Author: Christopher James Halse Rogers
Date: Sat Apr 4 19:17:41 2009 +1100
Finalise changelog
diff --git a/debian/changelog b/debian/changelog
index 176504a..e0bfac9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libdrm (2.4.5-0ubuntu5) jaunty; urgency=low
+
+ * debian/patches/02_libdrm_nouveau_update.patch:
+- Pull in upstream changes to libdrm-nouveau.
+ + Fixes a memory leak in fence handling.
+ + Fixes an error the DDX reports in accessing the frontbuffer.
+ + Should be reverted for the next upstream version of libdrm.
+
+ -- Christopher James Halse Rogers Sat, 04 Apr 2009
17:54:51 +1100
+
libdrm (2.4.5-0ubuntu4) jaunty; urgency=low
* debian/libdrm-nouveau1.symbols:
commit a162a1c8507bec0bca25194a10767b9dc2054225
Author: Christopher James Halse Rogers
Date: Sat Apr 4 19:09:25 2009 +1100
debian/patches/02_libdrm_nouveau_update.patch - Pull in changes to
libdrm-nouveau since 2.4.5.
This fixes some errors the DDX with otherwise generate regarding accessing
the front buffer.
diff --git a/debian/patches/02_libdrm_nouveau_update.patch
b/debian/patches/02_libdrm_nouveau_update.patch
new file mode 100644
index 000..3fef730
--- /dev/null
+++ b/debian/patches/02_libdrm_nouveau_update.patch
@@ -0,0 +1,160 @@
+diff --git a/libdrm/nouveau/Makefile.am b/libdrm/nouveau/Makefile.am
+index 80fb780..688eeca 100644
+--- a/libdrm/nouveau/Makefile.am
b/libdrm/nouveau/Makefile.am
+@@ -19,7 +19,9 @@ libdrm_nouveau_la_SOURCES = \
+ nouveau_bo.c \
+ nouveau_resource.c \
+ nouveau_dma.c \
+- nouveau_fence.c
++ nouveau_fence.c \
++ nouveau_dma.h \
++ nouveau_private.h
+
+ libdrm_nouveaucommonincludedir = ${includedir}/nouveau
+ libdrm_nouveaucommoninclude_HEADERS = \
+diff --git a/libdrm/nouveau/nouveau_bo.c b/libdrm/nouveau/nouveau_bo.c
+index 6b9877f..023c6be 100644
+--- a/libdrm/nouveau/nouveau_bo.c
b/libdrm/nouveau/nouveau_bo.c
+@@ -347,24 +347,25 @@ nouveau_bo_handle_get(struct nouveau_bo *bo, uint32_t
*handle)
+ if (!bo || !handle)
+ return -EINVAL;
+
+- if (!nvdev->mm_enabled)
+- return -ENODEV;
+-
+ if (!nvbo->global_handle) {
+ struct drm_gem_flink req;
+
+ ret = nouveau_bo_kalloc(nvbo, NULL);
+ if (ret)
+ return ret;
+-
+- req.handle = nvbo->handle;
+- ret = ioctl(nvdev->fd, DRM_IOCTL_GEM_FLINK, &req);
+- if (ret) {
+- nouveau_bo_kfree(nvbo);
+- return ret;
++
++ if (nvdev->mm_enabled) {
++ req.handle = nvbo->handle;
++ ret = ioctl(nvdev->fd, DRM_IOCTL_GEM_FLINK, &req);
++ if (ret) {
++ nouveau_bo_kfree(nvbo);
++ return ret;
++ }
++
++ nvbo->global_handle = req.name;
++ } else {
++ nvbo->global_handle = nvbo->offset;
+ }
+-
+- nvbo->global_handle = req.name;
+ }
+
+ *handle = nvbo->global_handle;
+@@ -412,6 +413,8 @@ nouveau_bo_del_cb(void *priv)
+ {
+ struct nouveau_bo_priv *nvbo = priv;
+
++ nouveau_fence_ref(NULL, &nvbo->fence);
++ nouveau_fence_ref(NULL, &nvbo->wr_fence);
+ nouveau_bo_kfree(nvbo);
+ free(nvbo);
+ }
+diff --git a/libdrm/nouveau/nouveau_device.c b/libdrm/nouveau/nouveau_device.c
+index b5ac854..a61abb4 100644
+--- a/libdrm/nouveau/nouveau_device.c
b/libdrm/nouveau/nouveau_device.c
+@@ -76,6 +76,22 @@ nouveau_device_open_existing(struct nouveau_device **dev,
int close,
+ }
+ nvdev->base.vm_vram_base = value;
+
++ ret = nouveau_device_get_param(&nvdev->base,
++ NOUVEAU_GETPARAM_FB_SIZE, &value);
++ if (ret) {
++ nouveau_device_close((void *)&nvdev);
++ return ret;
++ }
++ nvdev->vram_aper_size = value;
++
++ ret = nouveau_device_get_param(&nvdev->base,
++ NOUVEAU_GETPARAM_AGP_SIZE, &value);
++ if (ret) {
++ nouveau_device_close((void *)&nvdev);
++ return ret;
++ }
++ nvdev->gart_aper_size = value;
++
+ ret = nouveau_bo_init(&nvdev->base);
+ if (ret) {
+ nouveau_device_close((void *)&nvdev);
+@@ -128,7 +144,7 @@ nouveau_device_close(struct nouveau_device **dev)
+ {
+
libdrm: Changes to 'ubuntu'
debian/changelog |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit d8c5edc1940885d5db084ebf0ab80314405fc974 Author: Christopher James Halse Rogers Date: Mon Mar 30 18:15:44 2009 +1100 Add LP foo, and finalise changelog for upload diff --git a/debian/changelog b/debian/changelog index c3b01ac..176504a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -libdrm (2.4.5-0ubuntu4) UNRELEASED; urgency=low +libdrm (2.4.5-0ubuntu4) jaunty; urgency=low * debian/libdrm-nouveau1.symbols: - Fix thinko copied over from libdrm-intel1.symbols. The file should specify libdrm-nouveau1 as the corresponding package, not libdrm2. Fixes xserver-xorg-video-nouveau failing to depend on libdrm-nouveau1 + (LP: #350925) * debian/control: - There's no good reason to restrict the dependency of libdrm-dev on libdrm-nouveau1 to x86 architectures. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
libdrm: Changes to 'ubuntu'
debian/changelog | 12
debian/control |2 +-
debian/libdrm-nouveau1.symbols |2 +-
3 files changed, 14 insertions(+), 2 deletions(-)
New commits:
commit ffe76ed965ab7b195f983211829ba6fa81cbebf2
Author: Christopher James Halse Rogers
Date: Sun Mar 29 17:33:52 2009 +1100
Add changelog entries
diff --git a/debian/changelog b/debian/changelog
index da7d5e0..c3b01ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+libdrm (2.4.5-0ubuntu4) UNRELEASED; urgency=low
+
+ * debian/libdrm-nouveau1.symbols:
+- Fix thinko copied over from libdrm-intel1.symbols. The file should
+ specify libdrm-nouveau1 as the corresponding package, not libdrm2.
+ Fixes xserver-xorg-video-nouveau failing to depend on libdrm-nouveau1
+ * debian/control:
+- There's no good reason to restrict the dependency of libdrm-dev on
+ libdrm-nouveau1 to x86 architectures.
+
+ -- Christopher James Halse Rogers Sun, 29 Mar 2009
17:32:31 +1100
+
libdrm (2.4.5-0ubuntu3) jaunty; urgency=low
* debian/control: libdrm-dev should also depend on libdrm-nouveau1
commit b829584be28d0f315bed1ad8dae1d26aadf8462e
Author: Christopher James Halse Rogers
Date: Sun Mar 29 17:28:31 2009 +1100
Urgh! Thinko 2: libdrm-nouveau1.symbols should specify libdrm-nouveau1 as
the corresponding package, not libdrm2
diff --git a/debian/libdrm-nouveau1.symbols b/debian/libdrm-nouveau1.symbols
index 775e5ed..f9686a7 100644
--- a/debian/libdrm-nouveau1.symbols
+++ b/debian/libdrm-nouveau1.symbols
@@ -1,4 +1,4 @@
-libdrm_nouveau.so.1 libdrm2 #MINVER#
+libdrm_nouveau.so.1 libdrm-nouveau1 #MINVER#
d...@base 2.4.4
nouveau_bo_b...@base 2.4.4
nouveau_bo_emit_buf...@base 2.4.4
commit 3caa288a9083576e8295a12ec36b34206f7a6dfa
Author: Christopher James Halse Rogers
Date: Sun Mar 29 17:23:37 2009 +1100
Fix thinko: there's no reason why libdrm-dev should depend on
libdrm-nouveau1 only on x86 architectures.
diff --git a/debian/control b/debian/control
index 05ad831..7fee6e0 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Section: libdevel
Architecture: any
Depends: libdrm2 (= ${binary:Version}),
libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
- libdrm-nouveau1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64
kfreebsd-i386],
+ libdrm-nouveau1 (= ${binary:Version}),
linux-libc-dev (>= 2.6.28-5.15) [amd64 armel i386], linux-libc-dev (>=
2.6.28-2.4) [lpia]
Replaces: linux-libc-dev (<= 2.6.28-3.4)
Description: Userspace interface to kernel DRM services -- development files
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
libdrm: Changes to 'ubuntu'
debian/changelog |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit d1e02058b09ae153ef2e25f0c1c882fccc1d36a8 Author: Bryce Harrington Date: Sat Mar 21 16:39:56 2009 -0700 update changelog for release diff --git a/debian/changelog b/debian/changelog index d91db42..da7d5e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ -libdrm (2.4.5-0ubuntu3) UNRELEASED; urgency=low +libdrm (2.4.5-0ubuntu3) jaunty; urgency=low * debian/control: libdrm-dev should also depend on libdrm-nouveau1 Fixes xserver-xorg-video-nouveau FTBFS on amd64. +(LP: #346556) -- Christopher James Halse Rogers Sat, 21 Mar 2009 11:17:59 +1100 -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
libdrm: Changes to 'ubuntu'
debian/changelog |7 +++
debian/control |1 +
2 files changed, 8 insertions(+)
New commits:
commit 96973e1e87812d27278f459f3f3a549445b8b5b4
Author: Christopher James Halse Rogers
Date: Sat Mar 21 11:18:30 2009 +1100
debian/control: libdrm-dev should also depend on libdrm-nouveau1 Fixes
xserver-xorg-video-nouveau FTBFS on amd64.
diff --git a/debian/changelog b/debian/changelog
index d0fce02..d91db42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdrm (2.4.5-0ubuntu3) UNRELEASED; urgency=low
+
+ * debian/control: libdrm-dev should also depend on libdrm-nouveau1
+Fixes xserver-xorg-video-nouveau FTBFS on amd64.
+
+ -- Christopher James Halse Rogers Sat, 21 Mar 2009
11:17:59 +1100
+
libdrm (2.4.5-0ubuntu2) jaunty; urgency=low
* debian/control: nouveau package description should refer to it, not
diff --git a/debian/control b/debian/control
index 2494cef..05ad831 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Section: libdevel
Architecture: any
Depends: libdrm2 (= ${binary:Version}),
libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
+ libdrm-nouveau1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64
kfreebsd-i386],
linux-libc-dev (>= 2.6.28-5.15) [amd64 armel i386], linux-libc-dev (>=
2.6.28-2.4) [lpia]
Replaces: linux-libc-dev (<= 2.6.28-3.4)
Description: Userspace interface to kernel DRM services -- development files
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
libdrm: Changes to 'ubuntu'
debian/changelog | 10 ++
debian/control |6 +++---
2 files changed, 13 insertions(+), 3 deletions(-)
New commits:
commit 6026139d1d62afb3534adeaacddfcfdb7d574390
Author: Bryce Harrington
Date: Wed Mar 18 19:08:08 2009 -0700
update changelog for release
diff --git a/debian/changelog b/debian/changelog
index 317b844..d0fce02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
-libdrm (2.4.5-0ubuntu2) UNRELEASED; urgency=low
+libdrm (2.4.5-0ubuntu2) jaunty; urgency=low
+ * debian/control: nouveau package description should refer to it, not
+intel. (LP: #341294)
* debian/libdrm-dev.install: Also install r300_reg.h, via_3d_reg.h, and
xgi_drm.h.
* debian/rules: Enforce --fail-missing again
- -- Bryce Harrington Tue, 10 Mar 2009 10:54:31 -0700
+ -- Bryce Harrington Wed, 18 Mar 2009 18:50:31 -0700
libdrm (2.4.5-0ubuntu1) jaunty; urgency=low
commit 4a3d9e78f6be9d6b2f0473a7588a7d82feabcc6e
Author: Bryce Harrington
Date: Wed Mar 18 18:49:19 2009 -0700
s/intel/nouveau/ for the nouveau-specific packages.
diff --git a/debian/changelog b/debian/changelog
index 50ace8b..317b844 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libdrm (2.4.5-0ubuntu2) UNRELEASED; urgency=low
+
+ * debian/libdrm-dev.install: Also install r300_reg.h, via_3d_reg.h, and
+xgi_drm.h.
+ * debian/rules: Enforce --fail-missing again
+
+ -- Bryce Harrington Tue, 10 Mar 2009 10:54:31 -0700
+
libdrm (2.4.5-0ubuntu1) jaunty; urgency=low
[Bryce Harrington]
diff --git a/debian/control b/debian/control
index b3a8d96..2494cef 100644
--- a/debian/control
+++ b/debian/control
@@ -80,8 +80,8 @@ Package: libdrm-nouveau1
Section: libs
Architecture: 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
+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.
@@ -91,7 +91,7 @@ Section: libdevel
Priority: extra
Architecture: any
Depends: libdrm-nouveau1 (= ${binary:Version}), ${misc:Depends}
-Description: Userspace interface to intel-specific kernel DRM services --
debugging symbols
+Description: Userspace interface to nouveau-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
libdrm: Changes to 'ubuntu'
debian/libdrm-dev.install |3 +++ debian/rules |2 +- 2 files changed, 4 insertions(+), 1 deletion(-) New commits: commit c6c38f3fd5366880237d34a7fca5d372b3bb88b8 Author: Bryce Harrington Date: Tue Mar 10 10:53:26 2009 -0700 Also install 3 headers drm provides, and enforce 'fail-missing' again diff --git a/debian/libdrm-dev.install b/debian/libdrm-dev.install index 076ed9c..e93cc89 100644 --- a/debian/libdrm-dev.install +++ b/debian/libdrm-dev.install @@ -3,6 +3,9 @@ usr/include/drm/drm_mode.h usr/include/drm/mach64_drm.h usr/include/drm/nouveau_drm.h usr/include/drm/nouveau_drmif.h +usr/include/drm/r300_reg.h +usr/include/drm/via_3d_reg.h +usr/include/drm/xgi_drm.h usr/include/intel_bufmgr.h usr/include/xf86drm.h usr/include/xf86drmMode.h diff --git a/debian/rules b/debian/rules index 4e559a2..b7e0a83 100755 --- a/debian/rules +++ b/debian/rules @@ -96,7 +96,7 @@ binary-arch: build install dh_installchangelogs ChangeLog dh_installdocs dh_installexamples - dh_install -s --sourcedir=debian/tmp -X.la --list-missing + dh_install -s --sourcedir=debian/tmp -X.la --fail-missing dh_link dh_strip -plibdrm2 --dbg-package=libdrm2-dbg dh_strip -plibdrm-intel1 --dbg-package=libdrm-intel1-dbg -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
libdrm: Changes to 'ubuntu'
debian/changelog |4 +++- debian/copyright | 23 +++ 2 files changed, 26 insertions(+), 1 deletion(-) New commits: commit 2efeaa933a66bf82941889d65826ac3dbd4d9346 Author: Christopher James Halse Rogers Date: Thu Feb 12 10:41:23 2009 +1100 Add some copyright love diff --git a/debian/changelog b/debian/changelog index 8bac015..0152a06 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,8 +21,10 @@ libdrm (2.4.4-0ubuntu7) UNRELEASED; urgency=low * debian/libdrm-dev.install: + Also install the libdrm-nouveau headers; these aren't going to be shipped by the kernel any time soon. + * debian/copyright: ++ Update to include new files from add_libdrm-nouveau.patch - -- Christopher James Halse Rogers Wed, 11 Feb 2009 18:12:41 +1100 + -- Christopher James Halse Rogers Thu, 12 Feb 2009 10:40:22 +1100 libdrm (2.4.4-0ubuntu6) jaunty; urgency=low diff --git a/debian/copyright b/debian/copyright index 60c5785..807538a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -56,3 +56,26 @@ License: WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + + +Files: debian/patches/02_add_libdrm-nouveau.patch +Copyright: © 2007-2008 Nouveau Project +License: BSD + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF + OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
libdrm: Changes to 'ubuntu'
debian/changelog |3 +++
debian/libdrm-dev.install |2 ++
2 files changed, 5 insertions(+)
New commits:
commit eed39a160b13198866b6e73e7610d4e4b3f4bdef
Author: Christopher James Halse Rogers
Date: Thu Feb 12 09:56:59 2009 +1100
nouveau_drmif.h is part of the userspace headers. Include it in libdrm-dev
diff --git a/debian/libdrm-dev.install b/debian/libdrm-dev.install
index 54a927a..076ed9c 100644
--- a/debian/libdrm-dev.install
+++ b/debian/libdrm-dev.install
@@ -2,6 +2,7 @@ usr/include/nouveau/*
usr/include/drm/drm_mode.h
usr/include/drm/mach64_drm.h
usr/include/drm/nouveau_drm.h
+usr/include/drm/nouveau_drmif.h
usr/include/intel_bufmgr.h
usr/include/xf86drm.h
usr/include/xf86drmMode.h
commit b1953800960b15881dd6b2a70356c17c8389e82a
Author: Christopher James Halse Rogers
Date: Thu Feb 12 09:44:38 2009 +1100
Install the libdrm-nouveau headers in libdrm-dev
The DDX needs them to build, and the kernel's not going to be shipping them
anytime soon
diff --git a/debian/changelog b/debian/changelog
index 8943b71..8bac015 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ libdrm (2.4.4-0ubuntu7) UNRELEASED; urgency=low
* debian/control:
+ Remove scary 'built from DRM snapshot' warning from long description of
libdrm-intel1{,-dbg}
+ * debian/libdrm-dev.install:
++ Also install the libdrm-nouveau headers; these aren't going to be shipped
+ by the kernel any time soon.
-- Christopher James Halse Rogers Wed, 11 Feb 2009
18:12:41 +1100
diff --git a/debian/libdrm-dev.install b/debian/libdrm-dev.install
index e0a6e8d..54a927a 100644
--- a/debian/libdrm-dev.install
+++ b/debian/libdrm-dev.install
@@ -1,3 +1,4 @@
+usr/include/nouveau/*
usr/include/drm/drm_mode.h
usr/include/drm/mach64_drm.h
usr/include/drm/nouveau_drm.h
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
libdrm: Changes to 'ubuntu'
debian/patches/04_update_nouveau_header.patch | 174 ++
1 file changed, 174 insertions(+)
New commits:
commit 9f4e58ac7f1130c20d4927a873d6a2fdc8fe7126
Author: Christopher James Halse Rogers
Date: Thu Feb 12 08:21:48 2009 +1100
BAH! Actually commit 04_update_nouveau_header.patch
diff --git a/debian/patches/04_update_nouveau_header.patch
b/debian/patches/04_update_nouveau_header.patch
new file mode 100644
index 000..eee110b
--- /dev/null
+++ b/debian/patches/04_update_nouveau_header.patch
@@ -0,0 +1,174 @@
+From cb85630c02ddb46f168064befb2296d46b69f57a Mon Sep 17 00:00:00 2001
+From: Ben Skeggs
+Date: Fri, 30 Jan 2009 01:18:54 +
+Subject: nouveau: bring in new mm api definitions, without the actual mm code
+
+Use of the new bits is guarded with a mm_enabled=0 hardcode.
+---
+diff --git a/shared-core/nouveau_drm.h b/shared-core/nouveau_drm.h
+index a99c615..4147f35 100644
+--- a/shared-core/nouveau_drm.h
b/shared-core/nouveau_drm.h
+@@ -25,13 +25,26 @@
+ #ifndef __NOUVEAU_DRM_H__
+ #define __NOUVEAU_DRM_H__
+
+-#define NOUVEAU_DRM_HEADER_PATCHLEVEL 11
++#define NOUVEAU_DRM_HEADER_PATCHLEVEL 12
+
+ struct drm_nouveau_channel_alloc {
+ uint32_t fb_ctxdma_handle;
+ uint32_t tt_ctxdma_handle;
+
+ int channel;
++
++ /* Notifier memory */
++ drm_handle_t notifier;
++ int notifier_size;
++
++ /* DRM-enforced subchannel assignments */
++ struct {
++ uint32_t handle;
++ uint32_t grclass;
++ } subchan[8];
++ uint32_t nr_subchan;
++
++/* !MM_ENABLED ONLY */
+ uint32_t put_base;
+ /* FIFO control regs */
+ drm_handle_t ctrl;
+@@ -39,9 +52,6 @@ struct drm_nouveau_channel_alloc {
+ /* DMA command buffer */
+ drm_handle_t cmdbuf;
+ int cmdbuf_size;
+- /* Notifier memory */
+- drm_handle_t notifier;
+- int notifier_size;
+ };
+
+ struct drm_nouveau_channel_free {
+@@ -126,6 +136,8 @@ struct drm_nouveau_mem_tile {
+ #define NOUVEAU_GETPARAM_AGP_SIZE9
+ #define NOUVEAU_GETPARAM_PCI_PHYSICAL10
+ #define NOUVEAU_GETPARAM_CHIPSET_ID 11
++#define NOUVEAU_GETPARAM_MM_ENABLED 12
++#define NOUVEAU_GETPARAM_VM_VRAM_BASE13
+ struct drm_nouveau_getparam {
+ uint64_t param;
+ uint64_t value;
+@@ -138,6 +150,100 @@ struct drm_nouveau_setparam {
+ uint64_t value;
+ };
+
++#define NOUVEAU_GEM_DOMAIN_CPU (1 << 0)
++#define NOUVEAU_GEM_DOMAIN_VRAM (1 << 1)
++#define NOUVEAU_GEM_DOMAIN_GART (1 << 2)
++#define NOUVEAU_GEM_DOMAIN_NOMAP (1 << 3)
++#define NOUVEAU_GEM_DOMAIN_TILE (1 << 30)
++#define NOUVEAU_GEM_DOMAIN_TILE_ZETA (1 << 31)
++
++struct drm_nouveau_gem_new {
++ uint64_t size;
++ uint32_t channel_hint;
++ uint32_t align;
++ uint32_t handle;
++ uint32_t domain;
++ uint32_t offset;
++};
++
++struct drm_nouveau_gem_pushbuf_bo {
++ uint64_t user_priv;
++ uint32_t handle;
++ uint32_t read_domains;
++ uint32_t write_domains;
++ uint32_t valid_domains;
++ uint32_t presumed_ok;
++ uint32_t presumed_domain;
++ uint64_t presumed_offset;
++};
++
++#define NOUVEAU_GEM_RELOC_LOW (1 << 0)
++#define NOUVEAU_GEM_RELOC_HIGH (1 << 1)
++#define NOUVEAU_GEM_RELOC_OR (1 << 2)
++struct drm_nouveau_gem_pushbuf_reloc {
++ uint32_t bo_index;
++ uint32_t reloc_index;
++ uint32_t flags;
++ uint32_t data;
++ uint32_t vor;
++ uint32_t tor;
++};
++
++#define NOUVEAU_GEM_MAX_BUFFERS 1024
++#define NOUVEAU_GEM_MAX_RELOCS 1024
++
++struct drm_nouveau_gem_pushbuf {
++ uint32_t channel;
++ uint32_t nr_dwords;
++ uint32_t nr_buffers;
++ uint32_t nr_relocs;
++ uint64_t dwords;
++ uint64_t buffers;
++ uint64_t relocs;
++};
++
++struct drm_nouveau_gem_pushbuf_call {
++ uint32_t channel;
++ uint32_t handle;
++ uint32_t offset;
++ uint32_t nr_buffers;
++ uint32_t nr_relocs;
++ uint32_t pad0;
++ uint64_t buffers;
++ uint64_t relocs;
++};
++
++struct drm_nouveau_gem_pin {
++ uint32_t handle;
++ uint32_t domain;
++ uint64_t offset;
++};
++
++struct drm_nouveau_gem_unpin {
++ uint32_t handle;
++};
++
++struct drm_nouveau_gem_mmap {
++ uint32_t handle;
++ uint32_t pad;
++ uint64_t vaddr;
++};
++
++struct drm_nouveau_gem_cpu_prep {
++ uint32_t handle;
++};
++
++struct drm_nouveau_gem_cpu_fini {
++ uint32_t handle;
++};
++
++struct drm_nouveau_gem_tile {
++ uint32_t handle;
++ uint32_t delta;
++ uint32_t size;
++ uint32_t flags;
++};
++
+ enum nouveau_card_type {
+ NV_UNKNOWN =0,
+ NV_04 =4,
+@@ -180,5 +286,14 @@ struct drm_nouveau_sarea {
+ #define DRM_NOUVEAU_MEM_TILE 0x0a
+ #define DRM_NOUVEAU_SUSPEND0x0b
+ #define DRM_NOUVEAU_RESUME 0x0c
++#define DRM_NOUVEAU_GEM_NEW0x40
++#define
libdrm: Changes to 'ubuntu'
debian/changelog| 23
debian/control | 30
debian/libdrm-nouveau1.install |1
debian/libdrm-nouveau1.symbols | 50
debian/patches/02_add_libdrm-nouveau.patch |11470
debian/patches/03_fix_unfreed_buffers.patch | 64
debian/patches/series |3
debian/rules|2
8 files changed, 11635 insertions(+), 8 deletions(-)
New commits:
commit ee5f7cb7a175c0ec32599bae7942ccc90bb306ab
Author: Christopher James Halse Rogers
Date: Wed Feb 11 21:20:35 2009 +1100
Add populated symbols file
diff --git a/debian/changelog b/debian/changelog
index 9a5f80c..8943b71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,10 @@ libdrm (2.4.4-0ubuntu7) UNRELEASED; urgency=low
Required for libdrm-nouveau.
* debian/rules:
* debian/control:
+ * debian/libdrm-nouveau1.install
+ Add libdrm-nouveau1 and libdrm-nouveau1-dbg package
+ * debian/libdrm-nouveau1.symbols:
++ Add initial symbols file.
* debian/control:
+ Remove scary 'built from DRM snapshot' warning from long description of
libdrm-intel1{,-dbg}
diff --git a/debian/libdrm-nouveau1.symbols b/debian/libdrm-nouveau1.symbols
new file mode 100644
index 000..775e5ed
--- /dev/null
+++ b/debian/libdrm-nouveau1.symbols
@@ -0,0 +1,50 @@
+libdrm_nouveau.so.1 libdrm2 #MINVER#
+ d...@base 2.4.4
+ nouveau_bo_b...@base 2.4.4
+ nouveau_bo_emit_buf...@base 2.4.4
+ nouveau_bo_f...@base 2.4.4
+ nouveau_bo_handle_...@base 2.4.4
+ nouveau_bo_handle_...@base 2.4.4
+ nouveau_bo_i...@base 2.4.4
+ nouveau_bo_...@base 2.4.4
+ nouveau_bo_...@base 2.4.4
+ nouveau_bo_...@base 2.4.4
+ nouveau_bo_...@base 2.4.4
+ nouveau_bo_taked...@base 2.4.4
+ nouveau_bo_t...@base 2.4.4
+ nouveau_bo_un...@base 2.4.4
+ nouveau_bo_un...@base 2.4.4
+ nouveau_bo_u...@base 2.4.4
+ nouveau_bo_validate_n...@base 2.4.4
+ nouveau_channel_al...@base 2.4.4
+ nouveau_channel_f...@base 2.4.4
+ nouveau_device_cl...@base 2.4.4
+ nouveau_device_get_pa...@base 2.4.4
+ nouveau_device_o...@base 2.4.4
+ nouveau_device_open_exist...@base 2.4.4
+ nouveau_device_set_pa...@base 2.4.4
+ nouveau_dma_channel_i...@base 2.4.4
+ nouveau_dma_kick...@base 2.4.4
+ nouveau_dma_w...@base 2.4.4
+ nouveau_fence_e...@base 2.4.4
+ nouveau_fence_fl...@base 2.4.4
+ nouveau_fence_...@base 2.4.4
+ nouveau_fence_...@base 2.4.4
+ nouveau_fence_signal...@base 2.4.4
+ nouveau_fence_w...@base 2.4.4
+ nouveau_grobj_al...@base 2.4.4
+ nouveau_grobj_autob...@base 2.4.4
+ nouveau_grobj_f...@base 2.4.4
+ nouveau_grobj_...@base 2.4.4
+ nouveau_notifier_al...@base 2.4.4
+ nouveau_notifier_f...@base 2.4.4
+ nouveau_notifier_re...@base 2.4.4
+ nouveau_notifier_return_...@base 2.4.4
+ nouveau_notifier_sta...@base 2.4.4
+ nouveau_notifier_wait_sta...@base 2.4.4
+ nouveau_pushbuf_emit_re...@base 2.4.4
+ nouveau_pushbuf_fl...@base 2.4.4
+ nouveau_pushbuf_i...@base 2.4.4
+ nouveau_resource_al...@base 2.4.4
+ nouveau_resource_f...@base 2.4.4
+ nouveau_resource_i...@base 2.4.4
commit 314569bf5bd2ab0b34d43b426248222eb25b7f16
Author: Christopher James Halse Rogers
Date: Wed Feb 11 18:56:20 2009 +1100
Add patch to update nouveau_drm.h to new patchlevel
diff --git a/debian/changelog b/debian/changelog
index 5e6fd78..9a5f80c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ libdrm (2.4.4-0ubuntu7) UNRELEASED; urgency=low
+ Add commits from drm master adding a libdrm-nouveau library, and
include the latest fixes. This library is now required by the DDX
component.
+ * debian/patchs/04_update_nouveau_header
++ Update the nouveau DRM header to the new patchlevel. Pulled from
+ upstream, with the non-userspace components removed from the patch.
+ Required for libdrm-nouveau.
* debian/rules:
* debian/control:
+ Add libdrm-nouveau1 and libdrm-nouveau1-dbg package
diff --git a/debian/patches/series b/debian/patches/series
index 660ce57..300de28 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
01_default_perms.diff
02_add_libdrm-nouveau.patch
03_fix_unfreed_buffers.patch
+04_update_nouveau_header.patch
commit 371b78f94d84d816a6b1877ac85bd34786328ee7
Author: Christopher James Halse Rogers
Date: Wed Feb 11 18:53:41 2009 +1100
Remove accidental 'expect this to be unstable' warning from long
description of libdrm-intel
diff --git a/debian/changelog b/debian/changelog
index 894e567..5e6fd78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,11 @@ libdrm (2.4.4-0ubuntu7) UNRELEASED; urgency=low
include the latest fixes. This library is now required by the DDX
component.
* debian/rules:
-+ Add libdrm-nouveau1 package
+ * debian/control:
++ Add libdrm-nouveau1 and libdrm-nouveau1-dbg package
+ * debian/control:
++ Remove scary 'built from DRM snapshot' warning from long description of
+
libdrm: Changes to 'ubuntu'
debian/changelog |7 +++
debian/control |2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 58b7e340e8143f33136bbfe0b541132e3bc458da
Author: Loïc Minier
Date: Wed Feb 4 00:09:06 2009 +0100
Bump dep on linux-libc-dev dep to >= 2.6.28-1.4 on lpia
Bump dep on linux-libc-dev dep to >= 2.6.28-1.4 on lpia as this version of
the headers now include a compatibility #define which mesa requires.
diff --git a/debian/changelog b/debian/changelog
index 5dd3f01..ea8ec6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdrm (2.4.4-0ubuntu6) jaunty; urgency=low
+
+ * Bump dep on linux-libc-dev dep to >= 2.6.28-1.4 on lpia as this version of
+the headers now include a compatibility #define which mesa requires.
+
+ -- Loic Minier Tue, 03 Feb 2009 23:20:27 +0100
+
libdrm (2.4.4-0ubuntu5) jaunty; urgency=low
* Revert XS-Original-Vcs-* to Vcs-*, this *is* maintained in Git, sorry.
diff --git a/debian/control b/debian/control
index 1a72c1e..508916c 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Section: libdevel
Architecture: any
Depends: libdrm2 (= ${binary:Version}),
libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
- linux-libc-dev (>= 2.6.28-5.15) [amd64 armel i386], linux-libc-dev (>=
2.6.28-1.1) [lpia]
+ linux-libc-dev (>= 2.6.28-5.15) [amd64 armel i386], linux-libc-dev (>=
2.6.28-2.4) [lpia]
Replaces: linux-libc-dev (<= 2.6.28-3.4)
Description: Userspace interface to kernel DRM services -- development files
This library implements the userspace interface to the kernel DRM
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
libdrm: Changes to 'ubuntu'
debian/changelog |6 +-
debian/control |2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit dd11e8db011c17a194d62b70b14ac04c6ec6a6d7
Author: Loïc Minier
Date: Tue Feb 3 12:44:16 2009 +0100
Split the linux-libc-dev dep on lpia
Split the linux-libc-dev dep on lpia and depend on >= 2.6.28-1.1 on lpia
-- the version differs because it's built from linux-lpia instead of
linux; this is not going to be fixable anytime soon, so we should be
careful to use arch-specific versions for linux-libc-dev deps/bdeps.
diff --git a/debian/changelog b/debian/changelog
index 196acfa..5dd3f01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
-libdrm (2.4.4-0ubuntu5) UNRELEASED; urgency=low
+libdrm (2.4.4-0ubuntu5) jaunty; urgency=low
* Revert XS-Original-Vcs-* to Vcs-*, this *is* maintained in Git, sorry.
+ * Split the linux-libc-dev dep on lpia and depend on >= 2.6.28-1.1 on lpia
+-- the version differs because it's built from linux-lpia instead of
+linux; this is not going to be fixable anytime soon, so we should be
+careful to use arch-specific versions for linux-libc-dev deps/bdeps.
-- Loic Minier Sun, 01 Feb 2009 16:25:46 +0100
diff --git a/debian/control b/debian/control
index 158fd57..1a72c1e 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Section: libdevel
Architecture: any
Depends: libdrm2 (= ${binary:Version}),
libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
- linux-libc-dev (>= 2.6.28-5.15) [amd64 armel i386 lpia]
+ linux-libc-dev (>= 2.6.28-5.15) [amd64 armel i386], linux-libc-dev (>=
2.6.28-1.1) [lpia]
Replaces: linux-libc-dev (<= 2.6.28-3.4)
Description: Userspace interface to kernel DRM services -- development files
This library implements the userspace interface to the kernel DRM
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
libdrm: Changes to 'ubuntu'
debian/changelog | 16
debian/control |2 +-
2 files changed, 17 insertions(+), 1 deletion(-)
New commits:
commit bea034222a4b5292eb7204098161e9f4e1cc5b9d
Author: Loïc Minier
Date: Sun Feb 1 16:26:23 2009 +0100
Revert XS-Original-Vcs-* to Vcs-*, this *is* maintained in Git, sorry.
diff --git a/debian/changelog b/debian/changelog
index 23ae9cb..196acfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.4-0ubuntu5) UNRELEASED; urgency=low
+
+ * Revert XS-Original-Vcs-* to Vcs-*, this *is* maintained in Git, sorry.
+
+ -- Loic Minier Sun, 01 Feb 2009 16:25:46 +0100
+
libdrm (2.4.4-0ubuntu4) jaunty; urgency=low
* Also depend on linux-libc-dev on [lpia] as linux-libc-dev_2.6.28-1.2_lpia
diff --git a/debian/control b/debian/control
index 631bad9..158fd57 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ Uploaders: Thierry Reding , Julien Cristau
= 5.0.0), libx11-dev, dpkg-dev (>= 1.13.19), quilt
(>= 0.40), automake, libtool, pkg-config, libpthread-stubs0-dev
Standards-Version: 3.7.3
Section: libs
-XS-Original-Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdrm
-XS-Original-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libdrm.git
+Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdrm
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libdrm.git
Package: libdrm-dev
Section: libdevel
commit 586d28941d1020fcd1250e796e175ee59d1c613b
Author: Loïc Minier
Date: Sun Feb 1 16:25:41 2009 +0100
Import 2.4.4-0ubuntu4.
diff --git a/debian/changelog b/debian/changelog
index 9d9084a..23ae9cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libdrm (2.4.4-0ubuntu4) jaunty; urgency=low
+
+ * Also depend on linux-libc-dev on [lpia] as linux-libc-dev_2.6.28-1.2_lpia
+has the drm headers; the avoidance of this dep on other arches just helps
+installability, but because the headers are missing you're unlikely to do
+anything with the lib anyway. The solution is a linux-ports upload.
+ * Rename Vcs-* to XS-Original-Vcs-*.
+
+ -- Loic Minier Sat, 31 Jan 2009 23:50:33 +0100
+
libdrm (2.4.4-0ubuntu3) jaunty; urgency=low
* libdrm-dev Depends on linux-libc-dev only on [amd64 armel i386]
diff --git a/debian/control b/debian/control
index 084f386..631bad9 100644
--- a/debian/control
+++ b/debian/control
@@ -6,15 +6,15 @@ Uploaders: Thierry Reding , Julien Cristau
= 5.0.0), libx11-dev, dpkg-dev (>= 1.13.19), quilt
(>= 0.40), automake, libtool, pkg-config, libpthread-stubs0-dev
Standards-Version: 3.7.3
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
+XS-Original-Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdrm
+XS-Original-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libdrm.git
Package: libdrm-dev
Section: libdevel
Architecture: any
Depends: libdrm2 (= ${binary:Version}),
libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
- linux-libc-dev (>= 2.6.28-5.15) [amd64 armel i386]
+ linux-libc-dev (>= 2.6.28-5.15) [amd64 armel i386 lpia]
Replaces: linux-libc-dev (<= 2.6.28-3.4)
Description: Userspace interface to kernel DRM services -- development files
This library implements the userspace interface to the kernel DRM
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
libdrm: Changes to 'ubuntu'
debian/changelog |7 +++
debian/control |2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 8a3a75cc8a345d32a873ca8eaf8b9b0cdf95d273
Author: Timo Aaltonen
Date: Sat Jan 31 12:37:24 2009 +0200
Release 2.4.4-0ubuntu3
diff --git a/debian/changelog b/debian/changelog
index e6130af..9d9084a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdrm (2.4.4-0ubuntu3) UNRELEASED; urgency=low
+libdrm (2.4.4-0ubuntu3) jaunty; urgency=low
* libdrm-dev Depends on linux-libc-dev only on [amd64 armel i386]
until the other archs have caught up.
- -- Timo Aaltonen Sat, 31 Jan 2009 12:33:21 +0200
+ -- Timo Aaltonen Sat, 31 Jan 2009 12:37:12 +0200
libdrm (2.4.4-0ubuntu2) jaunty; urgency=low
commit 98c218835c2fa4a08146d09b8a814dfdc2140790
Author: Timo Aaltonen
Date: Sat Jan 31 12:34:33 2009 +0200
libdrm-dev Depends on linux-libc-dev only on [amd64 armel i386] until the
other archs have caught up.
diff --git a/debian/changelog b/debian/changelog
index 423e24f..e6130af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdrm (2.4.4-0ubuntu3) UNRELEASED; urgency=low
+
+ * libdrm-dev Depends on linux-libc-dev only on [amd64 armel i386]
+until the other archs have caught up.
+
+ -- Timo Aaltonen Sat, 31 Jan 2009 12:33:21 +0200
+
libdrm (2.4.4-0ubuntu2) jaunty; urgency=low
* debian/control: Add a missing comma to libdrm-dev's Depends.
diff --git a/debian/control b/debian/control
index a5ad6b0..084f386 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Section: libdevel
Architecture: any
Depends: libdrm2 (= ${binary:Version}),
libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
- linux-libc-dev (>= 2.6.28-5.15)
+ linux-libc-dev (>= 2.6.28-5.15) [amd64 armel i386]
Replaces: linux-libc-dev (<= 2.6.28-3.4)
Description: Userspace interface to kernel DRM services -- development files
This library implements the userspace interface to the kernel DRM
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
libdrm: Changes to 'ubuntu'
debian/changelog |6 ++
debian/control |2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 0efb049951e7c03a42a1eb83449afbae58dd55d6
Author: Timo Aaltonen
Date: Fri Jan 23 14:17:30 2009 +0200
Add a missing comma to libdrm-dev's Depends...
diff --git a/debian/changelog b/debian/changelog
index 46ec330..423e24f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.4-0ubuntu2) jaunty; urgency=low
+
+ * debian/control: Add a missing comma to libdrm-dev's Depends.
+
+ -- Timo Aaltonen Fri, 23 Jan 2009 13:45:58 +0200
+
libdrm (2.4.4-0ubuntu1) jaunty; urgency=low
* Merge with Debian experimental, remaining changes:
diff --git a/debian/control b/debian/control
index dedb821..a5ad6b0 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Package: libdrm-dev
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],
linux-libc-dev (>= 2.6.28-5.15)
Replaces: linux-libc-dev (<= 2.6.28-3.4)
Description: Userspace interface to kernel DRM services -- development files
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
libdrm: Changes to 'ubuntu'
New branch 'ubuntu' available with the following commits: commit 1fb06c7a58ca6e7dce1b3506b492a0abd1163867 Author: Timo Aaltonen Date: Fri Jan 23 10:19:19 2009 +0200 Release 2.4.4-0ubuntu1. commit ffaeab544bd19c86d7dd446017d9b74d52bb0196 Author: Timo Aaltonen Date: Fri Jan 23 10:10:08 2009 +0200 Bump the libdrm-dev dependency of linux-libc-dev the previous version was broken. commit 942daaea95c75fa49230a51c930a81642f13337d Author: Timo Aaltonen Date: Wed Jan 21 16:09:11 2009 +0200 Include nouveau_drm.h in libdrm-dev. commit 3e40a0ec0c0b3162f2e93f7a755df5220c0b8e8f Author: Timo Aaltonen Date: Wed Jan 21 15:56:58 2009 +0200 libdrm-dev Depends on linux-libc-dev (>= 2.6.28-5.12) commit 00631c08b4534e01796b8f9ed95c0b8f11f5fb2a Author: Timo Aaltonen Date: Fri Jan 16 17:52:52 2009 +0200 Initial Ubuntu commit -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
