Hello community,
here is the log from the commit of package libdrm for openSUSE:Factory
checked in at Fri Oct 1 23:56:31 CEST 2010.
--------
--- libdrm/libdrm.changes 2010-09-15 06:15:14.000000000 +0200
+++ /mounts/work_src_done/STABLE/libdrm/libdrm.changes 2010-09-29 14:44:04.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Sep 29 12:34:42 UTC 2010 - sndirsch@novell.com
+
+- libdrm 2.4.22
+ * nouveau: fix thinko in drm version check
+ * nouveau: fix drm version check some more
+ * intel: Replace open-coded drmIoctl with calls to drmIoctl()
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libdrm-2.4.21-7ec9a1e.tar.bz2
New:
----
libdrm-2.4.22.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libdrm.spec ++++++
--- /var/tmp/diff_new_pack.0YXeBX/_old 2010-10-01 23:55:28.000000000 +0200
+++ /var/tmp/diff_new_pack.0YXeBX/_new 2010-10-01 23:55:28.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libdrm (Version 2.4.21)
+# spec file for package libdrm (Version 2.4.22)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,8 +24,8 @@
License: MIT License (or similar)
Group: System/Libraries
AutoReqProv: on
-Version: 2.4.21
-Release: 6
+Version: 2.4.22
+Release: 1
Provides: libdrm23 = %{version}
Obsoletes: libdrm23 < %{version}
# bug437293
@@ -35,7 +35,7 @@
%endif
#
Summary: Userspace Interface for Kernel DRM Services
-Source: %{name}-%{version}-7ec9a1e.tar.bz2
+Source: %{name}-%{version}.tar.bz2
Source2: baselibs.conf
Patch: enable_test_tools.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ libdrm-2.4.21-7ec9a1e.tar.bz2 -> libdrm-2.4.22.tar.bz2 ++++++
++++ 3505 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdrm-2.4.21/configure.ac new/libdrm-2.4.22/configure.ac
--- old/libdrm-2.4.21/configure.ac 2010-06-15 12:01:09.000000000 +0200
+++ new/libdrm-2.4.22/configure.ac 2010-09-29 05:38:46.000000000 +0200
@@ -19,7 +19,7 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
AC_PREREQ(2.60)
-AC_INIT([libdrm], 2.4.21, [dri-devel@lists.sourceforge.net], libdrm)
+AC_INIT([libdrm], 2.4.22, [dri-devel@lists.sourceforge.net], libdrm)
AC_USE_SYSTEM_EXTENSIONS
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdrm-2.4.21/include/drm/Makefile new/libdrm-2.4.22/include/drm/Makefile
--- old/libdrm-2.4.21/include/drm/Makefile 2010-09-15 06:00:10.000000000 +0200
+++ new/libdrm-2.4.22/include/drm/Makefile 2010-09-29 05:39:14.000000000 +0200
@@ -56,8 +56,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = x86_64-suse-linux-gnu
-host_triplet = x86_64-suse-linux-gnu
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
#am__append_1 = vmwgfx_drm.h
subdir = include/drm
DIST_COMMON = $(am__klibdrminclude_HEADERS_DIST) $(srcdir)/Makefile.am \
@@ -107,17 +107,17 @@
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /suse/sndirsch/projects/drm/drm/missing --run aclocal-1.11
+ACLOCAL = aclocal -I /opt/xorg/share/aclocal
ALLOCA =
-AMTAR = ${SHELL} /suse/sndirsch/projects/drm/drm/missing --run tar
+AMTAR = ${SHELL} /home/cworth/src/xorg/drm/missing --run tar
AM_DEFAULT_VERBOSITY = 0
AR = ar
-AUTOCONF = ${SHELL} /suse/sndirsch/projects/drm/drm/missing --run autoconf
-AUTOHEADER = ${SHELL} /suse/sndirsch/projects/drm/drm/missing --run autoheader
-AUTOMAKE = ${SHELL} /suse/sndirsch/projects/drm/drm/missing --run automake-1.11
+AUTOCONF = ${SHELL} /home/cworth/src/xorg/drm/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/cworth/src/xorg/drm/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/cworth/src/xorg/drm/missing --run automake-1.11
AWK = gawk
-CAIRO_CFLAGS = -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12
-CAIRO_LIBS = -lcairo
+CAIRO_CFLAGS = -pthread -I/opt/xorg/include/cairo -I/opt/xorg/include/pixman-1 -I/opt/xorg/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12
+CAIRO_LIBS = -L/opt/xorg/lib -lcairo
CC = gcc
CCDEPMODE = depmode=gcc3
CFLAGS = -g -O2
@@ -132,26 +132,26 @@
ECHO_C =
ECHO_N = -n
ECHO_T =
-EGREP = /usr/bin/grep -E
+EGREP = /bin/grep -E
EXEEXT =
-FGREP = /usr/bin/grep -F
-GREP = /usr/bin/grep
-INSTALL = /usr/bin/install -c
+FGREP = /bin/grep -F
+GREP = /bin/grep
+INSTALL = /usr/bin/install -C
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LD = /usr/x86_64-suse-linux/bin/ld -m elf_x86_64
+LD = /usr/bin/ld -m elf_i386
LDFLAGS =
LIBOBJS =
LIBS =
LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LIBUDEV_CFLAGS =
-LIBUDEV_LIBS =
+LIBUDEV_CFLAGS =
+LIBUDEV_LIBS = -ludev
LIPO =
LN_S = ln -s
LTLIBOBJS =
-MAKEINFO = ${SHELL} /suse/sndirsch/projects/drm/drm/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/cworth/src/xorg/drm/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
NM = /usr/bin/nm -B
NMEDIT =
@@ -162,27 +162,27 @@
PACKAGE = libdrm
PACKAGE_BUGREPORT = dri-devel@lists.sourceforge.net
PACKAGE_NAME = libdrm
-PACKAGE_STRING = libdrm 2.4.21
+PACKAGE_STRING = libdrm 2.4.22
PACKAGE_TARNAME = libdrm
PACKAGE_URL =
-PACKAGE_VERSION = 2.4.21
+PACKAGE_VERSION = 2.4.22
PATH_SEPARATOR = :
PKG_CONFIG = /usr/bin/pkg-config
PKG_CONFIG_LIBDIR =
-PKG_CONFIG_PATH =
+PKG_CONFIG_PATH = /opt/xorg/lib/pkgconfig
PTHREADSTUBS_CFLAGS =
PTHREADSTUBS_LIBS =
RANLIB = ranlib
-SED = /usr/bin/sed
+SED = /bin/sed
SET_MAKE =
-SHELL = /bin/sh
+SHELL = /bin/bash
STRIP = strip
-VERSION = 2.4.21
+VERSION = 2.4.22
WARN_CFLAGS = -Wall -Wextra -Wsign-compare -Werror-implicit-function-declaration -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wpacked -Wswitch-enum -Wmissing-format-attribute -Wstrict-aliasing=2 -Winit-self -Wunsafe-loop-optimizations -Wdeclaration-after-statement -Wold-style-definition -Wno-missing-field-initializers -Wno-unused-parameter -Wno-attributes -Wno-long-long -Winline
-abs_builddir = /suse/sndirsch/projects/drm/drm/include/drm
-abs_srcdir = /suse/sndirsch/projects/drm/drm/include/drm
-abs_top_builddir = /suse/sndirsch/projects/drm/drm
-abs_top_srcdir = /suse/sndirsch/projects/drm/drm
+abs_builddir = /home/cworth/src/xorg/drm/include/drm
+abs_srcdir = /home/cworth/src/xorg/drm/include/drm
+abs_top_builddir = /home/cworth/src/xorg/drm
+abs_top_srcdir = /home/cworth/src/xorg/drm
ac_ct_CC = gcc
ac_ct_DUMPBIN =
am__include = include
@@ -191,26 +191,26 @@
am__tar = ${AMTAR} chof - "$$tardir"
am__untar = ${AMTAR} xf -
bindir = ${exec_prefix}/bin
-build = x86_64-suse-linux-gnu
+build = x86_64-unknown-linux-gnu
build_alias =
build_cpu = x86_64
build_os = linux-gnu
-build_vendor = suse
+build_vendor = unknown
builddir = .
datadir = ${datarootdir}
datarootdir = ${prefix}/share
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
dvidir = ${docdir}
exec_prefix = ${prefix}
-host = x86_64-suse-linux-gnu
+host = x86_64-unknown-linux-gnu
host_alias =
host_cpu = x86_64
host_os = linux-gnu
-host_vendor = suse
+host_vendor = unknown
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = ${SHELL} /suse/sndirsch/projects/drm/drm/install-sh
+install_sh = ${SHELL} /home/cworth/src/xorg/drm/install-sh
kernel_source =
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
@@ -222,7 +222,7 @@
oldincludedir = /usr/include
pdfdir = ${docdir}
pkgconfigdir = ${exec_prefix}/lib/pkgconfig
-prefix = /usr/local
+prefix = /opt/xorg
program_transform_name = s,x,x,
psdir = ${docdir}
sbindir = ${exec_prefix}/sbin
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdrm-2.4.21/intel/intel_bufmgr_gem.c new/libdrm-2.4.22/intel/intel_bufmgr_gem.c
--- old/libdrm-2.4.21/intel/intel_bufmgr_gem.c 2010-08-27 11:19:16.000000000 +0200
+++ new/libdrm-2.4.22/intel/intel_bufmgr_gem.c 2010-09-29 05:37:17.000000000 +0200
@@ -507,9 +507,7 @@
memset(&busy, 0, sizeof(busy));
busy.handle = bo_gem->gem_handle;
- do {
- ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_BUSY, &busy);
- } while (ret == -1 && errno == EINTR);
+ ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_BUSY, &busy);
return (ret == 0 && busy.busy);
}
@@ -523,7 +521,7 @@
madv.handle = bo_gem->gem_handle;
madv.madv = state;
madv.retained = 1;
- ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_MADVISE, &madv);
+ drmIoctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_MADVISE, &madv);
return madv.retained;
}
@@ -650,11 +648,9 @@
memset(&create, 0, sizeof(create));
create.size = bo_size;
- do {
- ret = ioctl(bufmgr_gem->fd,
- DRM_IOCTL_I915_GEM_CREATE,
- &create);
- } while (ret == -1 && errno == EINTR);
+ ret = drmIoctl(bufmgr_gem->fd,
+ DRM_IOCTL_I915_GEM_CREATE,
+ &create);
bo_gem->gem_handle = create.handle;
bo_gem->bo.handle = bo_gem->gem_handle;
if (ret != 0) {
@@ -782,11 +778,9 @@
memset(&open_arg, 0, sizeof(open_arg));
open_arg.name = handle;
- do {
- ret = ioctl(bufmgr_gem->fd,
- DRM_IOCTL_GEM_OPEN,
- &open_arg);
- } while (ret == -1 && errno == EINTR);
+ ret = drmIoctl(bufmgr_gem->fd,
+ DRM_IOCTL_GEM_OPEN,
+ &open_arg);
if (ret != 0) {
fprintf(stderr, "Couldn't reference %s handle 0x%08x: %s\n",
name, handle, strerror(errno));
@@ -806,7 +800,9 @@
memset(&get_tiling, 0, sizeof(get_tiling));
get_tiling.handle = bo_gem->gem_handle;
- ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_GET_TILING, &get_tiling);
+ ret = drmIoctl(bufmgr_gem->fd,
+ DRM_IOCTL_I915_GEM_GET_TILING,
+ &get_tiling);
if (ret != 0) {
drm_intel_gem_bo_unreference(&bo_gem->bo);
return NULL;
@@ -837,7 +833,7 @@
/* Close this object */
memset(&close, 0, sizeof(close));
close.handle = bo_gem->gem_handle;
- ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_GEM_CLOSE, &close);
+ ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_GEM_CLOSE, &close);
if (ret != 0) {
fprintf(stderr,
"DRM_IOCTL_GEM_CLOSE %d failed (%s): %s\n",
@@ -974,11 +970,9 @@
mmap_arg.handle = bo_gem->gem_handle;
mmap_arg.offset = 0;
mmap_arg.size = bo->size;
- do {
- ret = ioctl(bufmgr_gem->fd,
- DRM_IOCTL_I915_GEM_MMAP,
- &mmap_arg);
- } while (ret == -1 && errno == EINTR);
+ ret = drmIoctl(bufmgr_gem->fd,
+ DRM_IOCTL_I915_GEM_MMAP,
+ &mmap_arg);
if (ret != 0) {
ret = -errno;
fprintf(stderr,
@@ -1000,11 +994,9 @@
set_domain.write_domain = I915_GEM_DOMAIN_CPU;
else
set_domain.write_domain = 0;
- do {
- ret = ioctl(bufmgr_gem->fd,
- DRM_IOCTL_I915_GEM_SET_DOMAIN,
- &set_domain);
- } while (ret == -1 && errno == EINTR);
+ ret = drmIoctl(bufmgr_gem->fd,
+ DRM_IOCTL_I915_GEM_SET_DOMAIN,
+ &set_domain);
if (ret != 0) {
fprintf(stderr, "%s:%d: Error setting to CPU domain %d: %s\n",
__FILE__, __LINE__, bo_gem->gem_handle,
@@ -1036,11 +1028,9 @@
mmap_arg.handle = bo_gem->gem_handle;
/* Get the fake offset back... */
- do {
- ret = ioctl(bufmgr_gem->fd,
- DRM_IOCTL_I915_GEM_MMAP_GTT,
- &mmap_arg);
- } while (ret == -1 && errno == EINTR);
+ ret = drmIoctl(bufmgr_gem->fd,
+ DRM_IOCTL_I915_GEM_MMAP_GTT,
+ &mmap_arg);
if (ret != 0) {
ret = -errno;
fprintf(stderr,
@@ -1078,11 +1068,9 @@
set_domain.handle = bo_gem->gem_handle;
set_domain.read_domains = I915_GEM_DOMAIN_GTT;
set_domain.write_domain = I915_GEM_DOMAIN_GTT;
- do {
- ret = ioctl(bufmgr_gem->fd,
- DRM_IOCTL_I915_GEM_SET_DOMAIN,
- &set_domain);
- } while (ret == -1 && errno == EINTR);
+ ret = drmIoctl(bufmgr_gem->fd,
+ DRM_IOCTL_I915_GEM_SET_DOMAIN,
+ &set_domain);
if (ret != 0) {
fprintf(stderr, "%s:%d: Error setting domain %d: %s\n",
__FILE__, __LINE__, bo_gem->gem_handle,
@@ -1130,11 +1118,9 @@
* results show up in a timely manner.
*/
sw_finish.handle = bo_gem->gem_handle;
- do {
- ret = ioctl(bufmgr_gem->fd,
- DRM_IOCTL_I915_GEM_SW_FINISH,
- &sw_finish);
- } while (ret == -1 && errno == EINTR);
+ ret = drmIoctl(bufmgr_gem->fd,
+ DRM_IOCTL_I915_GEM_SW_FINISH,
+ &sw_finish);
ret = ret == -1 ? -errno : 0;
bo->virtual = NULL;
@@ -1157,11 +1143,9 @@
pwrite.offset = offset;
pwrite.size = size;
pwrite.data_ptr = (uint64_t) (uintptr_t) data;
- do {
- ret = ioctl(bufmgr_gem->fd,
- DRM_IOCTL_I915_GEM_PWRITE,
- &pwrite);
- } while (ret == -1 && errno == EINTR);
+ ret = drmIoctl(bufmgr_gem->fd,
+ DRM_IOCTL_I915_GEM_PWRITE,
+ &pwrite);
if (ret != 0) {
ret = -errno;
fprintf(stderr,
@@ -1181,8 +1165,9 @@
int ret;
get_pipe_from_crtc_id.crtc_id = crtc_id;
- ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GET_PIPE_FROM_CRTC_ID,
- &get_pipe_from_crtc_id);
+ ret = drmIoctl(bufmgr_gem->fd,
+ DRM_IOCTL_I915_GET_PIPE_FROM_CRTC_ID,
+ &get_pipe_from_crtc_id);
if (ret != 0) {
/* We return -1 here to signal that we don't
* know which pipe is associated with this crtc.
@@ -1210,11 +1195,9 @@
pread.offset = offset;
pread.size = size;
pread.data_ptr = (uint64_t) (uintptr_t) data;
- do {
- ret = ioctl(bufmgr_gem->fd,
- DRM_IOCTL_I915_GEM_PREAD,
- &pread);
- } while (ret == -1 && errno == EINTR);
+ ret = drmIoctl(bufmgr_gem->fd,
+ DRM_IOCTL_I915_GEM_PREAD,
+ &pread);
if (ret != 0) {
ret = -errno;
fprintf(stderr,
@@ -1251,11 +1234,9 @@
set_domain.handle = bo_gem->gem_handle;
set_domain.read_domains = I915_GEM_DOMAIN_GTT;
set_domain.write_domain = write_enable ? I915_GEM_DOMAIN_GTT : 0;
- do {
- ret = ioctl(bufmgr_gem->fd,
- DRM_IOCTL_I915_GEM_SET_DOMAIN,
- &set_domain);
- } while (ret == -1 && errno == EINTR);
+ ret = drmIoctl(bufmgr_gem->fd,
+ DRM_IOCTL_I915_GEM_SET_DOMAIN,
+ &set_domain);
if (ret != 0) {
fprintf(stderr,
"%s:%d: Error setting memory domains %d (%08x %08x): %s .\n",
@@ -1526,12 +1507,9 @@
execbuf.DR1 = 0;
execbuf.DR4 = DR4;
- do {
- ret = ioctl(bufmgr_gem->fd,
- DRM_IOCTL_I915_GEM_EXECBUFFER,
- &execbuf);
- } while (ret != 0 && errno == EINTR);
-
+ ret = drmIoctl(bufmgr_gem->fd,
+ DRM_IOCTL_I915_GEM_EXECBUFFER,
+ &execbuf);
if (ret != 0) {
ret = -errno;
if (errno == ENOSPC) {
@@ -1599,11 +1577,9 @@
execbuf.rsvd1 = 0;
execbuf.rsvd2 = 0;
- do {
- ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_EXECBUFFER2,
- &execbuf);
- } while (ret != 0 && errno == EINTR);
-
+ ret = drmIoctl(bufmgr_gem->fd,
+ DRM_IOCTL_I915_GEM_EXECBUFFER2,
+ &execbuf);
if (ret != 0) {
ret = -errno;
if (ret == -ENOSPC) {
@@ -1658,12 +1634,9 @@
pin.handle = bo_gem->gem_handle;
pin.alignment = alignment;
- do {
- ret = ioctl(bufmgr_gem->fd,
- DRM_IOCTL_I915_GEM_PIN,
- &pin);
- } while (ret == -1 && errno == EINTR);
-
+ ret = drmIoctl(bufmgr_gem->fd,
+ DRM_IOCTL_I915_GEM_PIN,
+ &pin);
if (ret != 0)
return -errno;
@@ -1682,7 +1655,7 @@
memset(&unpin, 0, sizeof(unpin));
unpin.handle = bo_gem->gem_handle;
- ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_UNPIN, &unpin);
+ ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_UNPIN, &unpin);
if (ret != 0)
return -errno;
@@ -1706,6 +1679,10 @@
memset(&set_tiling, 0, sizeof(set_tiling));
do {
+ /* set_tiling is slightly broken and overwrites the
+ * input on the error path, so we have to open code
+ * rmIoctl.
+ */
set_tiling.handle = bo_gem->gem_handle;
set_tiling.tiling_mode = tiling_mode;
set_tiling.stride = stride;
@@ -1713,7 +1690,7 @@
ret = ioctl(bufmgr_gem->fd,
DRM_IOCTL_I915_GEM_SET_TILING,
&set_tiling);
- } while (ret == -1 && errno == EINTR);
+ } while (ret == -1 && (errno == EINTR || errno == EAGAIN));
if (ret == -1)
return -errno;
@@ -1768,7 +1745,7 @@
memset(&flink, 0, sizeof(flink));
flink.handle = bo_gem->gem_handle;
- ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_GEM_FLINK, &flink);
+ ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_GEM_FLINK, &flink);
if (ret != 0)
return -errno;
bo_gem->global_name = flink.name;
@@ -2099,7 +2076,9 @@
return NULL;
}
- ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_GET_APERTURE, &aperture);
+ ret = drmIoctl(bufmgr_gem->fd,
+ DRM_IOCTL_I915_GEM_GET_APERTURE,
+ &aperture);
if (ret == 0)
bufmgr_gem->gtt_size = aperture.aper_available_size;
@@ -2115,7 +2094,7 @@
gp.param = I915_PARAM_CHIPSET_ID;
gp.value = &bufmgr_gem->pci_device;
- ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GETPARAM, &gp);
+ ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_I915_GETPARAM, &gp);
if (ret) {
fprintf(stderr, "get chip id failed: %d [%d]\n", ret, errno);
fprintf(stderr, "param: %d, val: %d\n", gp.param, *gp.value);
@@ -2131,19 +2110,19 @@
bufmgr_gem->gen = 6;
gp.param = I915_PARAM_HAS_EXECBUF2;
- ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GETPARAM, &gp);
+ ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_I915_GETPARAM, &gp);
if (!ret)
exec2 = 1;
gp.param = I915_PARAM_HAS_BSD;
- ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GETPARAM, &gp);
+ ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_I915_GETPARAM, &gp);
if (!ret)
has_bsd = 1;
if (bufmgr_gem->gen < 4) {
gp.param = I915_PARAM_NUM_FENCES_AVAIL;
gp.value = &bufmgr_gem->available_fences;
- ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GETPARAM, &gp);
+ ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_I915_GETPARAM, &gp);
if (ret) {
fprintf(stderr, "get fences failed: %d [%d]\n", ret,
errno);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdrm-2.4.21/missing new/libdrm-2.4.22/missing
--- old/libdrm-2.4.21/missing 2010-06-24 16:46:31.000000000 +0200
+++ new/libdrm-2.4.22/missing 2008-06-27 23:33:27.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard