ChangeLog | 30 +++++++++++++++++++++++++ configure.ac | 6 ++++- debian/changelog | 9 +++++++ debian/control | 1 debian/libdrm-intel1.symbols | 1 debian/rules | 2 - intel/Makefile.am | 3 +- intel/intel_bufmgr.c | 50 +++++++++++++++++++++++++++++++++++++++++++ intel/intel_bufmgr.h | 2 + libkms/dumb.c | 3 +- 10 files changed, 103 insertions(+), 4 deletions(-)
New commits: commit 9845da0fc73a1e3f926c4f83c25bc2d91c63eb0e Author: Cyril Brulebois <[email protected]> Date: Fri Jun 24 17:07:07 2011 +0200 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index f6f8efc..d9bc994 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -libdrm (2.4.26-1) UNRELEASED; urgency=low +libdrm (2.4.26-1) unstable; urgency=low * New upstream release: - Fix two important intel bugs. * Add libpciaccess-dev build-dep. * Update libdrm-intel1.symbols and shlibs for new aperture-related symbol. - -- Cyril Brulebois <[email protected]> Fri, 24 Jun 2011 16:59:56 +0200 + -- Cyril Brulebois <[email protected]> Fri, 24 Jun 2011 17:07:04 +0200 libdrm (2.4.25-3) unstable; urgency=low commit 6bc3b76da1bf8b461784345bc9084324d2e35337 Author: Cyril Brulebois <[email protected]> Date: Fri Jun 24 17:07:02 2011 +0200 Update libdrm-intel1.symbols and shlibs for new aperture-related symbol. diff --git a/debian/changelog b/debian/changelog index cdb70fe..f6f8efc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ libdrm (2.4.26-1) UNRELEASED; urgency=low * New upstream release: - Fix two important intel bugs. * Add libpciaccess-dev build-dep. + * Update libdrm-intel1.symbols and shlibs for new aperture-related symbol. -- Cyril Brulebois <[email protected]> Fri, 24 Jun 2011 16:59:56 +0200 diff --git a/debian/libdrm-intel1.symbols b/debian/libdrm-intel1.symbols index 3634492..c951b6b 100644 --- a/debian/libdrm-intel1.symbols +++ b/debian/libdrm-intel1.symbols @@ -41,6 +41,7 @@ libdrm_intel.so.1 libdrm-intel1 #MINVER# 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 + drm_intel_get_aperture_sizes@Base 2.4.26 drm_intel_get_pipe_from_crtc_id@Base 2.4.11 drm_mmAllocMem@Base 2.4.1 drm_mmDestroy@Base 2.4.1 diff --git a/debian/rules b/debian/rules index cab7ea3..6ccb6a8 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.23-3~)' -- -c4 + dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (>= 2.4.26)' -- -c4 endif ifeq ($(NOUVEAU), yes) dh_makeshlibs -plibdrm-nouveau1a -V'libdrm-nouveau1a (>= 2.4.23)' -- -c4 commit 0cadb56dc138fe2142c1f6332dfa177f63547755 Author: Cyril Brulebois <[email protected]> Date: Fri Jun 24 17:01:43 2011 +0200 Add libpciaccess-dev build-dep. diff --git a/debian/changelog b/debian/changelog index c74631b..cdb70fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ libdrm (2.4.26-1) UNRELEASED; urgency=low * New upstream release: - Fix two important intel bugs. + * Add libpciaccess-dev build-dep. -- Cyril Brulebois <[email protected]> Fri, 24 Jun 2011 16:59:56 +0200 diff --git a/debian/control b/debian/control index 7b3673d..71d057b 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,7 @@ Build-Depends: pkg-config, libpthread-stubs0-dev, libudev-dev [linux-any], + libpciaccess-dev, Standards-Version: 3.9.2 Section: libs Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdrm commit f79e6a4f95b538b2b9e70b6c74b0f00410965879 Author: Cyril Brulebois <[email protected]> Date: Fri Jun 24 17:00:48 2011 +0200 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index b69176e..968043e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,33 @@ +commit 6dd804c5a92104042b8be0a67d107946394a0b7a +Author: Chris Wilson <[email protected]> +Date: Sat Jun 4 13:01:50 2011 +0100 + + configure: version bump for 2.4.26 release + + Push the new Intel API for use by mesa. + + Signed-off-by: Chris Wilson <[email protected]> + +commit 9d77603d8b95aee4f2408e437c55af15ee05b608 +Author: Chris Wilson <[email protected]> +Date: Sat Jun 4 12:47:19 2011 +0100 + + intel: Add interface to query aperture sizes. + + Signed-off-by: Chris Wilson <[email protected]> + +commit 61be94018ae9c403517d53f69357719224fa6ff3 +Author: Chris Wilson <[email protected]> +Date: Sat May 14 11:15:06 2011 +0100 + + libkms: All current BO_TYPE are 32bpp + + ... so request a 32bpp dumb buffer rather than a 16bpp. + + Fixes modetest and friends. + + Signed-off-by: Chris Wilson <[email protected]> + commit ba11501bb9f5bd98110dfe1385b4501c0a9a643a Author: Chris Wilson <[email protected]> Date: Mon Apr 11 08:25:42 2011 +0100 diff --git a/debian/changelog b/debian/changelog index 80053d5..c74631b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdrm (2.4.26-1) UNRELEASED; urgency=low + + * New upstream release: + - Fix two important intel bugs. + + -- Cyril Brulebois <[email protected]> Fri, 24 Jun 2011 16:59:56 +0200 + libdrm (2.4.25-3) unstable; urgency=low * Team upload. commit 6dd804c5a92104042b8be0a67d107946394a0b7a Author: Chris Wilson <[email protected]> Date: Sat Jun 4 13:01:50 2011 +0100 configure: version bump for 2.4.26 release Push the new Intel API for use by mesa. Signed-off-by: Chris Wilson <[email protected]> diff --git a/configure.ac b/configure.ac index e776ef5..cd3ac23 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AC_PREREQ([2.63]) AC_INIT([libdrm], - [2.4.25], + [2.4.26], [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI], [libdrm]) commit 9d77603d8b95aee4f2408e437c55af15ee05b608 Author: Chris Wilson <[email protected]> Date: Sat Jun 4 12:47:19 2011 +0100 intel: Add interface to query aperture sizes. Signed-off-by: Chris Wilson <[email protected]> diff --git a/configure.ac b/configure.ac index d9c826d..e776ef5 100644 --- a/configure.ac +++ b/configure.ac @@ -51,6 +51,10 @@ PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs) AC_SUBST(PTHREADSTUBS_CFLAGS) AC_SUBST(PTHREADSTUBS_LIBS) +PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) +AC_SUBST(PCIACCESS_CFLAGS) +AC_SUBST(PCIACCESS_LIBS) + pkgconfigdir=${libdir}/pkgconfig AC_SUBST(pkgconfigdir) AC_ARG_ENABLE([udev], diff --git a/intel/Makefile.am b/intel/Makefile.am index 1ae92f8..b6a9014 100644 --- a/intel/Makefile.am +++ b/intel/Makefile.am @@ -27,12 +27,13 @@ AM_CFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/intel \ $(PTHREADSTUBS_CFLAGS) \ + $(PCIACCESS_CFLAGS) \ -I$(top_srcdir)/include/drm libdrm_intel_la_LTLIBRARIES = libdrm_intel.la libdrm_intel_ladir = $(libdir) libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined -libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @CLOCK_LIB@ +libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @PCIACCESS_LIBS@ @CLOCK_LIB@ libdrm_intel_la_SOURCES = \ intel_bufmgr.c \ diff --git a/intel/intel_bufmgr.c b/intel/intel_bufmgr.c index 2df93a5..ab57427 100644 --- a/intel/intel_bufmgr.c +++ b/intel/intel_bufmgr.c @@ -36,8 +36,10 @@ #include <errno.h> #include <drm.h> #include <i915_drm.h> +#include <pciaccess.h> #include "intel_bufmgr.h" #include "intel_bufmgr_priv.h" +#include "xf86drm.h" /** @file intel_bufmgr.c * @@ -269,3 +271,51 @@ int drm_intel_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, int crtc_id) return bufmgr->get_pipe_from_crtc_id(bufmgr, crtc_id); return -1; } + +static size_t +drm_intel_probe_agp_aperture_size(int fd) +{ + struct pci_device *pci_dev; + size_t size = 0; + int ret; + + ret = pci_system_init(); + if (ret) + goto err; + + /* XXX handle multiple adaptors? */ + pci_dev = pci_device_find_by_slot(0, 0, 2, 0); + if (pci_dev == NULL) + goto err; + + ret = pci_device_probe(pci_dev); + if (ret) + goto err; + + size = pci_dev->regions[2].size; +err: + pci_system_cleanup (); + return size; +} + +int drm_intel_get_aperture_sizes(int fd, + size_t *mappable, + size_t *total) +{ + + struct drm_i915_gem_get_aperture aperture; + int ret; + + ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_GET_APERTURE, &aperture); + if (ret) + return ret; + + *mappable = 0; + /* XXX add a query for the kernel value? */ + if (*mappable == 0) + *mappable = drm_intel_probe_agp_aperture_size(fd); + if (*mappable == 0) + *mappable = 64 * 1024 * 1024; /* minimum possible value */ + *total = aperture.aper_size; + return 0; +} diff --git a/intel/intel_bufmgr.h b/intel/intel_bufmgr.h index daa18b4..889ef46 100644 --- a/intel/intel_bufmgr.h +++ b/intel/intel_bufmgr.h @@ -151,6 +151,8 @@ void drm_intel_gem_bo_start_gtt_access(drm_intel_bo *bo, int write_enable); int drm_intel_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, int crtc_id); +int drm_intel_get_aperture_sizes(int fd, size_t *mappable, size_t *total); + /* drm_intel_bufmgr_fake.c */ drm_intel_bufmgr *drm_intel_bufmgr_fake_init(int fd, unsigned long low_offset, commit 61be94018ae9c403517d53f69357719224fa6ff3 Author: Chris Wilson <[email protected]> Date: Sat May 14 11:15:06 2011 +0100 libkms: All current BO_TYPE are 32bpp ... so request a 32bpp dumb buffer rather than a 16bpp. Fixes modetest and friends. Signed-off-by: Chris Wilson <[email protected]> diff --git a/libkms/dumb.c b/libkms/dumb.c index 3be5f7a..440efb3 100644 --- a/libkms/dumb.c +++ b/libkms/dumb.c @@ -95,7 +95,8 @@ dumb_bo_create(struct kms_driver *kms, memset(&arg, 0, sizeof(arg)); - arg.bpp = 16; + /* All BO_TYPE currently are 32bpp formats */ + arg.bpp = 32; arg.width = width; arg.height = height; -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
