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 <tjaalton@ubuntu.com>
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 <tjaalton@ubuntu.com> Mon, 03 Sep 2012 17:26:35 +0300
+
libdrm (2.4.39-1) UNRELEASED; urgency=low
[ Maarten Lankhorst ]
commit f1c5b014206e6eac3cf5b9db55f6cf3d12d20475
Author: Sven Joachim <svenjoac@gmx.de>
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 <raof@ubuntu.com> 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 0000000..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 <svenjoac@gmx.de>
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 <raof@ubuntu.com> 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 (>= 2.4.31)' -- -c4
+ dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (>= 2.4.39)' -- -c4
endif
ifeq ($(OMAP), yes)
dh_makeshlibs -plibdrm-omap1 -V'libdrm-omap1 (>= 2.4.38)' -- -c4
commit a393b3645ea2c96ce446ad73e6094bbb590e277e
Author: Sven Joachim <svenjoac@gmx.de>
Date: Sat Sep 1 17:58:40 2012 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index b8e9743..461676b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,71 @@
+commit ae3ac8225fe1c6781ce425c57ef5fb6c5af6ccf4
+Author: Marek Olšák <maraeo@gmail.com>
+Date: Fri Aug 24 17:03:13 2012 +0200
+
+ configure: bump version for 2.4.39 release
+
+commit 853429b939c792c4bc0bc91fdef696e3251b88d9
+Author: Marek Olšák <maraeo@gmail.com>
+Date: Mon Aug 20 17:15:15 2012 +0200
+
+ radeon: align r600 msaa buffers to a multiple of macrotile size * num samples
+
+ I am not sure whether this is needed, but better be safe than sorry.
+
+commit 58545722d0ee52f112859322466d9366915575b5
+Author: Marek Olšák <maraeo@gmail.com>
+Date: Sun Aug 19 03:54:34 2012 +0200
+
+ radeon: fix allocation of MSAA surfaces on r600-r700
+
+ Reviewed-by: Jerome Glisse <jglisse@redhat.com>
+
+commit f215d651377d98f5998118c6824aeb2db75513be
+Author: Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+Date: Thu Aug 9 13:34:54 2012 +0200
+
+ omap: include omap_drm.h independently
+
+ omap_drm.h uses data type defined in stdint.h, but that header was
+ not included.
+
+ omap_drm.h includes drm.h as a local file when it is part of the
+ compiler c flags.
+
+ This two issues are fixed. New code can include omap_drm.h alone.
+
+ Signed-off-by: Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+ Signed-off-by: Rob Clark <rob@ti.com>
+
+commit 3163cfe4db925429760407e77140e2d595338bc2
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jun 12 17:31:12 2012 +0100
+
+ radeon: add prime import/export support
+
+ this adds radeon version of the prime import/export support.
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit a9412fa9de219e38df361852a12df37688c891db
+Author: Kenneth Graunke <kenneth@whitecape.org>
+Date: Sun Aug 12 13:33:05 2012 -0700
+
+ intel: Use VG_CLEAR on the context destroy ioctl as well.
+
+ Otherwise pad appears uninitialized and valgrind grumbles.
+
+ Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+
+commit 6fa2b29d226306870eebe93afb2106ca7d79569b
+Author: Tobias Klausmann <tobias.klausmann@mni.thm.de>
+Date: Sun Aug 12 00:00:40 2012 +0200
+
+ tests/modetest: Add a forgotten return, needed for opensuse buildservice
+
+ Signed-off-by: Marek Olšák <maraeo@gmail.com>
+
commit d1de6831b9f49b1f450324948b6a4759b3f7ae04
Author: Marek Olšák <maraeo@gmail.com>
Date: Sat Aug 11 20:05:24 2012 +0200
diff --git a/debian/changelog b/debian/changelog
index 0042f82..c95d22e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.38-1) UNRELEASED; urgency=low
+libdrm (2.4.39-1) UNRELEASED; urgency=low
[ Maarten Lankhorst ]
* New upstream release.
commit ae3ac8225fe1c6781ce425c57ef5fb6c5af6ccf4
Author: Marek Olšák <maraeo@gmail.com>
Date: Fri Aug 24 17:03:13 2012 +0200
configure: bump version for 2.4.39 release
diff --git a/configure.ac b/configure.ac
index 3e2792e..9506827 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
AC_PREREQ([2.63])
AC_INIT([libdrm],
- [2.4.38],
+ [2.4.39],
[https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
[libdrm])
commit 853429b939c792c4bc0bc91fdef696e3251b88d9
Author: Marek Olšák <maraeo@gmail.com>
Date: Mon Aug 20 17:15:15 2012 +0200
radeon: align r600 msaa buffers to a multiple of macrotile size * num samples
I am not sure whether this is needed, but better be safe than sorry.
diff --git a/radeon/radeon_surface.c b/radeon/radeon_surface.c
index 98f4aaf..4118a37 100644
--- a/radeon/radeon_surface.c
+++ b/radeon/radeon_surface.c
@@ -356,7 +356,7 @@ static int r6_surface_init_2d(struct radeon_surface_manager *surf_man,
surf->bo_alignment =
MAX2(surf_man->hw_info.num_pipes *
surf_man->hw_info.num_banks *
- surf->bpe * 64,
+ surf->nsamples * surf->bpe * 64,
xalign * yalign * surf->nsamples * surf->bpe);
}
commit 58545722d0ee52f112859322466d9366915575b5
Author: Marek Olšák <maraeo@gmail.com>
Date: Sun Aug 19 03:54:34 2012 +0200
radeon: fix allocation of MSAA surfaces on r600-r700
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
diff --git a/radeon/radeon_surface.c b/radeon/radeon_surface.c
index 892dca6..98f4aaf 100644
--- a/radeon/radeon_surface.c
+++ b/radeon/radeon_surface.c
@@ -165,7 +165,7 @@ static void surf_minify(struct radeon_surface *surf,
surf->level[level].nblk_z = ALIGN(surf->level[level].nblk_z, zalign);
surf->level[level].offset = offset;
- surf->level[level].pitch_bytes = surf->level[level].nblk_x * surf->bpe;
+ surf->level[level].pitch_bytes = surf->level[level].nblk_x * surf->bpe * surf->nsamples;
surf->level[level].slice_size = surf->level[level].pitch_bytes * surf->level[level].nblk_y;
surf->bo_size = offset + surf->level[level].slice_size * surf->level[level].nblk_z * surf->array_size;
commit f215d651377d98f5998118c6824aeb2db75513be
Author: Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
Date: Thu Aug 9 13:34:54 2012 +0200
omap: include omap_drm.h independently
omap_drm.h uses data type defined in stdint.h, but that header was
not included.
omap_drm.h includes drm.h as a local file when it is part of the
compiler c flags.
This two issues are fixed. New code can include omap_drm.h alone.
Signed-off-by: Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
Signed-off-by: Rob Clark <rob@ti.com>
diff --git a/omap/omap_drm.h b/omap/omap_drm.h
index f677cd8..9c6c0e4 100644
--- a/omap/omap_drm.h
+++ b/omap/omap_drm.h
@@ -29,7 +29,8 @@
#ifndef __OMAP_DRM_H__
#define __OMAP_DRM_H__
-#include "drm.h"
+#include <stdint.h>
+#include <drm.h>
/* Please note that modifications to all structs defined here are
* subject to backwards-compatibility constraints.
commit fad0ec6ef31b2a29b55d0eb65eec9a8d9e3479e6
Author: Christopher James Halse Rogers <chris@cooperteam.net>
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 c1fbd3a..0042f82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,11 @@ libdrm (2.4.38-1) UNRELEASED; urgency=low
* Bump libdrm-intel1's and libdrm-nouveau2's shlibs due to new symbols.
* Hardcode the version for libdrm-omap1's shlibs.
- -- Maarten Lankhorst <maarten.lankhorst@canonical.com> Tue, 03 Jul 2012 10:34:04 +0200
+ [ 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.
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Tue, 21 Aug 2012 14:05:52 +1000
libdrm (2.4.33-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 21ce5bf..96826f3 100644
--- a/debian/control
+++ b/debian/control
@@ -56,6 +56,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 0000000..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
commit 3163cfe4db925429760407e77140e2d595338bc2
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jun 12 17:31:12 2012 +0100
radeon: add prime import/export support
this adds radeon version of the prime import/export support.
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/radeon/Makefile.am b/radeon/Makefile.am
index 37be8cc..a8cd100 100644
--- a/radeon/Makefile.am
+++ b/radeon/Makefile.am
@@ -31,7 +31,7 @@ AM_CFLAGS = \
libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
libdrm_radeon_ladir = $(libdir)
-libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+libdrm_radeon_la_LDFLAGS = -version-number 1:0:1 -no-undefined
libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
libdrm_radeon_la_SOURCES = \
diff --git a/radeon/radeon_bo_gem.c b/radeon/radeon_bo_gem.c
index 719fba7..265f177 100644
--- a/radeon/radeon_bo_gem.c
+++ b/radeon/radeon_bo_gem.c
@@ -45,7 +45,7 @@
#include "radeon_bo.h"
#include "radeon_bo_int.h"
#include "radeon_bo_gem.h"
-
+#include <fcntl.h>
struct radeon_bo_gem {
struct radeon_bo_int base;
uint32_t name;
@@ -349,3 +349,49 @@ int radeon_gem_set_domain(struct radeon_bo *bo, uint32_t read_domains, uint32_t
sizeof(args));
return r;
}
+
+int radeon_gem_prime_share_bo(struct radeon_bo *bo, int *handle)
+{
+ struct radeon_bo_gem *bo_gem = (struct radeon_bo_gem*)bo;
+ int ret;
+
+ ret = drmPrimeHandleToFD(bo_gem->base.bom->fd, bo->handle, DRM_CLOEXEC, handle);
+ return ret;
+}
+
+struct radeon_bo *radeon_gem_bo_open_prime(struct radeon_bo_manager *bom,
+ int fd_handle,
+ uint32_t size)
+{
+ struct radeon_bo_gem *bo;
+ int r;
+ uint32_t handle;
+
+ bo = (struct radeon_bo_gem*)calloc(1, sizeof(struct radeon_bo_gem));
+ if (bo == NULL) {
+ return NULL;
+ }
+
+ bo->base.bom = bom;
+ bo->base.handle = 0;
+ bo->base.size = size;
+ bo->base.alignment = 0;
+ bo->base.domains = RADEON_GEM_DOMAIN_GTT;
+ bo->base.flags = 0;
+ bo->base.ptr = NULL;
+ atomic_set(&bo->reloc_in_cs, 0);
+ bo->map_count = 0;
+
+ r = drmPrimeFDToHandle(bom->fd, fd_handle, &handle);
+ if (r != 0) {
+ free(bo);
+ return NULL;
+ }
+
+ bo->base.handle = handle;
+ bo->name = handle;
+
+ radeon_bo_ref((struct radeon_bo *)bo);
+ return (struct radeon_bo *)bo;
+
+}
diff --git a/radeon/radeon_bo_gem.h b/radeon/radeon_bo_gem.h
index 0af8610..08965f3 100644
--- a/radeon/radeon_bo_gem.h
+++ b/radeon/radeon_bo_gem.h
@@ -41,4 +41,8 @@ uint32_t radeon_gem_name_bo(struct radeon_bo *bo);
void *radeon_gem_get_reloc_in_cs(struct radeon_bo *bo);
int radeon_gem_set_domain(struct radeon_bo *bo, uint32_t read_domains, uint32_t write_domain);
int radeon_gem_get_kernel_name(struct radeon_bo *bo, uint32_t *name);
+int radeon_gem_prime_share_bo(struct radeon_bo *bo, int *handle);
+struct radeon_bo *radeon_gem_bo_open_prime(struct radeon_bo_manager *bom,
+ int fd_handle,
+ uint32_t size);
#endif
commit a9412fa9de219e38df361852a12df37688c891db
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Sun Aug 12 13:33:05 2012 -0700
intel: Use VG_CLEAR on the context destroy ioctl as well.
Otherwise pad appears uninitialized and valgrind grumbles.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index 0ea6260..7953137 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -2936,6 +2936,8 @@ drm_intel_gem_context_destroy(drm_intel_context *ctx)
if (ctx == NULL)
return;
+ VG_CLEAR(destroy);
+
bufmgr_gem = (drm_intel_bufmgr_gem *)ctx->bufmgr;
destroy.ctx_id = ctx->ctx_id;
ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_CONTEXT_DESTROY,
commit 6fa2b29d226306870eebe93afb2106ca7d79569b
Author: Tobias Klausmann <tobias.klausmann@mni.thm.de>
Date: Sun Aug 12 00:00:40 2012 +0200
tests/modetest: Add a forgotten return, needed for opensuse buildservice
Signed-off-by: Marek Olšák <maraeo@gmail.com>
diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c
index e0fd66c..c91bb9d 100644
--- a/tests/modetest/modetest.c
+++ b/tests/modetest/modetest.c
@@ -125,6 +125,7 @@ char * res##_str(int type) { \
sep = ", "; \
} \
} \
+ return NULL; \
}
static const char *mode_type_names[] = {
Reply to: