commit xorg-x11-driver-video for openSUSE:Factory

20 May 2009

Hello community,

here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory
checked in at Wed May 20 12:53:52 CEST 2009.



--------

--- xorg-x11-driver-video/xorg-x11-driver-video.changes	2009-05-16 02:58:23.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes	2009-05-20 04:39:14.000000000 +0200
@@ -1,0 +2,9 @@
+Wed May 20 04:21:53 CEST 2009 - sndirsch@suse.de
+
+- intel-gpu-tools 1.0.1
+  * This release was inspired by going to roll a debian package for
+    intel-gpu-tools and realizing I had no manpages. Whoops. And
+    since I was in the directory, I decided to clean up some things
+    that were bothering me about intel_gpu_dump output.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  intel-gpu-tools-1.0.tar.bz2

New:
----
  intel-gpu-tools-1.0.1.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.Lz9846/_old	2009-05-20 12:51:35.000000000 +0200
+++ /var/tmp/diff_new_pack.Lz9846/_new	2009-05-20 12:51:35.000000000 +0200
@@ -22,7 +22,7 @@
 BuildRequires:  Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
 Url:            http://xorg.freedesktop.org/
 Version:        7.4
-Release:        62
+Release:        63
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -75,7 +75,7 @@
 Source53:       xf86-video-xgixp-1.7.99.3.tar.bz2
 Source54:       xf86-video-mach64-6.8.1.tar.bz2
 Source55:       xf86-video-r128-6.8.0.tar.bz2
-Source56:       intel-gpu-tools-1.0.tar.bz2
+Source56:       intel-gpu-tools-1.0.1.tar.bz2
 Source100:      sax2-hwinfo-data.tar.gz
 Patch3:         ps_nv.diff
 Patch4:         xf86-video-nv-2.1.13_c8d6f7a.diff
@@ -108,7 +108,7 @@
 %prep
 %setup -q -T -c %{name}
 for i in $RPM_SOURCE_DIR/xf86-video-*.tar.bz2; do tar xjf $i; done
-tar xjf $RPM_SOURCE_DIR/intel-gpu-tools-1.0.tar.bz2
+tar xjf $RPM_SOURCE_DIR/intel-gpu-tools-1.0.1.tar.bz2
 # Geode LX/GX is x86 only
 %ifnarch %ix86
 rm -rf xf86-video-geode*
@@ -261,12 +261,19 @@
 /usr/bin/intel_*
 %{_libdir}/lib*
 %{_libdir}/xorg/modules/
+%{_mandir}/man1/*
 %{_mandir}/man4/*
 /usr/share/sax/api/data/cdb/Cards.20.%{name}
 /usr/share/sax/sysp/maps/update/Identity.map.20.%{name}
 /var/lib/hardware/ids/20.%{name}
 
 %changelog
+* Wed May 20 2009 sndirsch@suse.de
+- intel-gpu-tools 1.0.1
+  * This release was inspired by going to roll a debian package for
+  intel-gpu-tools and realizing I had no manpages. Whoops. And
+  since I was in the directory, I decided to clean up some things
+  that were bothering me about intel_gpu_dump output.
 * Sat May 16 2009 sndirsch@suse.de
 - xf86-video-nv-2.1.13_c8d6f7a.diff
   * More chip names. Add support for the following previously

++++++ intel-gpu-tools-1.0.tar.bz2 -> intel-gpu-tools-1.0.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intel-gpu-tools-1.0/benchmarks/Makefile.in new/intel-gpu-tools-1.0.1/benchmarks/Makefile.in
--- old/intel-gpu-tools-1.0/benchmarks/Makefile.in	2009-04-24 19:51:15.000000000 +0200
+++ new/intel-gpu-tools-1.0.1/benchmarks/Makefile.in	2009-05-20 01:46:34.000000000 +0200
@@ -237,9 +237,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  benchmarks/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  benchmarks/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  benchmarks/Makefile
+	  $(AUTOMAKE) --foreign  benchmarks/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intel-gpu-tools-1.0/configure new/intel-gpu-tools-1.0.1/configure
--- old/intel-gpu-tools-1.0/configure	2009-04-24 19:51:14.000000000 +0200
+++ new/intel-gpu-tools-1.0.1/configure	2009-05-20 01:46:35.000000000 +0200
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for intel-gpu-tools 1.0.
+# Generated by GNU Autoconf 2.63 for intel-gpu-tools 1.0.1.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -745,8 +745,8 @@
 # Identity of this package.
 PACKAGE_NAME='intel-gpu-tools'
 PACKAGE_TARNAME='intel-gpu-tools'
-PACKAGE_VERSION='1.0'
-PACKAGE_STRING='intel-gpu-tools 1.0'
+PACKAGE_VERSION='1.0.1'
+PACKAGE_STRING='intel-gpu-tools 1.0.1'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 ac_unique_file="Makefile.am"
@@ -1491,7 +1491,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures intel-gpu-tools 1.0 to adapt to many kinds of systems.
+\`configure' configures intel-gpu-tools 1.0.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1561,7 +1561,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of intel-gpu-tools 1.0:";;
+     short | recursive ) echo "Configuration of intel-gpu-tools 1.0.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1670,7 +1670,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-intel-gpu-tools configure 1.0
+intel-gpu-tools configure 1.0.1
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1684,7 +1684,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by intel-gpu-tools $as_me 1.0, which was
+It was created by intel-gpu-tools $as_me 1.0.1, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2405,7 +2405,7 @@
 
 # Define the identity of the package.
  PACKAGE='intel-gpu-tools'
- VERSION='1.0'
+ VERSION='1.0.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12650,7 +12650,7 @@
 
 
 
-ac_config_files="$ac_config_files Makefile benchmarks/Makefile lib/Makefile tests/Makefile tools/Makefile"
+ac_config_files="$ac_config_files Makefile benchmarks/Makefile lib/Makefile man/Makefile tests/Makefile tools/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -13099,7 +13099,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by intel-gpu-tools $as_me 1.0, which was
+This file was extended by intel-gpu-tools $as_me 1.0.1, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13162,7 +13162,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-intel-gpu-tools config.status 1.0
+intel-gpu-tools config.status 1.0.1
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -13548,6 +13548,7 @@
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "benchmarks/Makefile") CONFIG_FILES="$CONFIG_FILES benchmarks/Makefile" ;;
     "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
+    "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
     "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intel-gpu-tools-1.0/configure.ac new/intel-gpu-tools-1.0.1/configure.ac
--- old/intel-gpu-tools-1.0/configure.ac	2009-04-01 00:34:44.000000000 +0200
+++ new/intel-gpu-tools-1.0.1/configure.ac	2009-05-20 01:46:26.000000000 +0200
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([intel-gpu-tools],
-        1.0,
+        1.0.1,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         intel-gpu-tools)
 
@@ -67,6 +67,7 @@
 	Makefile
 	benchmarks/Makefile
 	lib/Makefile
+	man/Makefile
 	tests/Makefile
 	tools/Makefile
 ])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intel-gpu-tools-1.0/lib/Makefile.in new/intel-gpu-tools-1.0.1/lib/Makefile.in
--- old/intel-gpu-tools-1.0/lib/Makefile.in	2009-04-24 19:51:15.000000000 +0200
+++ new/intel-gpu-tools-1.0.1/lib/Makefile.in	2009-05-20 01:46:34.000000000 +0200
@@ -219,9 +219,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  lib/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/Makefile
+	  $(AUTOMAKE) --foreign  lib/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intel-gpu-tools-1.0/Makefile.am new/intel-gpu-tools-1.0.1/Makefile.am
--- old/intel-gpu-tools-1.0/Makefile.am	2009-04-27 18:45:17.000000000 +0200
+++ new/intel-gpu-tools-1.0.1/Makefile.am	2009-05-20 00:07:07.000000000 +0200
@@ -22,7 +22,7 @@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = lib tests tools benchmarks
+SUBDIRS = lib man tests tools benchmarks
 DISTCLEANFILES = \
 	doltcompile \
 	doltlibtool
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intel-gpu-tools-1.0/Makefile.in new/intel-gpu-tools-1.0.1/Makefile.in
--- old/intel-gpu-tools-1.0/Makefile.in	2009-04-27 18:45:29.000000000 +0200
+++ new/intel-gpu-tools-1.0.1/Makefile.in	2009-05-20 01:46:35.000000000 +0200
@@ -226,7 +226,7 @@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = lib tests tools benchmarks
+SUBDIRS = lib man tests tools benchmarks
 DISTCLEANFILES = \
 	doltcompile \
 	doltlibtool
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intel-gpu-tools-1.0/man/intel_gpu_dump.1 new/intel-gpu-tools-1.0.1/man/intel_gpu_dump.1
--- old/intel-gpu-tools-1.0/man/intel_gpu_dump.1	1970-01-01 01:00:00.000000000 +0100
+++ new/intel-gpu-tools-1.0.1/man/intel_gpu_dump.1	2009-05-20 01:05:15.000000000 +0200
@@ -0,0 +1,22 @@
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH intel_gpu_dump 1 "intel_gpu_dump 1.0"
+.SH NAME
+intel_gpu_dump \- Print out debugging information on the state of the
+Intel GPU.
+.SH SYNOPSIS
+.nf
+.B intel_gpu_dump
+.B intel_gpu_dump [ filename ]
+.fi
+.SH DESCRIPTION
+.B intel_gpu_dump
+is a tool to log the current state of an Intel GPU
+when it is hung, for later analysis.  It requires kernel 2.6.30rc1 or newer,
+debugfs mounted on /sys/kernel/debug or /debug, and root privilege for
+mapping the device to inspect it.
+.SS Options
+.TP
+.B filename
+Decodes just one batchbuffer or ringbuffer dump, rather than dumping all
+of the GPU state.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intel-gpu-tools-1.0/man/intel_gpu_top.1 new/intel-gpu-tools-1.0.1/man/intel_gpu_top.1
--- old/intel-gpu-tools-1.0/man/intel_gpu_top.1	1970-01-01 01:00:00.000000000 +0100
+++ new/intel-gpu-tools-1.0.1/man/intel_gpu_top.1	2009-05-20 01:05:15.000000000 +0200
@@ -0,0 +1,18 @@
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH intel_gpu_top 1 "intel_gpu_top 1.0"
+.SH NAME
+intel_gpu_top \- Display a top-like summary of Intel GPU usage
+.SH SYNOPSIS
+.B intel_gpu_top
+.SH DESCRIPTION
+.B intel_gpu_top
+is a tool to display usage information of an Intel GPU.  It requires root
+privilege to map the graphics device.
+.PP
+Note that idle units are not
+displayed, so an entirely idle GPU will only display the ring status and
+header.
+.SH BUGS
+Some GPUs report some units as busy when they aren't, such that even when
+idle and not hung, it will show up as 100% busy.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intel-gpu-tools-1.0/man/intel_stepping.1 new/intel-gpu-tools-1.0.1/man/intel_stepping.1
--- old/intel-gpu-tools-1.0/man/intel_stepping.1	1970-01-01 01:00:00.000000000 +0100
+++ new/intel-gpu-tools-1.0.1/man/intel_stepping.1	2009-05-20 01:05:15.000000000 +0200
@@ -0,0 +1,15 @@
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH intel_stepping 1 "intel_stepping 1.0"
+.SH NAME
+intel_stepping \- Display the stepping information for an Intel GPU
+.SH SYNOPSIS
+.B intel_stepping
+.SH DESCRIPTION
+.B intel_stepping
+is a tool to print the stepping information for an Intel GPU, along with
+the PCI ID and revision used to determine it.
+It requires root privilege to map the graphics device.
+.SH BUGS
+Not all the known stepping IDs or chipsets are included, so the output
+on some devices may not be as specific as possible.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intel-gpu-tools-1.0/man/intel_upload_blit_large.1 new/intel-gpu-tools-1.0.1/man/intel_upload_blit_large.1
--- old/intel-gpu-tools-1.0/man/intel_upload_blit_large.1	1970-01-01 01:00:00.000000000 +0100
+++ new/intel-gpu-tools-1.0.1/man/intel_upload_blit_large.1	2009-05-20 01:06:55.000000000 +0200
@@ -0,0 +1,18 @@
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH intel_upload_blit_large 1 "intel_upload_blit_large 1.0"
+.SH NAME
+intel_upload_blit_large \- microbenchmark of Intel GPU performance
+.SH SYNOPSIS
+.nf
+.B intel_upload_blit_large
+.fi
+.SH DESCRIPTION
+.B intel_upload_blit_large
+is a microbenchmark tool for DRM performance.  It should be run with kernel
+modesetting enabled, and may require root privilege for correct operation.
+It does not require X to be running.
+.PP
+Given that it is a microbenchmark, its utility is largely for regression
+testing of the kernel, and not for general conclusions on graphics
+performance.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intel-gpu-tools-1.0/man/intel_upload_blit_large_gtt.1 new/intel-gpu-tools-1.0.1/man/intel_upload_blit_large_gtt.1
--- old/intel-gpu-tools-1.0/man/intel_upload_blit_large_gtt.1	1970-01-01 01:00:00.000000000 +0100
+++ new/intel-gpu-tools-1.0.1/man/intel_upload_blit_large_gtt.1	2009-05-20 01:07:57.000000000 +0200
@@ -0,0 +1,18 @@
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH intel_upload_blit_large_gtt 1 "intel_upload_blit_large_gtt 1.0"
+.SH NAME
+intel_upload_blit_large_gtt \- microbenchmark of Intel GPU performance
+.SH SYNOPSIS
+.nf
+.B intel_upload_blit_large_gtt
+.fi
+.SH DESCRIPTION
+.B intel_upload_blit_large_gtt
+is a microbenchmark tool for DRM performance.  It should be run with kernel
+modesetting enabled, and may require root privilege for correct operation.
+It does not require X to be running.
+.PP
+Given that it is a microbenchmark, its utility is largely for regression
+testing of the kernel, and not for general conclusions on graphics
+performance.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intel-gpu-tools-1.0/man/intel_upload_blit_large_map.1 new/intel-gpu-tools-1.0.1/man/intel_upload_blit_large_map.1
--- old/intel-gpu-tools-1.0/man/intel_upload_blit_large_map.1	1970-01-01 01:00:00.000000000 +0100
+++ new/intel-gpu-tools-1.0.1/man/intel_upload_blit_large_map.1	2009-05-20 01:07:38.000000000 +0200
@@ -0,0 +1,18 @@
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH intel_upload_blit_large_map 1 "intel_upload_blit_large_map 1.0"
+.SH NAME
+intel_upload_blit_large_map \- microbenchmark of Intel GPU performance
+.SH SYNOPSIS
+.nf
+.B intel_upload_blit_large_map
+.fi
+.SH DESCRIPTION
+.B intel_upload_blit_large_map
+is a microbenchmark tool for DRM performance.  It should be run with kernel
+modesetting enabled, and may require root privilege for correct operation.
+It does not require X to be running.
+.PP
+Given that it is a microbenchmark, its utility is largely for regression
+testing of the kernel, and not for general conclusions on graphics
+performance.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intel-gpu-tools-1.0/man/intel_upload_blit_small.1 new/intel-gpu-tools-1.0.1/man/intel_upload_blit_small.1
--- old/intel-gpu-tools-1.0/man/intel_upload_blit_small.1	1970-01-01 01:00:00.000000000 +0100
+++ new/intel-gpu-tools-1.0.1/man/intel_upload_blit_small.1	2009-05-20 01:07:45.000000000 +0200
@@ -0,0 +1,18 @@
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH intel_upload_blit_small 1 "intel_upload_blit_small 1.0"
+.SH NAME
+intel_upload_blit_small \- microbenchmark of Intel GPU performance
+.SH SYNOPSIS
+.nf
+.B intel_upload_blit_small
+.fi
+.SH DESCRIPTION
+.B intel_upload_blit_small
+is a microbenchmark tool for DRM performance.  It should be run with kernel
+modesetting enabled, and may require root privilege for correct operation.
+It does not require X to be running.
+.PP
+Given that it is a microbenchmark, its utility is largely for regression
+testing of the kernel, and not for general conclusions on graphics
+performance.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intel-gpu-tools-1.0/man/Makefile.am new/intel-gpu-tools-1.0.1/man/Makefile.am
--- old/intel-gpu-tools-1.0/man/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ new/intel-gpu-tools-1.0.1/man/Makefile.am	2009-05-20 01:08:29.000000000 +0200
@@ -0,0 +1,8 @@
+dist_man1_MANS = \
+	intel_gpu_dump.1 \
+	intel_gpu_top.1 \
+	intel_stepping.1 \
+	intel_upload_blit_large.1 \
+	intel_upload_blit_large_gtt.1 \
+	intel_upload_blit_large_map.1 \
+	intel_upload_blit_small.1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intel-gpu-tools-1.0/man/Makefile.in new/intel-gpu-tools-1.0.1/man/Makefile.in
--- old/intel-gpu-tools-1.0/man/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ new/intel-gpu-tools-1.0.1/man/Makefile.in	2009-05-20 01:46:34.000000000 +0200
@@ -0,0 +1,411 @@
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = man
+DIST_COMMON = $(dist_man1_MANS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/dolt.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/shave.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+man1dir = $(mandir)/man1
+am__installdirs = "$(DESTDIR)$(man1dir)"
+NROFF = nroff
+MANS = $(dist_man1_MANS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
+DRM_CFLAGS = @DRM_CFLAGS@
+DRM_LIBS = @DRM_LIBS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FC = @FC@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
+PCIACCESS_LIBS = @PCIACCESS_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+Q = @Q@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+V = @V@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+dist_man1_MANS = \
+	intel_gpu_dump.1 \
+	intel_gpu_top.1 \
+	intel_stepping.1 \
+	intel_upload_blit_large.1 \
+	intel_upload_blit_large_gtt.1 \
+	intel_upload_blit_large_map.1 \
+	intel_upload_blit_small.1
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  man/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  man/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-man1: $(man1_MANS) $(man_MANS)
+	@$(NORMAL_INSTALL)
+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  if test -f $$i; then file=$$i; \
+	  else file=$(srcdir)/$$i; fi; \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    1*) ;; \
+	    *) ext='1' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
+	done
+uninstall-man1:
+	@$(NORMAL_UNINSTALL)
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    1*) ;; \
+	    *) ext='1' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(MANS)
+installdirs:
+	for dir in "$(DESTDIR)$(man1dir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-man
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man: install-man1
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-man
+
+uninstall-man: uninstall-man1
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-man1 \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-man uninstall-man1
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intel-gpu-tools-1.0/tests/gem_largeobject.c new/intel-gpu-tools-1.0.1/tests/gem_largeobject.c
--- old/intel-gpu-tools-1.0/tests/gem_largeobject.c	1970-01-01 01:00:00.000000000 +0100
+++ new/intel-gpu-tools-1.0.1/tests/gem_largeobject.c	2009-05-20 00:05:55.000000000 +0200
@@ -0,0 +1,97 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * 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 (including the next
+ * paragraph) 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 OR COPYRIGHT HOLDERS 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.
+ *
+ * Authors:
+ *    Jesse Barnes <jbarnes@virtuousgeek.org>
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include <fcntl.h>
+#include <inttypes.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include "drm.h"
+#include "i915_drm.h"
+#include "drmtest.h"
+
+/* Should take 64 pages to store the page pointers on 64 bit */
+#define OBJ_SIZE (128 * 1024 * 1024)
+
+unsigned char data[OBJ_SIZE];
+
+static void
+test_large_object(int fd)
+{
+	struct drm_i915_gem_create create;
+	struct drm_i915_gem_pwrite pwrite;
+	struct drm_i915_gem_pin pin;
+	int ret;
+
+	memset(&create, 0, sizeof(create));
+	memset(&pwrite, 0, sizeof(pwrite));
+	memset(&pin, 0, sizeof(pin));
+
+	create.size = OBJ_SIZE;
+	ret = ioctl(fd, DRM_IOCTL_I915_GEM_CREATE, &create);
+	if (ret) {
+		fprintf(stderr, "object creation failed: %s\n",
+			strerror(errno));
+		exit(ret);
+	}
+
+	pin.handle = create.handle;
+	ret = ioctl(fd, DRM_IOCTL_I915_GEM_PIN, &pin);
+	if (ret) {
+		fprintf(stderr, "pin failed: %s\n",
+			strerror(errno));
+		exit(ret);
+	}
+
+	pwrite.handle = create.handle;
+	pwrite.size = OBJ_SIZE;
+	pwrite.data_ptr = (uint64_t)data;
+
+	ret = ioctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &pwrite);
+	if (ret) {
+		fprintf(stderr, "pwrite failed: %s\n",
+			strerror(errno));
+		exit(ret);
+	}
+
+	/* kernel should clean this up for us */
+}
+
+int main(int argc, char **argv)
+{
+	int fd;
+
+	fd = drm_open_any();
+
+	test_large_object(fd);
+
+	return 0;
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intel-gpu-tools-1.0/tests/Makefile.am new/intel-gpu-tools-1.0.1/tests/Makefile.am
--- old/intel-gpu-tools-1.0/tests/Makefile.am	2009-04-24 19:49:45.000000000 +0200
+++ new/intel-gpu-tools-1.0.1/tests/Makefile.am	2009-05-18 20:13:30.000000000 +0200
@@ -8,7 +8,8 @@
 	gem_mmap \
 	gem_pread_after_blit \
 	gem_tiled_pread \
-	gem_tiled_blits
+	gem_tiled_blits \
+	gem_largeobject
 
 EXTRA_PROGRAMS = $(TESTS)
 CLEANFILES = $(EXTRA_PROGRAMS)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intel-gpu-tools-1.0/tests/Makefile.in new/intel-gpu-tools-1.0.1/tests/Makefile.in
--- old/intel-gpu-tools-1.0/tests/Makefile.in	2009-04-24 19:51:15.000000000 +0200
+++ new/intel-gpu-tools-1.0.1/tests/Makefile.in	2009-05-20 01:46:35.000000000 +0200
@@ -35,7 +35,7 @@
 	gem_basic$(EXEEXT) gem_flink$(EXEEXT) gem_readwrite$(EXEEXT) \
 	gem_ringfill$(EXEEXT) gem_mmap$(EXEEXT) \
 	gem_pread_after_blit$(EXEEXT) gem_tiled_pread$(EXEEXT) \
-	gem_tiled_blits$(EXEEXT)
+	gem_tiled_blits$(EXEEXT) gem_largeobject$(EXEEXT)
 EXTRA_PROGRAMS = $(am__EXEEXT_1)
 subdir = tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -54,7 +54,7 @@
 	getstats$(EXEEXT) gem_basic$(EXEEXT) gem_flink$(EXEEXT) \
 	gem_readwrite$(EXEEXT) gem_ringfill$(EXEEXT) gem_mmap$(EXEEXT) \
 	gem_pread_after_blit$(EXEEXT) gem_tiled_pread$(EXEEXT) \
-	gem_tiled_blits$(EXEEXT)
+	gem_tiled_blits$(EXEEXT) gem_largeobject$(EXEEXT)
 gem_basic_SOURCES = gem_basic.c
 gem_basic_OBJECTS = gem_basic.$(OBJEXT)
 gem_basic_LDADD = $(LDADD)
@@ -66,6 +66,11 @@
 gem_flink_LDADD = $(LDADD)
 gem_flink_DEPENDENCIES = ../lib/libintel_tools.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+gem_largeobject_SOURCES = gem_largeobject.c
+gem_largeobject_OBJECTS = gem_largeobject.$(OBJEXT)
+gem_largeobject_LDADD = $(LDADD)
+gem_largeobject_DEPENDENCIES = ../lib/libintel_tools.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 gem_mmap_SOURCES = gem_mmap.c
 gem_mmap_OBJECTS = gem_mmap.$(OBJEXT)
 gem_mmap_LDADD = $(LDADD)
@@ -120,10 +125,11 @@
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = gem_basic.c gem_flink.c gem_mmap.c gem_pread_after_blit.c \
-	gem_readwrite.c gem_ringfill.c gem_tiled_blits.c \
-	gem_tiled_pread.c getclient.c getstats.c getversion.c
-DIST_SOURCES = gem_basic.c gem_flink.c gem_mmap.c \
+SOURCES = gem_basic.c gem_flink.c gem_largeobject.c gem_mmap.c \
+	gem_pread_after_blit.c gem_readwrite.c gem_ringfill.c \
+	gem_tiled_blits.c gem_tiled_pread.c getclient.c getstats.c \
+	getversion.c
+DIST_SOURCES = gem_basic.c gem_flink.c gem_largeobject.c gem_mmap.c \
 	gem_pread_after_blit.c gem_readwrite.c gem_ringfill.c \
 	gem_tiled_blits.c gem_tiled_pread.c getclient.c getstats.c \
 	getversion.c
@@ -277,9 +283,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tests/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tests/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  tests/Makefile
+	  $(AUTOMAKE) --foreign  tests/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -303,6 +309,9 @@
 gem_flink$(EXEEXT): $(gem_flink_OBJECTS) $(gem_flink_DEPENDENCIES) 
 	@rm -f gem_flink$(EXEEXT)
 	$(LINK) $(gem_flink_OBJECTS) $(gem_flink_LDADD) $(LIBS)
+gem_largeobject$(EXEEXT): $(gem_largeobject_OBJECTS) $(gem_largeobject_DEPENDENCIES) 
+	@rm -f gem_largeobject$(EXEEXT)
+	$(LINK) $(gem_largeobject_OBJECTS) $(gem_largeobject_LDADD) $(LIBS)
 gem_mmap$(EXEEXT): $(gem_mmap_OBJECTS) $(gem_mmap_DEPENDENCIES) 
 	@rm -f gem_mmap$(EXEEXT)
 	$(LINK) $(gem_mmap_OBJECTS) $(gem_mmap_LDADD) $(LIBS)
@@ -339,6 +348,7 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gem_basic.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gem_flink.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gem_largeobject.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gem_mmap.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gem_pread_after_blit.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gem_readwrite.Po@am__quote@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intel-gpu-tools-1.0/tools/intel_gpu_dump.c new/intel-gpu-tools-1.0.1/tools/intel_gpu_dump.c
--- old/intel-gpu-tools-1.0/tools/intel_gpu_dump.c	2009-04-18 00:08:02.000000000 +0200
+++ new/intel-gpu-tools-1.0.1/tools/intel_gpu_dump.c	2009-05-20 01:32:13.000000000 +0200
@@ -130,6 +130,11 @@
 	{ 0x03, 0, 1, 1, "MI_WAIT_FOR_EVENT" },
     };
 
+    switch ((data[0] & 0x1f800000) >> 23) {
+    case 0x0a:
+	instr_out(data, hw_offset, 0, "MI_BATCH_BUFFER_END\n");
+	return -1;
+    }
 
     for (opcode = 0; opcode < sizeof(opcodes_mi) / sizeof(opcodes_mi[0]);
 	 opcode++) {
@@ -819,6 +824,7 @@
 decode_3d_1d(uint32_t *data, int count, uint32_t hw_offset, int *failures, int i830)
 {
     unsigned int len, i, c, opcode, word, map, sampler, instr;
+    char *format;
 
     struct {
 	uint32_t opcode;
@@ -1020,6 +1026,35 @@
 	    (*failures)++;
 	}
 	return len;
+    case 0x85:
+	len = (data[0] & 0x0000000f) + 2;
+
+	if (len != 2)
+	    fprintf(out, "Bad count in 3DSTATE_DEST_BUFFER_VARIABLES\n");
+	if (count < 2)
+	    BUFFER_FAIL(count, len, "3DSTATE_DEST_BUFFER_VARIABLES");
+
+	instr_out(data, hw_offset, 0,
+		  "3DSTATE_DEST_BUFFER_VARIABLES\n");
+
+	switch ((data[1] >> 8) & 0xf) {
+	case 0x0: format = "g8"; break;
+	case 0x1: format = "x1r5g5b5"; break;
+	case 0x2: format = "r5g6b5"; break;
+	case 0x3: format = "a8r8g8b8"; break;
+	case 0x4: format = "ycrcb_swapy"; break;
+	case 0x5: format = "ycrcb_normal"; break;
+	case 0x6: format = "ycrcb_swapuv"; break;
+	case 0x7: format = "ycrcb_swapuvy"; break;
+	case 0x8: format = "a4r4g4b4"; break;
+	case 0x9: format = "a1r5g5b5"; break;
+	case 0xa: format = "a2r10g10b10"; break;
+	default: format = "BAD"; break;
+	}
+	instr_out(data, hw_offset, 1, "%s format, early Z %sabled\n",
+		  format,
+		  (data[1] & (1 << 31)) ? "en" : "dis");
+	return len;
     }
 
     for (opcode = 0; opcode < sizeof(opcodes_3d_1d) / sizeof(opcodes_3d_1d[0]);
@@ -1396,6 +1431,7 @@
 {
     unsigned int opcode, len;
     int i;
+    char *desc1 = NULL;
 
     struct {
 	uint32_t opcode;
@@ -1603,6 +1639,31 @@
 
 	return len;
 
+    case 0x7a00:
+	len = (data[0] & 0xff) + 2;
+	if (len != 4)
+	    fprintf(out, "Bad count in PIPE_CONTROL\n");
+	if (count < len)
+	    BUFFER_FAIL(count, len, "PIPE_CONTROL");
+
+	switch ((data[0] >> 14) & 0x3) {
+	case 0: desc1 = "no write"; break;
+	case 1: desc1 = "qword write"; break;
+	case 2: desc1 = "PS_DEPTH_COUNT write"; break;
+	case 3: desc1 = "TIMESTAMP write"; break;
+	}
+	instr_out(data, hw_offset, 0,
+		  "PIPE_CONTROL: %s, %sdepth stall, %sRC write flush, "
+		  "%sinst flush\n",
+		  desc1,
+		  data[0] & (1 << 13) ? "" : "no ",
+		  data[0] & (1 << 12) ? "" : "no ",
+		  data[0] & (1 << 11) ? "" : "no ");
+	instr_out(data, hw_offset, 1, "destination address\n");
+	instr_out(data, hw_offset, 2, "immediate dword low\n");
+	instr_out(data, hw_offset, 3, "immediate dword high\n");
+	return len;
+
     case 0x7b00:
 	len = (data[0] & 0xff) + 2;
 	if (len != 6)
@@ -1729,6 +1790,7 @@
 int
 intel_decode(uint32_t *data, int count, uint32_t hw_offset, uint32_t devid)
 {
+    int ret;
     int index = 0;
     int failures = 0;
 
@@ -1737,8 +1799,19 @@
     while (index < count) {
 	switch ((data[index] & 0xe0000000) >> 29) {
 	case 0x0:
-	    index += decode_mi(data + index, count - index,
+	    ret = decode_mi(data + index, count - index,
 			       hw_offset + index * 4, &failures);
+
+	    /* If MI_BATCHBUFFER_END happened, then dump the rest of the
+	     * output in case we some day want it in debugging, but don't
+	     * decode it since it'll just confuse in the common case.
+	     */
+	    if (ret == -1) {
+		for (index = index + 1; index < count; index++) {
+		    instr_out(data, hw_offset, index, "\n");
+		}
+	    } else
+		index += ret;
 	    break;
 	case 0x2:
 	    index += decode_2d(data + index, count - index,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intel-gpu-tools-1.0/tools/Makefile.in new/intel-gpu-tools-1.0.1/tools/Makefile.in
--- old/intel-gpu-tools-1.0/tools/Makefile.in	2009-04-27 18:43:48.000000000 +0200
+++ new/intel-gpu-tools-1.0.1/tools/Makefile.in	2009-05-20 01:46:35.000000000 +0200
@@ -231,9 +231,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tools/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tools/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  tools/Makefile
+	  $(AUTOMAKE) --foreign  tools/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)