xserver-xorg-video-intel: Changes to 'debian-unstable'
.gitignore | 1
ChangeLog | 796 +++++++
README | 23
aclocal.m4 | 30
config.guess | 32
config.h.in | 3
config.sub | 16
configure | 161 +
configure.ac | 11
debian/changelog | 50
debian/control | 2
debian/rules | 2
debian/watch | 2
man/intel.man | 60
src/Makefile.am | 2
src/Makefile.in | 5
src/bios_reader/bios_reader.c | 9
src/ch7017/ch7017.c | 2
src/ch7xxx/ch7xxx.c | 2
src/common.h | 31
src/i2c_vid.h | 130 +
src/i810_driver.c | 19
src/i810_reg.h | 164 +
src/i830.h | 56
src/i830_accel.c | 17
src/i830_bios.c | 59
src/i830_bios.h | 52
src/i830_common.h | 6
src/i830_crt.c | 119 -
src/i830_debug.c | 177 +
src/i830_display.c | 131 +
src/i830_dri.c | 53
src/i830_driver.c | 279 +-
src/i830_dvo.c | 290 ++
src/i830_exa.c | 31
src/i830_lvds.c | 241 +-
src/i830_memory.c | 179 +
src/i830_render.c | 22
src/i830_sdvo.c | 20
src/i830_tv.c | 9
src/i830_video.c | 4622 +++++++++++++++++++++---------------------
src/i830_video.h | 3
src/i830_xaa.c | 6
src/i915_reg.h | 11
src/i915_render.c | 13
src/i915_video.c | 160 -
src/i965_render.c | 87
src/i965_video.c | 16
src/ivch/ivch.c | 211 +
src/ivch/ivch_reg.h | 208 +
src/sil164/sil164.c | 2
src/tfp410/Makefile.am | 16
src/tfp410/Makefile.in | 517 ++++
src/tfp410/tfp410.c | 265 ++
src/tfp410/tfp410.h | 33
src/tfp410/tfp410_module.c | 38
src/tfp410/tfp410_reg.h | 104
57 files changed, 6587 insertions(+), 3019 deletions(-)
New commits:
commit ad5e927891b2ab78d8e68290b92b02169c2a3791
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jul 3 11:21:00 2007 +0200
Actually install the upstream README.
diff --git a/debian/changelog b/debian/changelog
index 7e700ea..b206739 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
xserver-xorg-video-intel (2:2.1.0-1) unstable; urgency=low
* New upstream release.
+ * Actually install the upstream README.
- -- Julien Cristau <jcristau@debian.org> Tue, 03 Jul 2007 11:08:38 +0200
+ -- Julien Cristau <jcristau@debian.org> Tue, 03 Jul 2007 11:19:48 +0200
xserver-xorg-video-intel (2:2.0.0-6) experimental; urgency=low
diff --git a/debian/rules b/debian/rules
index 1ab9f61..de61402 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,8 +71,8 @@ binary-arch: build install serverabi
dh_testdir
dh_testroot
- dh_installdocs
- dh_installchangelogs ChangeLog README
+ dh_installdocs README
+ dh_installchangelogs ChangeLog
dh_install --sourcedir=debian/tmp --list-missing --exclude=.la --exclude=usr/share/man/man4
dh_installman
dh_link
commit 8620f5334a248058d570ecaaaca82d2fc566b1d1
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jul 3 11:10:16 2007 +0200
New upstream release.
diff --git a/ChangeLog b/ChangeLog
index 0d11e7b..3d1c1b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,337 @@
+commit 3c552af65d28fafec1d09484a8914b690b961349
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Jul 2 18:33:47 2007 -0700
+
+ Update documentation and bump driver version to 2.1.0.
+
+commit 2b9961eb9ce8734565ecdb01cb11610714d7f610
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Jul 2 15:16:33 2007 -0700
+
+ Fix reversed LVDS dither enabling logic on GM965.
+
+commit 3d9ee8b2991ec0da8cc21b8455ff7f00fd0335b5
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Jul 2 14:38:28 2007 -0700
+
+ Bug #11365: Disable the panel fitter unless it's needed for the chosen mode.
+
+ The automatic panel scaling appears to choose bad sampling on some GM965
+ hardware for 1:1 mapping modes, and there's no real sense in having it on
+ if we just want 1:1.
+
+commit 1e2e301348b4168aeed38b3fdc6b0e43d5678a86
+Author: Keith Packard <keithp@dulcimer.keithp.com>
+Date: Sat Jun 30 12:45:24 2007 -0700
+
+ Fix load detection to use border region instead of blanking.
+
+ Make sure there is some border area to use by changing how the pipe is
+ configured, then pick a scanline in the middle of the border for load
+ detection. This lets the load detect code use an active pipe instead of
+ requiring an idle one.
+
+commit 11862c2e1f23b77b56d7bd8b384579b5e3ae377b
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Jun 28 23:31:28 2007 -0700
+
+ Add *~ to .gitignore to skip emacs & patch backup files
+
+commit 6503eb45023d0db9a94cb9d1e14a26af07a6628d
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Jun 28 23:30:35 2007 -0700
+
+ Add AM_PROG_CC_C_O to configure.ac
+
+ Clears automake-1.10 warning: src/bios_reader/Makefile.am:8: compiling
+ `bios_dumper.c' with per-target flags requires `AM_PROG_CC_C_O' in
+ `configure.ac'
+
+commit 5257e36f502676fd6a44bbb8e747d9138ed3bc5c
+Author: Keith Packard <keithp@neko.keithp.com>
+Date: Thu Jun 28 15:29:52 2007 -0700
+
+ Handle dual-channel LVDS on i855.
+
+ Just as with i9xx LVDS, the i855 LVDS can operate in dual-channel mode with
+ a modified P2 divisor value (7 instead of 14). Just using the existing 9xx
+ code for 855 appears to work fine.
+
+commit 16bfcb8042519f24b4494fd621814f39949ceeb6
+Author: Keith Packard <keithp@neko.keithp.com>
+Date: Thu Jun 28 15:27:56 2007 -0700
+
+ Decode PLL registers in LVDS mode a bit better in debug code.
+
+ LVDS mode changes how the PLL works in fairly dramatic ways; the debug code
+ wasn't properly accounting for those differences resulting in fairly bogus
+ debug output.
+
+commit 9675ccb30818bf831ac4c634751ab4bfe35f7bfe
+Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
+Date: Wed Jun 27 09:23:33 2007 +0800
+
+ EXA: fallback mask transform on i965
+
+ It needs to fix shader programs which hasn't been done yet.
+
+commit 7a2300c88ae59f5b7c3ce89d33147e3f0ca23c18
+Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
+Date: Wed Jun 27 09:19:22 2007 +0800
+
+ EXA: don't have to check offscreen size
+
+ DDX will check it for EXA_OFFSCREEN_PIXMAPS flag
+
+commit fff4a3b58fa18ee2ad91f998d190e90b77c051ab
+Author: Carl Worth <cworth@cworth.org>
+Date: Mon Jun 25 23:15:58 2007 -0700
+
+ Use local structures for vs_state, sf_state, and wm_state
+
+commit 0a8a4afd3c59011d6b1f5b39aedfb9bce0e55c48
+Author: Carl Worth <cworth@cworth.org>
+Date: Mon Jun 25 23:12:23 2007 -0700
+
+ Use local structure for src_sampler_state and mask_sampler_state
+
+commit 499166a60fcbf16021bd9ec233790ba55803aa44
+Author: Carl Worth <cworth@cworth.org>
+Date: Mon Jun 25 23:09:17 2007 -0700
+
+ Use local structure for mask_surf_state
+
+commit a418ef7316808b239884a90c3fe890220bcc0242
+Author: Carl Worth <cworth@cworth.org>
+Date: Mon Jun 25 23:07:19 2007 -0700
+
+ Use local structure for src_surf_state
+
+commit 0e3c0b17826b7b5a21ee2c1d789b084fc167f1ed
+Author: Carl Worth <cworth@cworth.org>
+Date: Mon Jun 25 23:05:50 2007 -0700
+
+ Use local structure for dest_surf_state
+
+commit 41a2c0f15446d59678461648f476fa71d40d44e0
+Author: Carl Worth <cworth@cworth.org>
+Date: Mon Jun 25 23:03:47 2007 -0700
+
+ Use local structure for cc_state
+
+commit 59f2150caca7eb374a2db43a472ba85f50d23274
+Author: Carl Worth <cworth@cworth.org>
+Date: Mon Jun 25 11:28:57 2007 -0700
+
+ Remove redundant i830WaitSync from i965_prepare_composite
+
+ There were two calls to i830WaitSync, and between them no state was
+ being changed---just offsets were being computed.
+
+commit 66aa0e61e1e8d2216a9c0555be5be004ed0a3192
+Author: Dave Mueller <dave.mueller@gmx.ch>
+Date: Fri Jun 22 16:45:27 2007 -0700
+
+ Bug #11171: Add support for the Ti TFP410 DVO TMDS transmitter.
+
+commit f8d7cbc6e1322acad3351591336cefcfba7d9aaf
+Author: Eric Anholt <eric@anholt.net>
+Date: Fri Jun 22 16:29:21 2007 -0700
+
+ Move the ivch's fixed panel mode support to i830_dvo.c for other LVDS drivers.
+
+ This also results in removal of the setup hook, which was being called
+ unconditionally and breaking non-ivch dvo drivers.
+
+commit ec236c76b93aea5f2ee1e8b8509cde4625974fcb
+Author: Keith Packard <keithp@neko.keithp.com>
+Date: Fri Jun 22 16:32:46 2007 +0100
+
+ I830 needs to have plane/pipe/pll started in mode_set.
+
+ The patch for the i855 to stop enabling plane/pipe/pll in mode_set broke the
+ i830. Revert that just for the i830, leaving it enabled for the i855.
+
+commit d957c6b8e1dde8e11c1db3431e0ff58c5d984880
+Author: Keith Packard <keithp@neko.keithp.com>
+Date: Fri Jun 22 01:32:02 2007 +0100
+
+ Increase vblank wait timeout from 20ms to 30ms. 49.6Hz < 20ms.
+
+ The x40 LVDS mode has a 49.6Hz vertical refresh. Waiting for only 20ms can
+ sometimes cause the driver to start programming the hardware before the
+ vblank has occurred, which will lock up the i855 chipset. Extend this to
+ 30ms (the maximum timeout used by the BIOS) to ensure this doesn't happen.
+
+ Detecting actual vblank occurance using the various status registers should
+ also be possible but isn't yet working.
+
+commit a67c2965385001bcb8987265f698ff0f5809cd11
+Author: Keith Packard <keithp@neko.keithp.com>
+Date: Thu Jun 21 23:59:38 2007 +0100
+
+ Follow BIOS configuration for Legacy Backlight Brightness.
+
+ The backlight control in the LVDS controller can either operate in 'normal'
+ mode or 'legacy' mode. In legacy mode, it uses the PCI config space register
+ 0xf4 which can range from 0 to 0xff. In normal mode, it reads the range and
+ current value from the BLC_PWM_CTL register.
+
+commit d6e46f67ab3af1ad3bfa72acb0efd9fe79dbf1dc
+Author: Keith Packard <keithp@neko.keithp.com>
+Date: Thu Jun 21 20:16:36 2007 +0100
+
+ Eliminate some uninitialized variable warnings
+
+commit 9d104634cf03bea82d1467f01e577cb8d2e4b554
+Author: Keith Packard <keithp@neko.keithp.com>
+Date: Thu Jun 21 01:15:39 2007 +0100
+
+ Add 3DSTATE_CLEAR_PARAMETERS bits
+
+commit 3bbf313ba541526a893915f8b6c64b1eccf325e0
+Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
+Date: Tue Jun 19 09:33:50 2007 +0800
+
+ Fix left G33 issues
+
+ Be sure to check G33 chip type in:
+ - sdvo output
+ - Y-major tile
+ - crt detect
+ - and xaa composite
+ Sorry for that I should have fixed them very earlier...
+
+commit acef342c870f3b5b781e48c8bf44739aa5ee8ffa
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Jun 18 11:57:48 2007 -0700
+
+ Bug #11295: Disable textured video on i915 with framebuffer width too large.
+
+commit fbbb41bc5e03478cb46ee8f64ef68b23ff3fc14b
+Author: Keith Packard <keithp@neko.keithp.com>
+Date: Sun Jun 17 14:59:24 2007 +0100
+
+ Let DPMS functions enable plane/pipe/output on 8xx hardware.
+
+ On 855, letting crtc_mode_set enable the plane and pipe will occasionally
+ hang the chip. Instead, wait for crtc_enable to light things up. For 9xx,
+ leave things alone.
+
+commit d5ca000ece145a35fd6df0dcf3fb3460bd2d64e3
+Author: Rémi Cardona <remi@gentoo.org>
+Date: Sat Jun 16 13:17:54 2007 +0100
+
+ Include stdint.h to get uint64_t
+
+commit 6b2ae93506d6795f87d6993bebfcb4e6632508ee
+Author: Dave Airlie <airlied@linux.ie>
+Date: Fri Jun 15 23:30:04 2007 +1000
+
+ sdvo: add support for RGB outputs on SDVO
+
+ This lights up my monitor VGA-1 - it doesn't look the best though
+
+commit 671ba03befebfdd7256855858987aabc28b2e8cd
+Author: Eric Anholt <eric@anholt.net>
+Date: Wed Jun 13 16:30:26 2007 -0700
+
+ Fix and enable the 915-class planar textured video path.
+
+commit 6c29e0bae5f1e7cee02b678418394abb971594eb
+Author: Eric Anholt <eric@anholt.net>
+Date: Wed Jun 13 13:40:39 2007 -0700
+
+ Improve the drm_i915_flip_t check.
+
+commit 420e41e7921d3cc07c784fd17936ec8a675f3b20
+Author: Eric Anholt <eric@anholt.net>
+Date: Wed Jun 13 13:34:26 2007 -0700
+
+ Revert "Replace failure-prone configure test for fresh libdrm with a simple ifndef."
+
+ This reverts commit c2b130354aecffbeb2a2d23c7371461feaf5766a.
+
+ Sadly, a non-working DRM_IOCTL_I915_FLIP already existed.
+
+commit 51612e5ac3ddfb2bb172c58f2dfff9631093b69c
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Jun 12 16:09:54 2007 -0700
+
+ On hang, dump up to the head pointer, not just up to the tail.
+
+commit ceb6dd72443c094212b0281c42cbe92e9a29f682
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Jun 4 16:37:53 2007 -0700
+
+ Fix context switching between DRI and X.
+
+ Now, all 3D pipeline consumers in the driver just call
+ IntelEmitInvariantState(), which handles basic state setup, the caching of that
+ state setup, and notifying DRI clients. This also removes a mistaken idle
+ wait in the Render code which was papering over the brokenness in the context
+ switching.
+
+commit c2b130354aecffbeb2a2d23c7371461feaf5766a
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Jun 12 08:49:21 2007 -0700
+
+ Replace failure-prone configure test for fresh libdrm with a simple ifndef.
+
+commit 0e1deb607f94e4aa3ec4b9df8ff7a07a1c95e31d
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Jun 11 17:33:33 2007 -0700
+
+ Fix a typo in _3DSTATE_DEPTH_SUBRECT_DISABLE definition.
+
+ This is already fixed in the definition in the 3d driver.
+
+commit 8d7a0ccd4f674659eb781def2cfdc3a6e5a219ce
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Jun 11 17:33:07 2007 -0700
+
+ Clean up some nits in i915_video.c setup.
+
+ - The screen dimensions were used for the clipping despite drawing being done
+ to any pixmap, not necessarily the screen.
+ - One piece of state setup was not documented anywhere, and isn't used in other
+ 3d hardware paths that also work.
+ - A 3DSTATE_MODES_1 command (830-class only) was issued even though it no
+ longer exists.
+
+commit 15caa64a497dcc0eacb0f91166d9b70206a8db35
+Author: Keith Packard <keithp@neko.keithp.com>
+Date: Fri Jun 8 18:44:28 2007 -0700
+
+ Add description for how to use the frame and pixel counter registers.
+
+ The 24-bit frame and pixel counters were not described in detail and
+ will be useful for DRM.
+
+commit 404fd47573f855b0442d49a383542fc093825ad0
+Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
+Date: Wed Jun 6 11:01:48 2007 +0800
+
+ Enable overlay on G33 class chipsets
+
+ Which have to use gfx vm offset fot setup overlay regs.
+
+commit f4c05973d391bdb0a9b0eadb155548310baa98fd
+Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
+Date: Tue Jun 5 11:07:41 2007 -0700
+
+ Add support for the G33, Q33, and Q35 chipsets.
+
+ These chipsets require that the hardware status page be referenced by an offset
+ in the GTT rather than a physical memory address, so the X Server allocates it
+ rather than the DRM.
+
+commit 36fcaeb2ef94db5399071540bba106dec3db81d5
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Jun 4 15:58:31 2007 -0700
+
+ Fix misplaced merge of 1280x768 panel fixup.
+
commit 8a19e7d57bc23dd163b45e0ab7deca4f074c934d
Author: Keith Packard <keithp@dulcimer.keithp.com>
Date: Tue Jun 5 00:09:57 2007 -0700
diff --git a/configure b/configure
index 9bd3abd..ead16e4 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.0.0.
+# Generated by GNU Autoconf 2.61 for xf86-video-intel 2.1.0.
#
# 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.0.0'
-PACKAGE_STRING='xf86-video-intel 2.0.0'
+PACKAGE_VERSION='2.1.0'
+PACKAGE_STRING='xf86-video-intel 2.1.0'
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 2.0.0 to adapt to many kinds of systems.
+\`configure' configures xf86-video-intel 2.1.0 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 2.0.0:";;
+ short | recursive ) echo "Configuration of xf86-video-intel 2.1.0:";;
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 2.0.0
+xf86-video-intel configure 2.1.0
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 2.0.0, which was
+It was created by xf86-video-intel $as_me 2.1.0, 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='2.0.0'
+ VERSION='2.1.0'
cat >>confdefs.h <<_ACEOF
@@ -22325,7 +22325,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.0.0, which was
+This file was extended by xf86-video-intel $as_me 2.1.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22378,7 +22378,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-video-intel config.status 2.0.0
+xf86-video-intel config.status 2.1.0
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 380127f..7e700ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.1.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Tue, 03 Jul 2007 11:08:38 +0200
+
xserver-xorg-video-intel (2:2.0.0-6) experimental; urgency=low
* Update to latest upstream (commit 1e2e3013).
commit 3c552af65d28fafec1d09484a8914b690b961349
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jul 2 18:33:47 2007 -0700
Update documentation and bump driver version to 2.1.0.
diff --git a/README b/README
index bcb0205..c91c661 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
Information for Intel graphics driver users
Eric Anholt
-2007-04-02
+2007-07-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
@@ -15,9 +15,14 @@ Supported Hardware:
i845
i852
i855
- i915
- i945
- i965
+ 915G
+ 915GM
+ 945G
+ 945GM/GME
+ 946GZ
+ G965
+ GM/GME965
+ G33/Q33/Q35
Features
- Full support for 8, 15, 16, and 24 bit pixel depths.
@@ -70,6 +75,9 @@ Known Limitations
release.
- Gray output with integrated TV-out and PAL TVs.
- EXA support unstable on i845.
+- Some GM965 systems, such as the Thinkpad T61, probe the TV as being connected
+ even when no output connector is available. This results in the gnome-panel
+ issue noted below.
Common issues not caused by the driver
- Font sizes (DPI) are wrong. Some displays incorrectly report their
@@ -80,7 +88,7 @@ Common issues not caused by the driver
- 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
+- Older resolution-changing applications 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
diff --git a/configure.ac b/configure.ac
index a39635e..ec30376 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-intel],
- 2.0.0,
+ 2.1.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-intel)
diff --git a/man/intel.man b/man/intel.man
index 8991619..75280a7 100644
--- a/man/intel.man
+++ b/man/intel.man
@@ -24,14 +24,15 @@ the 830M and later.
.SH SUPPORTED HARDWARE
.B intel
supports the i810, i810-DC100, i810e, i815, i830M, 845G, 852GM, 855GM,
-865G, 915G, 915GM, 945G, 945GM, 965G, 965Q, 946GZ and 965GM chipsets.
+865G, 915G, 915GM, 945G, 945GM, 965G, 965Q, 946GZ, 965GM, 945GME,
+G33, Q33, and Q35 chipsets.
.SH CONFIGURATION DETAILS
Please refer to __xconfigfile__(__filemansuffix__) for general configuration
details. This section only covers configuration details specific to this
driver.
.PP
-The Intel 8xx and 9xx families of integrated graphics chipsets has a unified
+The Intel 8xx and 9xx families of integrated graphics chipsets have a unified
memory architecture and uses system memory for video ram. For the i810 and
i815 family of chipset, operating system support for allocating system
memory for video use is required in order to use this driver. For the 830M
@@ -66,12 +67,9 @@ Default: undefined.
.TP
.BI "Option \*qCacheLines\*q \*q" integer \*q
This allows the user to change the amount of graphics memory used for
-2D acceleration and video. Decreasing this amount leaves more for 3D
-textures. Increasing it can improve 2D performance at the expense of
-3D performance.
-.TP
-This option only takes effect when XAA acceleration is enabled.
-.TP
+2D acceleration and video when XAA acceleration is enabled. Decreasing this
+amount leaves more for 3D textures. Increasing it can improve 2D performance
+at the expense of 3D performance.
Default: depends on the resolution, depth, and available video memory. The
driver attempts to allocate space for at 3 screenfuls of pixmaps plus an
HD-sized XV video. The default used for a specific configuration can be found
@@ -145,7 +143,7 @@ the full benefit without triple buffering (see
.B "Option \*qTripleBuffer\*q"
).
Default for i810: The option is not used.
-Default for i830 and above: Disabled.
+Default for i830 and above: Disabled (This option is currently unstable).
.TP
.BI "Option \*qTripleBuffer\*q \*q" boolean \*q
Enable support for triple buffering. This should improve 3D performance at the
@@ -202,5 +200,5 @@ support reworked for XFree86 4.3 by David Dawes and Keith Whitwell. 852GM,
Keith Whitwell. Lid status support added by Alan Hourihane. Textured video
support for 915G and later chips, RandR 1.2 and hardware modesetting added
by Eric Anholt and Keith Packard. EXA and Render acceleration added by Wang
-Zhenyu. TV out support added by Zou Nan Hai and Keith Packard. 965GM support
-added by Wang Zhenyu.
+Zhenyu. TV out support added by Zou Nan Hai and Keith Packard. 965GM, G33,
+Q33, and Q35 support added by Wang Zhenyu.
commit 2b9961eb9ce8734565ecdb01cb11610714d7f610
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jul 2 15:16:33 2007 -0700
Fix reversed LVDS dither enabling logic on GM965.
diff --git a/src/i830_display.c b/src/i830_display.c
index aba86ae..ebde525 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -1019,9 +1019,9 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
if (IS_I965G(pI830))
{
if ((lvds & LVDS_A3_POWER_MASK) == LVDS_A3_POWER_UP)
- lvds |= LVDS_DITHER_ENABLE;
- else
lvds &= ~LVDS_DITHER_ENABLE;
+ else
+ lvds |= LVDS_DITHER_ENABLE;
}
OUTREG(LVDS, lvds);
commit 3d9ee8b2991ec0da8cc21b8455ff7f00fd0335b5
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jul 2 14:38:28 2007 -0700
Bug #11365: Disable the panel fitter unless it's needed for the chosen mode.
The automatic panel scaling appears to choose bad sampling on some GM965
hardware for 1:1 mapping modes, and there's no real sense in having it on
if we just want 1:1.
diff --git a/src/i830_lvds.c b/src/i830_lvds.c
index d469815..e2c6e3c 100644
--- a/src/i830_lvds.c
+++ b/src/i830_lvds.c
@@ -261,17 +261,23 @@ i830_lvds_mode_set(xf86OutputPtr output, DisplayModePtr mode,
I830CrtcPrivatePtr intel_crtc = output->crtc->driver_private;
CARD32 pfit_control;
- /* The LVDS pin pair will already have been turned on in the
+ /* The LVDS pin pair will already have been turned on in
* i830_crtc_mode_set since it has a large impact on the DPLL settings.
*/
- /* Enable automatic panel scaling so that non-native modes fill the
- * screen. Should be enabled before the pipe is enabled, according to
+ /* Enable automatic panel scaling for non-native modes so that they fill
+ * the screen. Should be enabled before the pipe is enabled, according to
* register description and PRM.
*/
- pfit_control = (PFIT_ENABLE |
- VERT_AUTO_SCALE | HORIZ_AUTO_SCALE |
- VERT_INTERP_BILINEAR | HORIZ_INTERP_BILINEAR);
+ if (mode->HDisplay != adjusted_mode->HDisplay ||
+ mode->VDisplay != adjusted_mode->VDisplay)
+ {
+ pfit_control = PFIT_ENABLE |
+ VERT_AUTO_SCALE | HORIZ_AUTO_SCALE |
+ VERT_INTERP_BILINEAR | HORIZ_INTERP_BILINEAR;
+ } else {
+ pfit_control = 0;
+ }
if (!IS_I965G(pI830)) {
if (dev_priv->panel_wants_dither)
commit b849e1eed1aa9ac7b857b8c29a1f6a6dce582b33
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jul 2 03:12:09 2007 +0200
Add myself to uploaders.
diff --git a/debian/changelog b/debian/changelog
index 24000db..380127f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
xserver-xorg-video-intel (2:2.0.0-6) experimental; urgency=low
* Update to latest upstream (commit 1e2e3013).
+ * Add myself to uploaders.
- -- Julien Cristau <jcristau@debian.org> Mon, 02 Jul 2007 02:59:52 +0200
+ -- Julien Cristau <jcristau@debian.org> Mon, 02 Jul 2007 03:08:51 +0200
xserver-xorg-video-intel (2:2.0.0-5) experimental; urgency=low
diff --git a/debian/control b/debian/control
index d6fb06e..e750780 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-intel
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Drew Parsons <dparsons@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Drew Parsons <dparsons@debian.org>, Julien Cristau <jcristau@debian.org>
Build-Depends: debhelper (>= 5), quilt, pkg-config, xserver-xorg-dev (>= 2:1.3.0.0), 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
Standards-Version: 3.7.2
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-intel
commit a801047555d1ade5b743bf5a5fa2ba09e042cad2
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jul 2 03:01:28 2007 +0200
Update to latest upstream (commit 1e2e3013) and autoreconf.
diff --git a/aclocal.m4 b/aclocal.m4
index f8a69fa..d164a8b 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -7642,6 +7642,34 @@ AC_MSG_RESULT([$_am_result])
rm -f confinc confmf
])
+# Copyright (C) 1999, 2000, 2001, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 3
+
+# AM_PROG_CC_C_O
+# --------------
+# Like AC_PROG_CC_C_O, but changed for automake.
+AC_DEFUN([AM_PROG_CC_C_O],
+[AC_REQUIRE([AC_PROG_CC_C_O])dnl
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__CC in this case,
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+ CC="$am_aux_dir/compile $CC"
+fi
+])
+
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
diff --git a/config.h.in b/config.h.in
index 006744c..7f968d2 100644
--- a/config.h.in
+++ b/config.h.in
@@ -47,6 +47,9 @@
/* Patch version */
#undef INTEL_VERSION_PATCH
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
/* Name of package */
#undef PACKAGE
diff --git a/configure b/configure
index f02c069..9bd3abd 100755
--- a/configure
+++ b/configure
@@ -20011,6 +20011,131 @@ else
fi
+if test "x$CC" != xcc; then
+ { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
+echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; }
+else
+ { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
+echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; }
+fi
+set dummy $CC; ac_cc=`echo $2 |
+ sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+# Make sure it works both with $CC and with simple cc.
+# We do the test twice because some compilers refuse to overwrite an
+# existing .o file with -o, though they will create one.
+ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+rm -f conftest2.*
+if { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ test -f conftest2.$ac_objext && { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); };
+then
+ eval ac_cv_prog_cc_${ac_cc}_c_o=yes
+ if test "x$CC" != xcc; then
+ # Test first that cc exists at all.
+ if { ac_try='cc -c conftest.$ac_ext >&5'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+ rm -f conftest2.*
+ if { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ test -f conftest2.$ac_objext && { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); };
+ then
+ # cc works too.
+ :
+ else
+ # cc exists but doesn't like -o.
+ eval ac_cv_prog_cc_${ac_cc}_c_o=no
+ fi
+ fi
+ fi
+else
+ eval ac_cv_prog_cc_${ac_cc}_c_o=no
+fi
+rm -f core conftest*
+
+fi
+if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define NO_MINUS_C_MINUS_O 1
+_ACEOF
+
+fi
+
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__CC in this case,
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+ CC="$am_aux_dir/compile $CC"
+fi
+
# Extract the first word of "intel-gen4asm", so it can be a program name with args.
set dummy intel-gen4asm; ac_word=$2
@@ -21718,7 +21843,7 @@ MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B html --split=0"
-ac_config_files="$ac_config_files Makefile src/Makefile src/xvmc/Makefile src/bios_reader/Makefile src/ch7017/Makefile src/ch7xxx/Makefile src/ivch/Makefile src/reg_dumper/Makefile src/sil164/Makefile man/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile src/xvmc/Makefile src/bios_reader/Makefile src/ch7017/Makefile src/ch7xxx/Makefile src/ivch/Makefile src/reg_dumper/Makefile src/sil164/Makefile src/tfp410/Makefile man/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -22377,6 +22502,7 @@ do
"src/ivch/Makefile") CONFIG_FILES="$CONFIG_FILES src/ivch/Makefile" ;;
"src/reg_dumper/Makefile") CONFIG_FILES="$CONFIG_FILES src/reg_dumper/Makefile" ;;
"src/sil164/Makefile") CONFIG_FILES="$CONFIG_FILES src/sil164/Makefile" ;;
+ "src/tfp410/Makefile") CONFIG_FILES="$CONFIG_FILES src/tfp410/Makefile" ;;
"man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
diff --git a/debian/changelog b/debian/changelog
index a679e33..24000db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.0.0-6) experimental; urgency=low
+
+ * Update to latest upstream (commit 1e2e3013).
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 02 Jul 2007 02:59:52 +0200
+
xserver-xorg-video-intel (2:2.0.0-5) experimental; urgency=low
[ Drew Parsons ]
diff --git a/src/Makefile.in b/src/Makefile.in
Reply to: