Makefile.am | 7 -
Makefile.in | 10 -
README | 280 ++++++++++++++++----------------------------
README.sgml | 133 --------------------
TODO | 3
configure | 20 +--
configure.ac | 2
debian/changelog | 6
debian/control | 11 -
debian/rules | 2
man/intel.man | 6
src/Makefile.am | 21 +--
src/Makefile.in | 25 ++-
src/bios_reader/Makefile.am | 2
src/bios_reader/Makefile.in | 2
src/ch7017/Makefile.am | 2
src/ch7017/Makefile.in | 8 -
src/ch7017/ch7017.c | 8 -
src/ch7xxx/Makefile.am | 3
src/ch7xxx/Makefile.in | 4
src/ch7xxx/ch7xxx.c | 8 -
src/common.h | 10 +
src/i810_driver.c | 3
src/i810_reg.h | 89 +++++++++++++
src/i830.h | 3
src/i830_bios.c | 8 -
src/i830_display.c | 37 +++--
src/i830_dri.c | 5
src/i830_driver.c | 30 +++-
src/i830_lvds.c | 13 +-
src/i830_reg.h | 1
src/i830_render.c | 122 +++++++++----------
src/i830_sdvo.c | 78 +++++++-----
src/i830_tv.c | 24 ++-
src/ivch/Makefile.am | 3
src/ivch/Makefile.in | 4
src/sil164/Makefile.am | 3
src/sil164/Makefile.in | 4
src/xvmc/Makefile.am | 3
src/xvmc/Makefile.in | 4
40 files changed, 477 insertions(+), 530 deletions(-)
New commits:
commit 0f70b7bb8bd7425fc97b8767c62ffd307afedc4c
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Tue Apr 3 11:37:39 2007 +0200
New upstream release candidate.
Run autoreconf to update configure/Makefile.in.
diff --git a/Makefile.in b/Makefile.in
index 96faa10..2b6d7f2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -57,9 +57,8 @@ build_triplet = @build@
host_triplet = @host@
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/configure COPYING ChangeLog TODO compile \
- config.guess config.sub depcomp install-sh ltmain.sh missing \
- mkinstalldirs
+ $(top_srcdir)/configure COPYING ChangeLog compile config.guess \
+ config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -244,7 +243,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
-EXTRA_DIST = README.sgml
+EXTRA_DIST = README
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -679,9 +678,6 @@ uninstall-info: uninstall-info-recursive
mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
tags tags-recursive uninstall uninstall-am uninstall-info-am
-
[EMAIL PROTECTED]@README: README.sgml
[EMAIL PROTECTED]@ $(MAKE_TEXT) README.sgml && mv README.txt README
# 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 --git a/configure b/configure
index 863c28d..14688f9 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 1.9.93.
+# Generated by GNU Autoconf 2.61 for xf86-video-intel 1.9.94.
#
# 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='1.9.93'
-PACKAGE_STRING='xf86-video-intel 1.9.93'
+PACKAGE_VERSION='1.9.94'
+PACKAGE_STRING='xf86-video-intel 1.9.94'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1447,7 +1447,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 1.9.93 to adapt to many kinds of
systems.
+\`configure' configures xf86-video-intel 1.9.94 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1517,7 +1517,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-intel 1.9.93:";;
+ short | recursive ) echo "Configuration of xf86-video-intel 1.9.94:";;
esac
cat <<\_ACEOF
@@ -1642,7 +1642,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-intel configure 1.9.93
+xf86-video-intel configure 1.9.94
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1656,7 +1656,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 1.9.93, which was
+It was created by xf86-video-intel $as_me 1.9.94, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2347,7 +2347,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-video-intel'
- VERSION='1.9.93'
+ VERSION='1.9.94'
cat >>confdefs.h <<_ACEOF
@@ -22163,7 +22163,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 1.9.93, which was
+This file was extended by xf86-video-intel $as_me 1.9.94, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22216,7 +22216,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-video-intel config.status 1.9.93
+xf86-video-intel config.status 1.9.94
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 229003c..12cfa2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:1.9.94-1) experimental; urgency=low
+
+ * New upstream release candidate.
+
+ -- Julien Cristau <[EMAIL PROTECTED]> Tue, 03 Apr 2007 11:36:43 +0200
+
xserver-xorg-video-intel (2:1.9.93-1) experimental; urgency=low
* New upstream release candidate.
diff --git a/src/Makefile.in b/src/Makefile.in
index 55f9750..17d10ca 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -95,12 +95,12 @@ am__intel_drv_la_SOURCES_DIST = brw_defines.h brw_structs.h
sf_prog.h \
i915_render.c i965_render.c local_xf86Rename.h \
parser/xf86Parser.h parser/xf86Optrec.h modes/xf86Modes.h \
modes/xf86Modes.c modes/xf86cvt.c modes/xf86Crtc.h \
- modes/xf86Crtc.c modes/xf86EdidModes.c modes/xf86RandR12.c \
- modes/xf86RandR12.h modes/xf86Rename.h modes/xf86Rotate.c \
- modes/xf86DiDGA.c i810_dri.c i810_dri.h i830_dri.c i810_hwmc.c \
- i830_dri.h
-am__objects_1 = xf86Modes.lo xf86cvt.lo xf86Crtc.lo xf86EdidModes.lo \
- xf86RandR12.lo xf86Rotate.lo xf86DiDGA.lo
+ modes/xf86Crtc.c modes/xf86Cursors.c modes/xf86EdidModes.c \
+ modes/xf86RandR12.c modes/xf86RandR12.h modes/xf86Rename.h \
+ modes/xf86Rotate.c modes/xf86DiDGA.c i810_dri.c i810_dri.h \
+ i830_dri.c i810_hwmc.c i830_dri.h
+am__objects_1 = xf86Modes.lo xf86cvt.lo xf86Crtc.lo xf86Cursors.lo \
+ xf86EdidModes.lo xf86RandR12.lo xf86Rotate.lo xf86DiDGA.lo
@[EMAIL PROTECTED] = $(am__objects_1)
am__objects_3 = i810_dri.lo i830_dri.lo i810_hwmc.lo
@[EMAIL PROTECTED] = $(am__objects_3)
@@ -310,7 +310,8 @@ XMODE_SRCS = \
modes/xf86cvt.c \
modes/xf86Crtc.h \
modes/xf86Crtc.c \
- modes/xf86EdidModes.c \
+ modes/xf86Cursors.c \
+ modes/xf86EdidModes.c \
modes/xf86RandR12.c \
modes/xf86RandR12.h \
modes/xf86Rename.h \
@@ -322,7 +323,7 @@ INTEL_DRI_SRCS = \
i810_dri.h \
i830_dri.c \
i810_hwmc.c \
- i830_dri.h
+ i830_dri.h
intel_drv_la_SOURCES = brw_defines.h brw_structs.h sf_prog.h wm_prog.h \
common.h i2c_vid.h i810_accel.c i810_common.h i810_cursor.c \
@@ -472,6 +473,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@@ -521,6 +523,13 @@ xf86Crtc.lo: modes/xf86Crtc.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
$(CFLAGS) -c -o xf86Crtc.lo `test -f 'modes/xf86Crtc.c' || echo
'$(srcdir)/'`modes/xf86Crtc.c
+xf86Cursors.lo: modes/xf86Cursors.c
[EMAIL PROTECTED]@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
$(CFLAGS) -MT xf86Cursors.lo -MD -MP -MF "$(DEPDIR)/xf86Cursors.Tpo" -c -o
xf86Cursors.lo `test -f 'modes/xf86Cursors.c' || echo
'$(srcdir)/'`modes/xf86Cursors.c; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/xf86Cursors.Tpo"
"$(DEPDIR)/xf86Cursors.Plo"; else rm -f "$(DEPDIR)/xf86Cursors.Tpo"; exit 1; fi
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ source='modes/xf86Cursors.c'
object='xf86Cursors.lo' libtool=yes @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
$(CFLAGS) -c -o xf86Cursors.lo `test -f 'modes/xf86Cursors.c' || echo
'$(srcdir)/'`modes/xf86Cursors.c
+
xf86EdidModes.lo: modes/xf86EdidModes.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
$(CFLAGS) -MT xf86EdidModes.lo -MD -MP -MF "$(DEPDIR)/xf86EdidModes.Tpo" -c -o
xf86EdidModes.lo `test -f 'modes/xf86EdidModes.c' || echo
'$(srcdir)/'`modes/xf86EdidModes.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xf86EdidModes.Tpo"
"$(DEPDIR)/xf86EdidModes.Plo"; else rm -f "$(DEPDIR)/xf86EdidModes.Tpo"; exit
1; fi
diff --git a/src/bios_reader/Makefile.in b/src/bios_reader/Makefile.in
index 66807e8..f040f86 100644
--- a/src/bios_reader/Makefile.in
+++ b/src/bios_reader/Makefile.in
@@ -223,7 +223,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-AM_CFLAGS = @XORG_CFLAGS@ @XMODES_CFLAGS@
+AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @XMODES_CFLAGS@
@[EMAIL PROTECTED] = bios_dumper
@[EMAIL PROTECTED] = bios_dumper.c
@[EMAIL PROTECTED] = $(PCIACCESS_CFLAGS)
diff --git a/src/ch7017/Makefile.in b/src/ch7017/Makefile.in
index 6a13a2f..0f044d3 100644
--- a/src/ch7017/Makefile.in
+++ b/src/ch7017/Makefile.in
@@ -223,13 +223,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-
-# this is obnoxious:
-# -module lets us name the module exactly how we want
-# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
-# _ladir passes a dummy rpath to libtool so the thing will actually link
-# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(srcdir)/..
-I$(srcdir)/../modes
+AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ @XMODES_CFLAGS@
ch7017_la_LTLIBRARIES = ch7017.la
ch7017_la_LDFLAGS = -module -avoid-version
ch7017_ladir = @moduledir@/drivers
diff --git a/src/ch7xxx/Makefile.in b/src/ch7xxx/Makefile.in
index 2d991ac..9089602 100644
--- a/src/ch7xxx/Makefile.in
+++ b/src/ch7xxx/Makefile.in
@@ -229,7 +229,9 @@ target_alias = @target_alias@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(srcdir)/..
-I$(srcdir)/../modes
+AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
+ -I$(srcdir)/.. -I$(srcdir)/../modes
+
ch7xxx_la_LTLIBRARIES = ch7xxx.la
ch7xxx_la_LDFLAGS = -module -avoid-version
ch7xxx_ladir = @moduledir@/drivers
diff --git a/src/ivch/Makefile.in b/src/ivch/Makefile.in
index 34678f7..7da2d9b 100644
--- a/src/ivch/Makefile.in
+++ b/src/ivch/Makefile.in
@@ -229,7 +229,9 @@ target_alias = @target_alias@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(srcdir)/..
-I$(srcdir)/../modes
+AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
+ -I$(srcdir)/.. -I$(srcdir)/../modes
+
ivch_la_LTLIBRARIES = ivch.la
ivch_la_LDFLAGS = -module -avoid-version
ivch_ladir = @moduledir@/drivers
diff --git a/src/sil164/Makefile.in b/src/sil164/Makefile.in
index 52fd622..222391e 100644
--- a/src/sil164/Makefile.in
+++ b/src/sil164/Makefile.in
@@ -229,7 +229,9 @@ target_alias = @target_alias@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(srcdir)/..
-I$(srcdir)/../modes
+AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
+ -I$(srcdir)/.. -I$(srcdir)/../modes
+
sil164_la_LTLIBRARIES = sil164.la
sil164_la_LDFLAGS = -module -avoid-version
sil164_ladir = @moduledir@/drivers
diff --git a/src/xvmc/Makefile.in b/src/xvmc/Makefile.in
index cb1d480..146b2a3 100644
--- a/src/xvmc/Makefile.in
+++ b/src/xvmc/Makefile.in
@@ -229,7 +229,9 @@ target_alias = @target_alias@
@[EMAIL PROTECTED] = I810XvMC.c \
@DRI_TRUE@ I810XvMC.h
[EMAIL PROTECTED]@libI810XvMC_la_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@
-I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
[EMAIL PROTECTED]@libI810XvMC_la_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@
@DRI_CFLAGS@ \
[EMAIL PROTECTED]@ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
+
@[EMAIL PROTECTED] = -version-number 1:0:0
@[EMAIL PROTECTED] = @DRI_LIBS@
all: all-am
commit 3aebe017652440344d5b433c3a43e851c4244efa
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Tue Apr 3 11:33:31 2007 +0200
Revert "Build a xserver-xorg-video-intel-dbg package with debugging
symbols."
This reverts commit aa6bdbbeeb6776afda6eee53edf8cd39a1280afc.
Let's get 1.9.94 in the archive first, we'll build the -dbg package later.
diff --git a/debian/changelog b/debian/changelog
index 9e1844d..229003c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-xserver-xorg-video-intel (2:1.9.93-2) UNRELEASED; urgency=low
-
- * Build a xserver-xorg-video-intel-dbg package with debugging symbols.
-
- -- Brice Goglin <[EMAIL PROTECTED]> Sat, 31 Mar 2007 14:10:59 +0200
-
xserver-xorg-video-intel (2:1.9.93-1) experimental; urgency=low
* New upstream release candidate.
diff --git a/debian/control b/debian/control
index 868e69d..40dd1d3 100644
--- a/debian/control
+++ b/debian/control
@@ -28,17 +28,6 @@ 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: any
-Depends: xserver-xorg-video-intel (= ${Source-Version})
-Priority: extra
-Description: X.Org X server -- Intel i8xx, i9xx display driver (debugging
symbols)
- This driver provides support for the Intel i8xx and i9xx family of chipsets,
- including i810, i815, i830, i845, i855, i865, i915, and i945 series chips,
- and XvMC (XVideo Motion Compensation) support for the same chipsets.
- .
- This package provides debugging symbols for this Xorg X driver.
-
Package: xserver-xorg-video-i810
Architecture: all
Section: oldlibs
diff --git a/debian/rules b/debian/rules
index f0a8552..2d2de84 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,7 +75,7 @@ binary-arch: build install serverabi
dh_install --sourcedir=debian/tmp --list-missing --exclude=.la
--exclude=usr/share/man/man4
dh_installman
dh_link
- dh_strip --dbg-package=xserver-xorg-video-intel-dbg
+ dh_strip
dh_compress
dh_fixperms
dh_makeshlibs
commit d9d05b553ca1f98efc230ef13f34576122311ac1
Author: Eric Anholt <[EMAIL PROTECTED]>
Date: Tue Apr 3 00:15:02 2007 -0700
Bump version to 1.9.94 for 2.0 RC4.
diff --git a/configure.ac b/configure.ac
index dccfd75..06431ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-intel],
- 1.9.93,
+ 1.9.94,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-intel)
commit eb45315b07624cb0506d539f523728a651efb798
Author: Eric Anholt <[EMAIL PROTECTED]>
Date: Mon Apr 2 18:20:33 2007 -0700
Move README to being a plain old text file.
diff --git a/Makefile.am b/Makefile.am
index 2b6c46a..8cbe4a9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,9 +21,4 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
-if BUILD_LINUXDOC
-README: README.sgml
- $(MAKE_TEXT) README.sgml && mv README.txt README
-endif
-
-EXTRA_DIST = README.sgml
+EXTRA_DIST = README
diff --git a/README b/README
index e2061c4..788acdb 100644
--- a/README
+++ b/README
@@ -1,177 +1,103 @@
- Information for Intel graphics driver users
- Eric Anholt
- 2006-08-04
- ____________________________________________________________
-
- Table of Contents
-
-
- 1. Introduction
- 2. Supported Hardware
- 3. Features
- 4. Technical Notes
- 5. Configuration
- 6. Driver Options
- 7. Known Limitations
- 8. Author
-
-
- ______________________________________________________________________
-
- 11.. IInnttrroodduuccttiioonn
-
- This document provides a brief summary of the Intel graphics support
- provided by the xf86-video-intel driver. More information can also be
- found in the i810(4) manual page.
-
-
- 22.. SSuuppppoorrtteedd HHaarrddwwaarree
-
-
- +o i810,
-
- +o i810-dc100,
-
- +o i810e
-
- +o i815
-
- +o i830
-
- +o i845
-
- +o i852
-
- +o i855
-
- +o i915
-
- +o i945
-
- +o i965
-
-
-
- 33.. FFeeaattuurreess
-
-
- +o Full support for 8, 15, 16, and 24 bit pixel depths.
-
- +o Hardware accelerated 2D drawing engine support for 8, 15, 16 and 24
- bit pixel depths.
-
- +o Hardware accelerated 3D drawing using OpenGL and the DRI.
-
- +o Hardware cursor support to reduce sprite flicker.
-
- +o Textured video XV implementation on i915 through i965.
-
- +o Hardware overlay XV implementation up through i945.
-
- +o Screen resize and rotation on chipsets up through i945.
-
- +o Screen resize on i965.
-
-
-
- 44.. TTeecchhnniiccaall NNootteess
-
-
- +o Interlace modes cannot be supported.
-
- +o This driver requires kernel support for AGP, which is included in
- Linux kernels 2.3.42 and higher, and FreeBSD 4.1 and higher.
-
-
-
- 55.. CCoonnffiigguurraattiioonn
-
- The driver auto-detects all device information necessary to initialize
- the card. The only lines you should need in the "Device" section of
- your xorg.conf file are:
-
- Section "Device"
- Identifier "Intel i810"
- Driver "i810"
- EndSection
-
-
-
- In order to use most resolutions, it is necessary to install the
- "agpgart.o" module. You will probably have to compile the module
- yourself (see the notes in the module).
-
-
- 66.. DDrriivveerr OOppttiioonnss
-
- Please refer to the i810(4) manual page for information on
- configuration options.
-
-
-
- 77.. KKnnoowwnn LLiimmiittaattiioonnss
-
-
- +o Many systems with Intel graphics have issues with setting video
- modes at larger than some small maximum resolution. This is not
- fixed in the current release, but is being actively worked on in
- the modesetting branch.
-
- +o Bug #5795: Some systems have issues with VT switching. This should
- be fixed with the modesetting brach integration.
-
- +o Bug #5817: Hotkey switching from LVDS to CRT breaks CRT output.
- This is a known issue, but will not be fixed in the current
- release.
-
- +o Bug #6635: Video is output from an incorrect offset in the
- framebuffer. This is expected to be fixed with the modesetting
- branch integration.
-
- +o GL_EXT_texture_compression_s3tc is not supported. We can't support
- the extension due to patent restrictions on compression, but may be
- able to support an option for partial extension support in the
- future. For now, this prevents Quake4 and some other games from
- running.
-
- +o Some X Test Suite cases sometimes fail due to a timeout. These
- cases include: Xt8/XtResizeWindow, Xt8/XtQueryGeometry,
- Xt9/XtAppAddInput, Xt9/XtRemoveInput, Xt9/XtAppAddTimeOut,
- Xt9/XtRemoveTimeOut, Xt9/XtAddGrab, Xt9/XtRemoveGrab.
-
- +o Some X Test Suite cases fail in 64-bit mode: Xlib9/XDrawArc,
- XDrawImageString, XDrawLine, XDrawRectangle, XDrawSegments,
- XFillArc, XFillPolygon, XFillRectangle, XPutImage,
- Xt11/XtVaGetSubresources, XtSetSubvalues, and XtVaSetSubvalues.
-
- +o Some GLEAN test cases fail if DRI is enabled: pointAtten,
- readPixSanity, texCombine, texCube, texEnv, texgen,
- coloredTexPerf2, and coloredLitPerf2.
-
-
-
- 88.. AAuutthhoorr
-
-
- +o Eric Anholt
-
- +o Keith Whitwell
-
- The X11R7.1 version of this driver originally came from XFree86 4.4
- rc2.
-
- The XFree86 version of this driver was donated to The XFree86 Project
- by:
-
- Precision Insight, Inc.
- Cedar Park, TX
- USA
-
-
-
- The X.Org version of this driver is maintained by Intel Corporation.
-
- http://www.intellinuxgraphics.org
-
-
-
+Information for Intel graphics driver users
+Eric Anholt
+2006-04-02
+
+This document provides a brief summary of the Intel graphics support provided
+by the xf86-video-intel driver. More information can also be found in the
+intel(4) manual page.
+
+Supported Hardware:
+ i810,
+ i810-dc100,
+ i810e
+ i815
+ i830
+ i845
+ i852
+ i855
+ i915
+ i945
+ i965
+
+Features
+- Full support for 8, 15, 16, and 24 bit pixel depths.
+- Hardware accelerated 2D drawing engine support for 8, 15, 16 and 24 bit
+ pixel depths.
+- Hardware accelerated 3D drawing using OpenGL and the DRI.
+- Hardware cursor support to reduce sprite flicker.
+- Textured video XV implementation on i915 through i965.
+- Hardware overlay XV implementation up through i945.
+- Screen resize and rotation.
+
+Technical Notes
+- Interlace modes cannot be supported.
+- This driver requires kernel support for AGP, which is included in Linux
+ kernels 2.3.42 and higher, and FreeBSD 4.1 and higher.
+- This driver may be built against xserver 1.2.0 or newer. If built
+ from git source against an older server, a copy of xserver 1.3.0 source is
+ needed to complete the build, which is chosen with the --with-xserver-source
+ argument to ./configure. The compatibility mode with xserver 1.2.0 will have
+ limited functionality, in particular by not supporting RandR 1.2 or the
+ new Damage 1.1 updated needed for 3D applications to work with display
+ rotation.
+
+Configuration
+
+The driver auto-detects all device information necessary to
+initialize the card. The only lines you should need in the "Device"
+section of your xorg.conf file are:
+
+ Section "Device"
+ Identifier "intel"
+ Driver "intel"
+ EndSection
+
+Please refer to the intel(4) manual page for information on configuration
+options.
+
+
+Known Limitations
+- Bug #8534: i830 laptop panels not supported. The driver
+ will fail to recognize them, and only function through VGA output. Two
+ partial DVO chip drivers (ivch and ch7017) are included which contain some of
+ the code necessary for i830 laptop panel support, but some I2C debugging will
+ be necessary to get those drivers to attach.
+- No support for "zaphod mode" dualhead. This is the mode in which two
+ Device sections are placed in the config file, and doesn't support DRI or
+ many other features. Instead, only "MergedFB-style" dualhead is supported.
+- No support for X Screens larger than 2048 pixels in either direction
+ before the 965. This reflects hardware limitations in the x direction on
+ those older chips, and limits dualhead functionality. It may be possible to
+ extend the limit vertically on these older chips.
+- i855 XV may cause hangs. This was present in the previous release, and no
+ workaround is known.
+- SDVO TV-out cards not supported. This should be fixed in the next
+ release.
+- Gray output with integrated TV-out and PAL TVs.
+- EXA support unstable on i845.
+
+Common issues not caused by the driver
+- Font sizes (DPI) are wrong. Some displays incorrectly report their
+ physical size, which is harmless on most OSes that always assume 96dpi
+ displays. This can be fixed through quirks for specific monitors in the X
+ Server, and the output of xrandr --prop along with a physical measurement of
+ the screen size in a bug report against the server can help get that fixed.
+- gnome-panel is located in the middle of the screen. gnome-panel places
+ itself within head #0's boundaries, which doesn't work well with a second
+ head covering the same area as head #0 but larger.
+- Older resolution-changing applicationss have poor results in
+ multihead systems. Previous extensions such as RandR 1.1 exposed only a
+ single output to client programs, and those requests map poorly to multi-head
+ systems. Currently, those requests map to just one of the outputs in the
+ RandR 1.2 environment, and those applications need to be updated to RandR 1.2
+ API when available for better results.
+
+The X11R6 version of this driver originally came from XFree86 4.4 rc2.
+
+The XFree86 version of this driver was donated to The XFree86 Project by:
+ Precision Insight, Inc.
+ Cedar Park, TX
+ USA
+
+The X.Org version of this driver is maintained by Intel Corporation.
+<http://www.intellinuxgraphics.org>
diff --git a/README.sgml b/README.sgml
deleted file mode 100644
index 4a67017..0000000
--- a/README.sgml
+++ /dev/null
@@ -1,147 +0,0 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN" [
-<!ENTITY % defs SYSTEM "defs.ent"> %defs;
-]>
-
-<article>
-<title>Information for Intel graphics driver users
-<author>Eric Anholt
-<date>2006-04-02
-<toc>
-
-<sect>Introduction
-<p>
-This document provides a brief summary of the Intel graphics support provided
-by the xf86-video-intel driver. More information can also be found in the
-<htmlurl name="intel(4)" url="intel.4.html"> manual page.
-
-<sect>Supported Hardware
-<p>
-<itemize>
- <item>i810,
- <item>i810-dc100,
- <item>i810e
- <item>i815
- <item>i830
- <item>i845
- <item>i852
- <item>i855
- <item>i915
- <item>i945
- <item>i965
-</itemize>
-
-
-<sect>Features
-<p>
-<itemize>
- <item>Full support for 8, 15, 16, and 24 bit pixel depths.
- <item>Hardware accelerated 2D drawing engine support for 8, 15, 16 and
- 24 bit pixel depths.
- <item>Hardware accelerated 3D drawing using OpenGL and the DRI.
- <item>Hardware cursor support to reduce sprite flicker.
- <item>Textured video XV implementation on i915 through i965.
- <item>Hardware overlay XV implementation up through i945.
- <item>Screen resize and rotation.
-</itemize>
-
-
-<sect>Technical Notes
-<p>
-<itemize>
- <item>Interlace modes cannot be supported.
- <item>This driver requires kernel support for AGP, which is
- included in Linux kernels 2.3.42 and higher, and FreeBSD 4.1
- and higher.
- <item>This driver may be built against xserver 1.2.0 or newer. If built
- from git source against an older server, a copy of xserver 1.3.0 source is
- needed to complete the build, which is chosen with the --with-xserver-source
- argument to ./configure. The compatibility mode with xserver 1.2.0 will have
- limited functionality, in particular by not supporting RandR 1.2 or the
- new Damage 1.1 updated needed for 3D applications to work with display
- rotation.
-</itemize>
-
-
-<sect>Configuration
-<p>
-The driver auto-detects all device information necessary to
-initialize the card. The only lines you should need in the "Device"
-section of your xorg.conf file are:
-<verb>
- Section "Device"
- Identifier "intel"
- Driver "intel"
- EndSection
-</verb>
-
-<sect>Driver Options
-<p>
-Please refer to the <htmlurl name="intel(4)" url="intel.4.html"> manual page
-for information on configuration options.
-
-
-<sect>Known Limitations
-<p>
-<itemize>
- <item>Bug #8534: i830 laptop panels not supported. The driver
- will fail to recognize them, and only function through VGA output. Two
- partial DVO chip drivers (ivch and ch7017) are included which contain some of
- the code necessary for i830 laptop panel support, but some I2C debugging will
- be necessary to get those drivers to attach.
- <item>No support for "zaphod mode" dualhead. This is the mode in which two
- Device sections are placed in the config file, and doesn't support DRI or
- many other features. Instead, only "MergedFB-style" dualhead is supported.
- <item>No support for X Screens larger than 2048 pixels in either direction
- before the 965. This reflects hardware limitations in the x direction on
- those older chips, and limits dualhead functionality. It may be possible to
- extend the limit vertically on these older chips.
- <item>i855 XV may cause hangs. This was present in the previous release,
- and no workaround is known.
- <item>SDVO TV-out cards not supported. This should be fixed in the next
- release.
- <item>Gray output with integrated TV-out.
- <item>EXA support unstable on i845.
-</itemize>
-
-<sect>Common issues not caused by the driver
-<itemize>
- <item>Font sizes (DPI) are wrong. Some displays incorrectly report their
- physical size, which is harmless on most OSes that always assume 96dpi
- displays. This can be fixed through quirks for specific monitors in the X
- Server, and the output of xrandr --prop along with a physical measurement of
- the screen size in a bug report against the server can help get that fixed.
- <item>gnome-panel is located in the middle of the screen. gnome-panel places
- itself within head #0's boundaries, which doesn't work well with a second
- head covering the same area as head #0 but larger.
- <item>Older resolution-changing applicationss have poor results in
- multihead systems. Previous extensions such as RandR 1.1 exposed only a
- single output to client programs, and those requests map poorly to multi-head
- systems. Currently, those requests map to just one of the outputs in the
- RandR 1.2 environment, and those applications need to be updated to RandR 1.2
- API when available for better results.
- <item>
-</itemize>
-
-<sect>Author
-<p>
-<itemize>
- <item>Eric Anholt
- <item>Keith Whitwell
-</itemize>
-
-The X11R&relvers; version of this driver originally came from XFree86 4.4 rc2.
-
-The XFree86 version of this driver was donated to The XFree86 Project by:
-<verb>
- Precision Insight, Inc.
- Cedar Park, TX
- USA
-</verb>
-
-The X.Org version of this driver is maintained by Intel Corporation.
-
-<htmlurl name="http://www.intellinuxgraphics.org";
- url="http://www.intellinuxgraphics.org";>
-
-
-</article>
commit 9b78208f1ef1a8ee98f2aa139956659169e234ab
Author: Eric Anholt <[EMAIL PROTECTED]>
Date: Mon Apr 2 18:20:15 2007 -0700
Move a bunch of debugging verbosity under Option "ModeDebug".
diff --git a/man/intel.man b/man/intel.man
index 3197feb..80b327d 100644
--- a/man/intel.man
+++ b/man/intel.man
@@ -175,6 +175,10 @@ Choose acceleration architecture, either "XAA" or "EXA".
XAA is the old
(but stable) XFree86 based acceleration architecture. EXA is a newer and
simpler acceleration architecture designed to better accelerate the X Render
extension. Default: "XAA".
+.TP
+.BI "Option \*qModeDebug\*q \*q" boolean \*q
+Enable printing of additional debugging information about modesetting to
+the server log.
.PP
The 830M and newer driver supports RandR 1.2, exposing the VGA, LVDS
diff --git a/src/i830.h b/src/i830.h
index e75eb89..4cb31b6 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -527,6 +527,9 @@ typedef struct _I830Rec {
CARD32 saveBLC_PWM_CTL;
enum last_3d last_3d;
+
+ /** Enables logging of debug output related to mode switching. */
+ Bool debug_modes;
} I830Rec;
#define I830PTR(p) ((I830Ptr)((p)->driverPrivate))
diff --git a/src/i830_bios.c b/src/i830_bios.c
index cb886b5..0d00917 100644
--- a/src/i830_bios.c
+++ b/src/i830_bios.c
@@ -229,9 +229,11 @@ i830_bios_get_panel_mode(ScrnInfoPtr pScrn)
xf86SetModeDefaultName(fixed_mode);
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Found panel mode in BIOS VBT tables:\n");
- xf86PrintModeline(pScrn->scrnIndex, fixed_mode);
+ if (pI830->debug_modes) {
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Found panel mode in BIOS VBT tables:\n");
+ xf86PrintModeline(pScrn->scrnIndex, fixed_mode);
+ }
xfree(bios);
return fixed_mode;
diff --git a/src/i830_display.c b/src/i830_display.c
index b3a7da9..727d1b2 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -884,17 +884,17 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
if (i830_panel_fitter_pipe (pI830) == pipe)
OUTREG(PFIT_CONTROL, 0);
-#if 1
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Mode for pipe %c:\n", pipe == 0 ? 'A' : 'B');
- xf86PrintModeline(pScrn->scrnIndex, mode);
- if (!xf86ModesEqual(mode, adjusted_mode)) {
+ if (pI830->debug_modes) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Adjusted mode for pipe %c:\n", pipe == 0 ? 'A' : 'B');
+ "Mode for pipe %c:\n", pipe == 0 ? 'A' : 'B');
xf86PrintModeline(pScrn->scrnIndex, mode);
+ if (!xf86ModesEqual(mode, adjusted_mode)) {
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Adjusted mode for pipe %c:\n", pipe == 0 ? 'A' : 'B');
+ xf86PrintModeline(pScrn->scrnIndex, mode);
+ }
+ i830PrintPll("chosen", &clock);
}
- i830PrintPll("chosen", &clock);
-#endif
if (dpll & DPLL_VCO_ENABLE)
{
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 229c26b..4ee720f 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -275,6 +275,7 @@ typedef enum {
OPTION_COLOR_KEY,
OPTION_CHECKDEVICES,
OPTION_LINEARALLOC,
+ OPTION_MODEDEBUG,
#ifdef XF86DRI_MM
OPTION_INTELTEXPOOL,
OPTION_INTELMMSIZE,
@@ -296,6 +297,7 @@ static OptionInfoRec I830Options[] = {
{OPTION_VIDEO_KEY, "VideoKey", OPTV_INTEGER, {0}, FALSE},
{OPTION_CHECKDEVICES, "CheckDevices",OPTV_BOOLEAN, {0}, FALSE},
{OPTION_LINEARALLOC, "LinearAlloc", OPTV_INTEGER, {0}, FALSE},
+ {OPTION_MODEDEBUG, "ModeDebug", OPTV_BOOLEAN, {0}, FALSE},
#ifdef XF86DRI_MM
{OPTION_INTELTEXPOOL,"Legacy3D", OPTV_BOOLEAN, {0}, FALSE},
{OPTION_INTELMMSIZE, "AperTexSize", OPTV_INTEGER, {0}, FALSE},
@@ -975,6 +977,12 @@ I830PreInit(ScrnInfoPtr pScrn, int flags)
memcpy(pI830->Options, I830Options, sizeof(I830Options));
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pI830->Options);
+ if (xf86ReturnOptValBool(pI830->Options, OPTION_MODEDEBUG, FALSE)) {
+ pI830->debug_modes = TRUE;
+ } else {
+ pI830->debug_modes = FALSE;
+ }
+
/* We have to use PIO to probe, because we haven't mapped yet. */
I830SetPIOAccess(pI830);
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
