xserver-xorg-video-intel: Changes to 'debian-experimental'
ChangeLog | 896 ++++++++++++++++++++++++++++
Makefile.in | 29
aclocal.m4 | 265 +++++---
config.guess | 32 -
config.sub | 44 +
configure | 835 +++++++++++++++++++-------
configure.ac | 8
debian/changelog | 52 +
debian/control | 14
debian/rules | 2
debian/xserver-xorg-video-intel-dbg.install | 1
debian/xserver-xorg-video-intel.install | 1
depcomp | 33 -
install-sh | 228 +++----
ltmain.sh | 58 +
man/Makefile.in | 6
man/intel.man | 7
src/Makefile.in | 29
src/bios_reader/Makefile.in | 21
src/brw_structs.h | 12
src/ch7017/Makefile.in | 29
src/ch7017/ch7017.c | 2
src/ch7xxx/Makefile.in | 29
src/ch7xxx/ch7xxx.c | 2
src/common.h | 22
src/i810_driver.c | 6
src/i810_reg.h | 47 +
src/i830.h | 7
src/i830_crt.c | 1
src/i830_debug.c | 220 +++++-
src/i830_display.c | 104 ++-
src/i830_dri.c | 101 +--
src/i830_driver.c | 97 ++-
src/i830_dvo.c | 6
src/i830_lvds.c | 19
src/i830_memory.c | 40 -
src/i830_quirks.c | 180 +++++
src/i830_sdvo.c | 18
src/i830_video.c | 12
src/i965_render.c | 6
src/i965_video.c | 5
src/ivch/Makefile.in | 29
src/ivch/ivch.c | 2
src/reg_dumper/Makefile.in | 21
src/sil164/Makefile.in | 29
src/sil164/sil164.c | 2
src/tfp410/Makefile.in | 29
src/tfp410/tfp410.c | 2
src/xvmc/Makefile.in | 29
49 files changed, 2861 insertions(+), 808 deletions(-)
New commits:
commit 3e7c2a3f7211f0c167e831366aa5bb1ca9215334
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Mar 18 15:16:07 2008 +0100
Build against xserver 1.5 rc1 (1.4.99.901).
* Bump Standards-Version to 3.7.3 (no changes).
* DRI is disabled for now, don't try to install the xvmc lib.
diff --git a/debian/changelog b/debian/changelog
index 56df6e0..96a2610 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ xserver-xorg-video-intel (2:2.2.1-2) UNRELEASED; urgency=low
bring in libpciaccess0 (closes: #467215).
* Only build on x86, this package doesn't make sense anywhere else.
* The Vcs-* fields are now recognized by dpkg, so drop the XS- prefix.
+ * Build against xserver 1.5 rc1 (1.4.99.901).
+ * configure: change the pciaccess version check to 0.10 instead of 0.10.0.
+ * Bump Standards-Version to 3.7.3 (no changes).
+ * DRI is disabled for now, don't try to install the xvmc lib.
-- Julien Cristau <jcristau@debian.org> Sun, 24 Feb 2008 10:29:49 +0100
diff --git a/debian/control b/debian/control
index 74c4f11..01697f3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Drew Parsons <dparsons@debian.org>, Julien Cristau <jcristau@debian.org>, Brice Goglin <bgoglin@debian.org>
-Build-Depends: debhelper (>= 5), quilt, pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-gl-dev, x11proto-video-dev, libgl1-mesa-dev | libgl-dev, libxvmc-dev (>= 1:1.0.1-1), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xinerama-dev, libdrm-dev (>= 2.2) [!hurd-i386], x11proto-xf86dri-dev, libpciaccess-dev (>= 0.8.0+git20071002)
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5), quilt, pkg-config, xserver-xorg-dev (>= 2:1.4.99.901), x11proto-gl-dev, x11proto-video-dev, libgl1-mesa-dev | libgl-dev, libxvmc-dev (>= 1:1.0.1-1), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xinerama-dev, libdrm-dev (>= 2.2) [!hurd-i386], x11proto-xf86dri-dev, libpciaccess-dev (>= 0.8.0+git20071002)
+Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-intel
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-intel.git
diff --git a/debian/xserver-xorg-video-intel.install b/debian/xserver-xorg-video-intel.install
index 580d6a0..a8fac35 100644
--- a/debian/xserver-xorg-video-intel.install
+++ b/debian/xserver-xorg-video-intel.install
@@ -1,3 +1,2 @@
usr/lib/xorg/modules/drivers/*.so
-usr/lib/libI810XvMC.so*
usr/share/xserver-xorg/pci/*
commit 95ec757cae67f1cb1ca25e89b1541b0c2cc7ada7
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Mar 18 15:14:53 2008 +0100
autoreconf
diff --git a/aclocal.m4 b/aclocal.m4
index 9dc3d33..0d079c3 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -6876,7 +6876,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
- [XORG_MACROS_version=1.1.5
+ [XORG_MACROS_version=1.1.6
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -7025,7 +7025,11 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[
XORG_SGML_PATH=$prefix/share/sgml
HAVE_DEFS_ENT=
-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+if test x"$cross_compiling" = x"yes" ; then
+ HAVE_DEFS_ENT=no
+else
+ AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+fi
AC_PATH_PROG(LINUXDOC, linuxdoc)
AC_PATH_PROG(PS2PDF, ps2pdf)
@@ -7346,14 +7350,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
[Major version of this package])
- PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
if test "x$PVM" = "x"; then
PVM="0"
fi
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
[$PVM],
[Minor version of this package])
- PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
if test "x$PVP" = "x"; then
PVP="0"
fi
diff --git a/configure b/configure
index 4944cb6..f03d207 100755
--- a/configure
+++ b/configure
@@ -21807,12 +21807,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess >= 0.10.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10.0") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess >= 0.10\"") >&5
+ ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_PCIACCESS_CFLAGS=`$PKG_CONFIG --cflags "pciaccess >= 0.10.0" 2>/dev/null`
+ pkg_cv_PCIACCESS_CFLAGS=`$PKG_CONFIG --cflags "pciaccess >= 0.10" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -21825,12 +21825,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_PCIACCESS_LIBS="$PCIACCESS_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess >= 0.10.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10.0") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess >= 0.10\"") >&5
+ ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_PCIACCESS_LIBS=`$PKG_CONFIG --libs "pciaccess >= 0.10.0" 2>/dev/null`
+ pkg_cv_PCIACCESS_LIBS=`$PKG_CONFIG --libs "pciaccess >= 0.10" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -21849,14 +21849,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pciaccess >= 0.10.0"`
+ PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pciaccess >= 0.10"`
else
- PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pciaccess >= 0.10.0"`
+ PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pciaccess >= 0.10"`
fi
# Put the nasty error message in config.log where it belongs
echo "$PCIACCESS_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: Package requirements (pciaccess >= 0.10.0) were not met:
+ { { echo "$as_me:$LINENO: error: Package requirements (pciaccess >= 0.10) were not met:
$PCIACCESS_PKG_ERRORS
@@ -21867,7 +21867,7 @@ Alternatively, you may set the environment variables PCIACCESS_CFLAGS
and PCIACCESS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
-echo "$as_me: error: Package requirements (pciaccess >= 0.10.0) were not met:
+echo "$as_me: error: Package requirements (pciaccess >= 0.10) were not met:
$PCIACCESS_PKG_ERRORS
@@ -21919,12 +21919,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess >= 0.10.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10.0") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess >= 0.10\"") >&5
+ ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_PCIACCESS_CFLAGS=`$PKG_CONFIG --cflags "pciaccess >= 0.10.0" 2>/dev/null`
+ pkg_cv_PCIACCESS_CFLAGS=`$PKG_CONFIG --cflags "pciaccess >= 0.10" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -21937,12 +21937,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_PCIACCESS_LIBS="$PCIACCESS_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess >= 0.10.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10.0") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess >= 0.10\"") >&5
+ ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_PCIACCESS_LIBS=`$PKG_CONFIG --libs "pciaccess >= 0.10.0" 2>/dev/null`
+ pkg_cv_PCIACCESS_LIBS=`$PKG_CONFIG --libs "pciaccess >= 0.10" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -21961,9 +21961,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pciaccess >= 0.10.0"`
+ PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pciaccess >= 0.10"`
else
- PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pciaccess >= 0.10.0"`
+ PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pciaccess >= 0.10"`
fi
# Put the nasty error message in config.log where it belongs
echo "$PCIACCESS_PKG_ERRORS" >&5
@@ -22382,7 +22382,7 @@ DRIVER_NAME=intel
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`
{ echo "$as_me:$LINENO: checking if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}" >&5
echo $ECHO_N "checking if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}... $ECHO_C" >&6; }
- XORG_MACROS_version=1.1.5
+ XORG_MACROS_version=1.1.6
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -22489,7 +22489,7 @@ cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
_ACEOF
- PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
if test "x$PVM" = "x"; then
PVM="0"
fi
@@ -22498,7 +22498,7 @@ cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION_MINOR $PVM
_ACEOF
- PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
if test "x$PVP" = "x"; then
PVP="0"
fi
@@ -22513,7 +22513,10 @@ _ACEOF
XORG_SGML_PATH=$prefix/share/sgml
HAVE_DEFS_ENT=
-as_ac_File=`echo "ac_cv_file_$XORG_SGML_PATH/X11/defs.ent" | $as_tr_sh`
+if test x"$cross_compiling" = x"yes" ; then
+ HAVE_DEFS_ENT=no
+else
+ as_ac_File=`echo "ac_cv_file_$XORG_SGML_PATH/X11/defs.ent" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $XORG_SGML_PATH/X11/defs.ent" >&5
echo $ECHO_N "checking for $XORG_SGML_PATH/X11/defs.ent... $ECHO_C" >&6; }
if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -22536,6 +22539,7 @@ if test `eval echo '${'$as_ac_File'}'` = yes; then
HAVE_DEFS_ENT=yes
fi
+fi
# Extract the first word of "linuxdoc", so it can be a program name with args.
set dummy linuxdoc; ac_word=$2
commit 5928a54b77878157c0d670b926870b17c3d2f4e2
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Mar 7 08:04:37 2008 +1000
fixup pciaccess version detect
(cherry picked from commit 81b2de05db0d17f356f551ccb5363317c1d821e3)
diff --git a/configure.ac b/configure.ac
index 5278f0b..dfe3e64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,9 +115,9 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
CFLAGS="$save_CFLAGS"
if test x$XSERVER_LIBPCIACCESS = xyes; then
- PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10.0])
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10])
else
- PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10.0],
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10],
have_libpciaccess=yes,
have_libpciaccess=no)
fi
commit a5c9d7d480e6f152fea567f67d3fa8a24f4f8258
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Feb 27 13:17:52 2008 +0100
The Vcs-* fields are now recognized by dpkg, so drop the XS- prefix.
diff --git a/debian/changelog b/debian/changelog
index 7686756..56df6e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-video-intel (2:2.2.1-2) UNRELEASED; urgency=low
* Add the ${shlibs:Depends} substvar to the -dbg package's dependencies, to
bring in libpciaccess0 (closes: #467215).
* Only build on x86, this package doesn't make sense anywhere else.
+ * The Vcs-* fields are now recognized by dpkg, so drop the XS- prefix.
-- Julien Cristau <jcristau@debian.org> Sun, 24 Feb 2008 10:29:49 +0100
diff --git a/debian/control b/debian/control
index 7990f58..74c4f11 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Drew Parsons <dparsons@debian.org>, Julien Cristau <jcristau@debian.org>, Brice Goglin <bgoglin@debian.org>
Build-Depends: debhelper (>= 5), quilt, pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-gl-dev, x11proto-video-dev, libgl1-mesa-dev | libgl-dev, libxvmc-dev (>= 1:1.0.1-1), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xinerama-dev, libdrm-dev (>= 2.2) [!hurd-i386], x11proto-xf86dri-dev, libpciaccess-dev (>= 0.8.0+git20071002)
Standards-Version: 3.7.2
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-intel
-XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-intel.git
+Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-intel
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-intel.git
Package: xserver-xorg-video-intel
Architecture: amd64 hurd-i386 i386 kfreebsd-i386 kfreebsd-amd64 netbsd-i386
commit 0facaa8b774f6ff9c40009d13a726406536ff977
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Feb 27 13:09:14 2008 +0100
Only build on x86, this package doesn't make sense anywhere else.
diff --git a/debian/changelog b/debian/changelog
index 08863f0..7686756 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-intel (2:2.2.1-2) UNRELEASED; urgency=low
* Add the ${shlibs:Depends} substvar to the -dbg package's dependencies, to
bring in libpciaccess0 (closes: #467215).
+ * Only build on x86, this package doesn't make sense anywhere else.
-- Julien Cristau <jcristau@debian.org> Sun, 24 Feb 2008 10:29:49 +0100
diff --git a/debian/control b/debian/control
index a0917a1..7990f58 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-intel
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-intel.git
Package: xserver-xorg-video-intel
-Architecture: alpha amd64 arm armeb armel hppa hurd-i386 i386 ia64 kfreebsd-i386 m68k mips mipsel netbsd-i386 powerpc
+Architecture: amd64 hurd-i386 i386 kfreebsd-i386 kfreebsd-amd64 netbsd-i386
Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
Provides: ${xviddriver:Provides}
Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-video-i810 (<< 2:1.9.91-1), xserver-xorg-video-i810-modesetting, xserver-xorg-video-intel-modesetting, xserver-xorg-driver-i810
@@ -30,7 +30,7 @@ Description: X.Org X server -- Intel i8xx, i9xx display driver
This package is built from the X.org xf86-video-intel driver module.
Package: xserver-xorg-video-intel-dbg
-Architecture: alpha amd64 arm armeb armel hppa hurd-i386 i386 ia64 kfreebsd-i386 m68k mips mipsel netbsd-i386 powerpc
+Architecture: amd64 hurd-i386 i386 kfreebsd-i386 kfreebsd-amd64 netbsd-i386
Depends: xserver-xorg-video-intel (= ${binary:Version}), ${shlibs:Depends}
Priority: extra
Description: X.Org X server -- Intel i8xx, i9xx display driver (debug symbols)
commit b7096fd14ba4b6019a4083c42edae0716f15ccf7
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 24 10:33:56 2008 +0100
Add the ${shlibs:Depends} substvar to the -dbg package's dependencies
This will bring in libpciaccess0 and closes: #467215.
diff --git a/debian/changelog b/debian/changelog
index 787f365..08863f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.2.1-2) UNRELEASED; urgency=low
+
+ * Add the ${shlibs:Depends} substvar to the -dbg package's dependencies, to
+ bring in libpciaccess0 (closes: #467215).
+
+ -- Julien Cristau <jcristau@debian.org> Sun, 24 Feb 2008 10:29:49 +0100
+
xserver-xorg-video-intel (2:2.2.1-1) unstable; urgency=low
[ Brice Goglin ]
diff --git a/debian/control b/debian/control
index 3ed4e24..a0917a1 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Description: X.Org X server -- Intel i8xx, i9xx display driver
Package: xserver-xorg-video-intel-dbg
Architecture: alpha amd64 arm armeb armel hppa hurd-i386 i386 ia64 kfreebsd-i386 m68k mips mipsel netbsd-i386 powerpc
-Depends: xserver-xorg-video-intel (= ${binary:Version})
+Depends: xserver-xorg-video-intel (= ${binary:Version}), ${shlibs:Depends}
Priority: extra
Description: X.Org X server -- Intel i8xx, i9xx display driver (debug symbols)
This driver provides support for the Intel i8xx and i9xx family of chipsets,
commit 4682799c75a0960d4e26e7c6bdfaa3a1310161a8
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Feb 23 00:53:22 2008 +0100
New upstream release
diff --git a/ChangeLog b/ChangeLog
index d94a5bc..b8e26ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,128 @@
+commit 90dcbcef878e0e708c871702a45381752707418a
+Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
+Date: Fri Feb 22 12:28:50 2008 -0800
+
+ Bump version to 2.2.1
+
+commit c81cf678aabbf84bfa4b98d491a5a38179f591f4
+Author: Jesse Barnes <root@nietzche.virtuousgeek.org>
+Date: Thu Feb 7 11:56:28 2008 -0800
+
+ Add CACHE_MODE_0 register to dump output
+
+commit db2e848b13368eb9c180cd82494645459a6c0382
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Feb 16 18:16:12 2008 -0800
+
+ Decode DSPCLK_GATE, dump PIPE*STAT, MI_MODE, MI_DISPLAY_POWER_DOWN, MI_ARB_STATE, MI_RDRET_STATE, ECOSKPD
+
+commit b85c0992938e85e2228e69a3d9bfdd14958c0f4f
+Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
+Date: Fri Feb 22 11:41:25 2008 -0800
+
+ Add quirk for DVO channel selection
+
+ Some machines want DVOA, some DVOB. We can use this quirk to differentiate
+ them until we come up with a better solution. Patch from Hong Liu.
+
+ Fixes #13722.
+
+commit 5073b4026c536f6e5f0c8c5a741a1852b4480f31
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Tue Feb 19 21:13:45 2008 +0800
+
+ Don't leak memory if no DMI info is provided by kernel
+
+commit 3709962b91402027f2a73f732d1eb935f7d714b9
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Mon Feb 18 14:35:06 2008 +0800
+
+ Fix Lenovo X60 TV quirk
+
+ Z61 has same subsys ids with X60, but does have one S-video
+ TV out. Use DMI info instead to quirk TV on X60, X60s.
+
+commit 866ae8873613a51ca09973f77aa1ea62477b54a1
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Mon Feb 18 14:32:32 2008 +0800
+
+ Add DMI info for i830 quirks
+
+ Linux kernel has CONFIG_DMIID to export dmi info
+ through sysfs.
+
+commit 945ec2b2516b6508857ee5cd136e59accbc6ebe7
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Wed Jan 30 18:55:20 2008 +0800
+
+ hardware status page initialization rework
+
+ Order hardware status page setup more reasonable after
+ all memory bound, in case new chipset requires non-stolen
+ page and that could be bound then.
+
+ Also clean up drm irq handler install function, and put
+ first install in starting stage later than status page setup,
+ so we won't make device cry for uninitialized status page.
+
+commit 9e3fb1c75a9aff6aecfc2a21ccc6b2e2d32a5f9a
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Wed Jan 30 18:52:32 2008 +0800
+
+ Wrap up chipsets which needs graphics address for status page
+
+ Also add support on new chipset.
+
+commit 4ef51aba115820fe79048fa45221138f1e5054d2
+Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
+Date: Thu Feb 21 08:43:34 2008 -0800
+
+ Add pipe A force enable quirk for ThinkPad X40
+
+ ThinkPad X40s need this quirk or they'll crash frequently.
+
+ Fixes #14521.
+
+commit 122e9a266b04b9f88a4294aadfa6fb5f9a6faff5
+Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
+Date: Thu Feb 21 08:37:42 2008 -0800
+
+ Remove side effects from VGA debug code
+
+ The VGA register dumping code was leaving ARX in data mode rather than index
+ mode, which could cause problems for later software accessing AR* registers.
+ Fix it to make sure it's in index mode when we're done.
+
+ Fixes #14434.
+
+commit 83be0e293aee63cd181ace8e36a0ee78e3c5a8e1
+Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
+Date: Wed Feb 20 13:08:27 2008 -0800
+
+ Fix DSP*CNTR restoration
+
+ When checking which pipe a given plane was associated with, we weren't properly
+ masking the pipe selection bits. Fixes #14481 and should allow the driver to
+ work with vesafb again.
+
+commit aa1813e4807e500fb122f36af988cf60f91e05a5
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Tue Feb 19 08:51:53 2008 +0800
+
+ Fix last 8XX clock's p2 value commit
+
+ My fault to change Hong's origin patch reversely.
+
+commit 1cea254b70158600d9dfff8ba66fb2ec0a6e0f67
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Fri Feb 15 13:20:22 2008 +0800
+
+ Bug #14440: fix stolen mem size mask on i830M
+
+ For i830M stolen mem size mask should always be 0x70.
+ Use 0xF0 for later chipsets should be ok, so behavior is
+ identical to kernel agp.
+
commit 2c8f87be99957e0e18d8bcda46bd8706ab374253
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Wed Feb 6 09:35:43 2008 -0800
diff --git a/config.guess b/config.guess
index 278f9e9..f32079a 100755
--- a/config.guess
+++ b/config.guess
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
-timestamp='2007-07-22'
+timestamp='2008-01-23'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -56,8 +56,8 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -532,7 +532,7 @@ EOF
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[45])
+ *:AIX:*:[456])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
@@ -799,6 +799,9 @@ EOF
EM64T | authenticamd)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
+ IA64)
+ echo ia64-unknown-interix${UNAME_RELEASE}
+ exit ;;
esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
@@ -833,7 +836,14 @@ EOF
echo ${UNAME_MACHINE}-pc-minix
exit ;;
arm*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_EABI__
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ else
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ fi
exit ;;
avr32*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -954,8 +964,8 @@ EOF
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
- xtensa:Linux:*:*)
- echo xtensa-unknown-linux-gnu
+ xtensa*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
@@ -1474,9 +1484,9 @@ This script, last modified $timestamp, has failed to recognize
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
and
- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
diff --git a/config.sub b/config.sub
index 1761d8b..6759825 100755
--- a/config.sub
+++ b/config.sub
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
-timestamp='2007-06-28'
+timestamp='2008-01-16'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -369,10 +369,14 @@ case $basic_machine in
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa-* \
+ | xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-*)
;;
+ # Recognize the basic CPU types without company name, with glob match.
+ xtensa*)
+ basic_machine=$basic_machine-unknown
+ ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
@@ -443,6 +447,14 @@ case $basic_machine in
basic_machine=ns32k-sequent
os=-dynix
;;
+ blackfin)
+ basic_machine=bfin-unknown
+ os=-linux
+ ;;
+ blackfin-*)
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
c90)
basic_machine=c90-cray
os=-unicos
@@ -668,6 +680,14 @@ case $basic_machine in
basic_machine=m68k-isi
os=-sysv
;;
+ m68knommu)
+ basic_machine=m68k-unknown
+ os=-linux
+ ;;
+ m68knommu-*)
+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
m88k-omron*)
basic_machine=m88k-omron
;;
@@ -813,6 +833,14 @@ case $basic_machine in
basic_machine=i860-intel
os=-osf
;;
+ parisc)
+ basic_machine=hppa-unknown
+ os=-linux
+ ;;
+ parisc-*)
+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
pbd)
basic_machine=sparc-tti
;;
@@ -1021,6 +1049,10 @@ case $basic_machine in
basic_machine=tic6x-unknown
os=-coff
;;
+ tile*)
+ basic_machine=tile-unknown
+ os=-linux-gnu
+ ;;
tx39)
basic_machine=mipstx39-unknown
;;
diff --git a/configure b/configure
index aabba24..4944cb6 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-video-intel 2.2.0.90.
+# Generated by GNU Autoconf 2.61 for xf86-video-intel 2.2.1.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xf86-video-intel'
PACKAGE_TARNAME='xf86-video-intel'
-PACKAGE_VERSION='2.2.0.90'
-PACKAGE_STRING='xf86-video-intel 2.2.0.90'
+PACKAGE_VERSION='2.2.1'
+PACKAGE_STRING='xf86-video-intel 2.2.1'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1453,7 +1453,7 @@ if test "$ac_init_help" = "long"; then
# 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 xf86-video-intel 2.2.0.90 to adapt to many kinds of systems.
+\`configure' configures xf86-video-intel 2.2.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1523,7 +1523,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-intel 2.2.0.90:";;
+ short | recursive ) echo "Configuration of xf86-video-intel 2.2.1:";;
esac
cat <<\_ACEOF
@@ -1648,7 +1648,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-intel configure 2.2.0.90
+xf86-video-intel configure 2.2.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1662,7 +1662,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-video-intel $as_me 2.2.0.90, which was
+It was created by xf86-video-intel $as_me 2.2.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2357,7 +2357,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-video-intel'
- VERSION='2.2.0.90'
+ VERSION='2.2.1'
cat >>confdefs.h <<_ACEOF
@@ -23160,7 +23160,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-video-intel $as_me 2.2.0.90, which was
+This file was extended by xf86-video-intel $as_me 2.2.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23213,7 +23213,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-video-intel config.status 2.2.0.90
+xf86-video-intel config.status 2.2.1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/debian/changelog b/debian/changelog
index 1d58356..787f365 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
-xserver-xorg-video-intel (2:2.2.0.90-4) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.2.1-1) unstable; urgency=low
+ [ Brice Goglin ]
+ * New upstream release.
+ + Fix some blinking pixels and unreadable text, closes: #465921.
+ + Fix i830 stolen memory mask, closes: #464661.
+ + Fix flickering on i855, closes: #443809, #435621.
+
+ [ Julien Cristau ]
* Build the intel_reg_dumper tool, and install it in the -dbg package.
Add build-dependency on libpciaccess-dev.
- -- Julien Cristau <jcristau@debian.org> Tue, 19 Feb 2008 16:31:43 +0100
+ -- Brice Goglin <bgoglin@debian.org> Sat, 23 Feb 2008 00:52:39 +0100
xserver-xorg-video-intel (2:2.2.0.90-3) unstable; urgency=low
commit 90dcbcef878e0e708c871702a45381752707418a
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Fri Feb 22 12:28:50 2008 -0800
Bump version to 2.2.1
diff --git a/configure.ac b/configure.ac
index 2b7b540..5278f0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-intel],
- 2.2.0.90,
+ 2.2.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-intel)
commit c81cf678aabbf84bfa4b98d491a5a38179f591f4
Author: Jesse Barnes <root@nietzche.virtuousgeek.org>
Date: Thu Feb 7 11:56:28 2008 -0800
Add CACHE_MODE_0 register to dump output
diff --git a/src/i830_debug.c b/src/i830_debug.c
index 38c90ec..7d0c0a0 100644
--- a/src/i830_debug.c
+++ b/src/i830_debug.c
@@ -493,6 +493,7 @@ static struct i830SnapshotRec {
DEFINEREG2(VCLK_DIVISOR_VGA1, i830_debug_fp),
DEFINEREG2(VCLK_POST_DIV, i830_debug_vga_pd),
DEFINEREG2(DPLL_TEST, i830_debug_dpll_test),
+ DEFINEREG(CACHE_MODE_0),
DEFINEREG(D_STATE),
DEFINEREG2(DSPCLK_GATE_D, i830_debug_dspclk_gate_d),
DEFINEREG(RENCLK_GATE_D1),
commit db2e848b13368eb9c180cd82494645459a6c0382
Author: Keith Packard <keithp@keithp.com>
Date: Sat Feb 16 18:16:12 2008 -0800
Decode DSPCLK_GATE, dump PIPE*STAT, MI_MODE, MI_DISPLAY_POWER_DOWN, MI_ARB_STATE, MI_RDRET_STATE, ECOSKPD
diff --git a/src/i810_reg.h b/src/i810_reg.h
index e69ae0a..5170004 100644
--- a/src/i810_reg.h
+++ b/src/i810_reg.h
@@ -365,7 +365,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define CACHE_MODE_0 0x2120
#define CACHE_MODE_1 0x2124
+#define MI_MODE 0x209c
+#define MI_DISPLAY_POWER_DOWN 0x20e0
#define MI_ARB_STATE 0x20e4
+#define MI_RDRET_STATE 0x20fc
/* Start addresses for each of the primary rings:
*/
@@ -976,6 +979,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define D_STATE 0x6104
#define DSPCLK_GATE_D 0x6200
+# define DPUNIT_B_CLOCK_GATE_DISABLE (1 << 30) /* 965 */
+# define VSUNIT_CLOCK_GATE_DISABLE (1 << 29) /* 965 */
+# define VRHUNIT_CLOCK_GATE_DISABLE (1 << 28) /* 965 */
+# define VRDUNIT_CLOCK_GATE_DISABLE (1 << 27) /* 965 */
+# define AUDUNIT_CLOCK_GATE_DISABLE (1 << 26) /* 965 */
+# define DPUNIT_A_CLOCK_GATE_DISABLE (1 << 25) /* 965 */
+# define DPCUNIT_CLOCK_GATE_DISABLE (1 << 24) /* 965 */
# define TVRUNIT_CLOCK_GATE_DISABLE (1 << 23) /* 915-945 */
# define TVCUNIT_CLOCK_GATE_DISABLE (1 << 22) /* 915-945 */
# define TVFUNIT_CLOCK_GATE_DISABLE (1 << 21) /* 915-945 */
@@ -990,7 +1000,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
# define DPLUNIT_CLOCK_GATE_DISABLE (1 << 12) /* 915-945 */
# define DPOUNIT_CLOCK_GATE_DISABLE (1 << 11)
# define DPBUNIT_CLOCK_GATE_DISABLE (1 << 10)
-# define DPCUNIT_CLOCK_GATE_DISABLE (1 << 9)
+# define DCUNIT_CLOCK_GATE_DISABLE (1 << 9)
# define DPUNIT_CLOCK_GATE_DISABLE (1 << 8)
# define VRUNIT_CLOCK_GATE_DISABLE (1 << 7) /* 915+: reserved */
# define OVHUNIT_CLOCK_GATE_DISABLE (1 << 6) /* 830-865 */
@@ -1995,6 +2005,32 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define PIPEAGCMAXGREEN 0x70014
#define PIPEAGCMAXBLUE 0x70018
#define PIPEASTAT 0x70024
+# define FIFO_UNDERRUN (1 << 31)
+# define CRC_ERROR_ENABLE (1 << 29)
+# define CRC_DONE_ENABLE (1 << 28)
+# define GMBUS_EVENT_ENABLE (1 << 27)
+# define VSYNC_INT_ENABLE (1 << 25)
+# define DLINE_COMPARE_ENABLE (1 << 24)
+# define DPST_EVENT_ENABLE (1 << 23)
+# define LBLC_EVENT_ENABLE (1 << 22)
+# define OFIELD_INT_ENABLE (1 << 21)
+# define EFIELD_INT_ENABLE (1 << 20)
+# define SVBLANK_INT_ENABLE (1 << 18)
+# define VBLANK_INT_ENABLE (1 << 17)
+# define OREG_UPDATE_ENABLE (1 << 16)
+# define CRC_ERROR_INT_STATUS (1 << 13)
+# define CRC_DONE_INT_STATUS (1 << 12)
+# define GMBUS_INT_STATUS (1 << 11)
+# define VSYNC_INT_STATUS (1 << 9)
+# define DLINE_COMPARE_STATUS (1 << 8)
+# define DPST_EVENT_STATUS (1 << 7)
+# define LBLC_EVENT_STATUS (1 << 6)
+# define OFIELD_INT_STATUS (1 << 5)
+# define EFIELD_INT_STATUS (1 << 4)
+# define SVBLANK_INT_STATUS (1 << 2)
+# define VBLANK_INT_STATUS (1 << 1)
+# define OREG_UPDATE_STATUS (1 << 0)
+
#define DSPARB 0x70030
#define DSPFW1 0x70034
diff --git a/src/i830_debug.c b/src/i830_debug.c
index 9cf7ba5..38c90ec 100644
--- a/src/i830_debug.c
+++ b/src/i830_debug.c
@@ -88,6 +88,61 @@ DEBUGSTRING(i830_debug_pipeconf)
return XNFprintf("%s, %s", enabled, bit30);
}
Reply to: