xserver-xorg-video-intel: Changes to 'debian-experimental'
ChangeLog | 398 +++++++++++++++++++++++++++++++++
Makefile.in | 2
aclocal.m4 | 2
config.h.in | 3
configure | 283 ++++++++++++++++++------
configure.ac | 26 +-
debian/changelog | 32 ++
debian/control | 2
debian/copyright | 495 ++++++++++++++++++++++++++++++++++--------
ltmain.sh | 2
man/Makefile.in | 2
man/intel.man | 87 +++++++
src/Makefile.in | 2
src/bios_reader/Makefile.in | 2
src/bios_reader/bios_dumper.c | 4
src/ch7017/Makefile.in | 2
src/ch7xxx/Makefile.in | 2
src/i810_reg.h | 7
src/i830.h | 34 ++
src/i830_accel.c | 2
src/i830_display.c | 18 -
src/i830_driver.c | 183 ++++++++++-----
src/i830_lvds.c | 42 +++
src/i830_memory.c | 20 +
src/i830_quirks.c | 32 ++
src/i830_ring.h | 17 -
src/i830_sdvo.c | 4
src/i830_tv.c | 4
src/i830_video.c | 24 +-
src/i915_hwmc.c | 36 ++-
src/i915_hwmc.h | 2
src/ivch/Makefile.in | 2
src/reg_dumper/Makefile.in | 2
src/sil164/Makefile.in | 2
src/tfp410/Makefile.in | 2
src/xvmc/Makefile.am | 7
src/xvmc/Makefile.in | 21 -
src/xvmc/driDrawable.c | 174 --------------
src/xvmc/driDrawable.h | 64 -----
src/xvmc/i915_xvmc.c | 14 -
src/xvmc/intel_xvmc.c | 2
src/xvmc/intel_xvmc.h | 1
42 files changed, 1511 insertions(+), 551 deletions(-)
New commits:
commit 1aa599ebe101c109dd6da7223b316a4053b8aa45
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jul 14 01:27:10 2008 +0200
Build against xserver 1.5 rc5.
diff --git a/debian/changelog b/debian/changelog
index 3d4a51d..8c5106a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.3.2-3) experimental; urgency=low
+
+ * Build against xserver 1.5 rc5.
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 14 Jul 2008 01:26:43 +0200
+
xserver-xorg-video-intel (2:2.3.2-2) unstable; urgency=high
* High urgency upload for RC bug fix.
diff --git a/debian/control b/debian/control
index 815a4f8..00d3a8d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ 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), dpkg-dev (>= 1.14.17)
+Build-Depends: debhelper (>= 5), quilt, pkg-config, xserver-xorg-dev (>= 2:1.4.99.905), 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), dpkg-dev (>= 1.14.17)
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
commit e48144291b54ca3ac3a73c7cae075d0c93241a6c
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 3 16:55:54 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index ca30b80..3d4a51d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-xserver-xorg-video-intel (2:2.3.2-2) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.3.2-2) unstable; urgency=high
+ * High urgency upload for RC bug fix.
* Update debian/copyright, thanks to Thomas Viehmann for reporting, and
Moritz Muehlenhoff for the thorough analysis (closes: #486340).
* Change the libdrm memory manager check in configure to look for 2.4.0
instead of 2.3.1, as libdrm 2.3.1 was released without it.
- -- Julien Cristau <jcristau@debian.org> Mon, 23 Jun 2008 15:22:00 +0200
+ -- Julien Cristau <jcristau@debian.org> Thu, 03 Jul 2008 16:55:05 +0200
xserver-xorg-video-intel (2:2.3.2-1) unstable; urgency=low
commit 8dbdbbb08db8481efab9ba1c543d801d907a7b85
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 3 16:48:05 2008 +0200
update changelog
diff --git a/debian/changelog b/debian/changelog
index ac0836c..ca30b80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xserver-xorg-video-intel (2:2.3.2-2) UNRELEASED; urgency=low
* Update debian/copyright, thanks to Thomas Viehmann for reporting, and
Moritz Muehlenhoff for the thorough analysis (closes: #486340).
+ * Change the libdrm memory manager check in configure to look for 2.4.0
+ instead of 2.3.1, as libdrm 2.3.1 was released without it.
-- Julien Cristau <jcristau@debian.org> Mon, 23 Jun 2008 15:22:00 +0200
commit 66cd1d28a472cc2ace3c93dd4604f7d123cd9c62
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 3 16:47:16 2008 +0200
autoreconf
diff --git a/configure b/configure
index 59233cd..fdff559 100755
--- a/configure
+++ b/configure
@@ -22530,12 +22530,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_DRI_MM_CFLAGS="$DRI_MM_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.3.1\"") >&5
- ($PKG_CONFIG --exists --print-errors "libdrm >= 2.3.1") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.4.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libdrm >= 2.4.0") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_DRI_MM_CFLAGS=`$PKG_CONFIG --cflags "libdrm >= 2.3.1" 2>/dev/null`
+ pkg_cv_DRI_MM_CFLAGS=`$PKG_CONFIG --cflags "libdrm >= 2.4.0" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -22548,12 +22548,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_DRI_MM_LIBS="$DRI_MM_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.3.1\"") >&5
- ($PKG_CONFIG --exists --print-errors "libdrm >= 2.3.1") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.4.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libdrm >= 2.4.0") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_DRI_MM_LIBS=`$PKG_CONFIG --libs "libdrm >= 2.3.1" 2>/dev/null`
+ pkg_cv_DRI_MM_LIBS=`$PKG_CONFIG --libs "libdrm >= 2.4.0" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -22572,9 +22572,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- DRI_MM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdrm >= 2.3.1"`
+ DRI_MM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdrm >= 2.4.0"`
else
- DRI_MM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdrm >= 2.3.1"`
+ DRI_MM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdrm >= 2.4.0"`
fi
# Put the nasty error message in config.log where it belongs
echo "$DRI_MM_PKG_ERRORS" >&5
commit efa491b64f458963e030a4319517159b9855bbf5
Author: Dave Airlie <airlied@linux.ie>
Date: Tue Jul 1 18:51:18 2008 +1000
intel: fix drm check.
The -mm check is broken now that 2.3.1 is out.. make it 2.4.0, to be fixed
with GEM etc.
(cherry picked from commit 55678c64bc6e3ed613ea6db14c105c18a0cf28ce)
diff --git a/configure.ac b/configure.ac
index af589de..796b829 100644
--- a/configure.ac
+++ b/configure.ac
@@ -200,7 +200,7 @@ if test "$DRI" = yes; then
PKG_CHECK_MODULES(DRI, [libdrm xf86driproto glproto])
AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
- PKG_CHECK_MODULES(DRI_MM, [libdrm >= 2.3.1],[DRI_MM=yes], [DRI_MM=no])
+ PKG_CHECK_MODULES(DRI_MM, [libdrm >= 2.4.0],[DRI_MM=yes], [DRI_MM=no])
if test "x$DRI_MM" = xyes; then
AC_DEFINE(XF86DRI_MM,1,[Extended DRI memory management])
fi
commit 5f4457114f41413abc48ec13638786cc57da1884
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jun 23 15:23:52 2008 +0200
Update debian/copyright
Thanks to Thomas Viehmann for reporting, and Moritz Muehlenhoff for the
thorough analysis (closes: #486340).
diff --git a/debian/changelog b/debian/changelog
index e042584..ac0836c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.3.2-2) UNRELEASED; urgency=low
+
+ * Update debian/copyright, thanks to Thomas Viehmann for reporting, and
+ Moritz Muehlenhoff for the thorough analysis (closes: #486340).
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 23 Jun 2008 15:22:00 +0200
+
xserver-xorg-video-intel (2:2.3.2-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/copyright b/debian/copyright
index 908553c..a4c83af 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,38 @@
This package was downloaded from
http://xorg.freedesktop.org/releases/individual/driver/
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright © 2002 David Dawes
-All Rights Reserved.
+This copyright file is based on xf86-video-intel 2.3.1.
+The files under src/modes/ and src/parser/ are stolen from the xorg-server
+source.
+
+The authors of this core are, see below for copyright declarations.
+
+* Alan Hourihane <alanh@fairlite.demon.co.uk> / <alanh@tungstengraphics.com>
+* Bob Paauwe <bob.j.paauwe@intel.com>
+* Dave Airlie <airlied@linux.ie>
+* Dave Mueller <dave.mueller@gmx.ch>
+* David Dawes <dawes@xfree86.org>
+* Eric Anholt <eric@anholt.net>
+* Jens Owen <jens@tungstengraphics.com>
+* Jesse Barnes <jbarnes@virtuousgeek.org>
+* Jonathan Bian <jonathan.bian@intel.com>
+* Keith Packard <keithp@keithp.com>
+* Keith Whitwell <keith@tungstengraphics.com>
+* Kevin E. Martin <kevin@precisioninsight.com> / <martin@valinux.com>
+* Kristian Høgsberg <krh@redhat.com>
+* Luc Verhaegen
+* Matt Sottek <matthew.j.sottek@intel.com>
+* Rickard E. (Rik) Faith <faith@valinux.com>
+* Thomas Hellstrom
+* Wang Zhenyu <zhenyu.z.wang@intel.com>
+* Xiang Haihao <haihao.xiang@intel.com>
+
+====
+
+Most of the code is covered by the MIT/X11 license:
+
+-
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
@@ -12,106 +40,401 @@ without limitation the rights to use, copy, modify, merge, publish,
distribute, sub license, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
-
+
The above copyright notice and this permission notice (including the
next paragraph) shall be included in all copies or substantial portions
of the Software.
-
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-
-Copyright 2000 by Alan Hourihane, Sychdyn, North Wales, UK.
+The copyright holders are:
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Alan Hourihane not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. Alan Hourihane makes no representations
-about the suitability of this software for any purpose. It is provided
-"as is" without express or implied warranty.
+* Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas:
+src/i810_accel.c
+src/i810_wmark.c
+src/i810_reg.h
+src/i810_driver.c
+src/i810_memory.c
+src/i810_io.c
+src/i810_cursor.c
+src/i830_accel.c
+src/i830_xaa.c
+src/i830_exa.c
-ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
+* Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+* Copyright 2000 VA Linux Systems, Inc.
+src/xvmc/xf86dri.h
+src/xvmc/xf86dri.c
-Copyright 2000 Intel Corporation. All Rights Reserved.
+* Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+* Copyright 2002 David Dawes
+src/i830_memory.c
+src/i830.h
+src/i830_ring.h
+src/i830_cursor.c
+src/i810_ring.h
+src/i810.h
+src/common.h
+src/xvmc/xf86dristr.h
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+* Copyright 2000 Intel Corporation. All Rights Reserved:
+src/i810_hwmc.c
+src/i830_video.h
+src/i810_video.c
+src/i830_video.c
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
+* Copyright 2001 Intel Corporation. All Rights Reserved.
+src/xvmc/I810XvMC.h
+src/xvmc/I810XvMC.c
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL INTEL, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+* Copyright 2001 VA Linux Systems Inc., Fremont, California.
+* Copyright 2002 by David Dawes
+src/i830_dri.c
+src/i830_driver.c
-Copyright 2001 VA Linux Systems Inc., Fremont, California.
-Copyright © 2002 by David Dawes
+* Copyright 2001 VA Linux Systems Inc., Fremont, California.
+* Copyright 2002 Tungsten Graphics Inc., Cedar Park, Texas.
+src/i830_common.h
-All Rights Reserved.
+* Copyright 2002 David Dawes
+* Copyright 2006 Intel Corporation
+src/i830_modes.c
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-on the rights to use, copy, modify, merge, publish, distribute, sub
-license, and/or sell copies of the Software, and to permit persons to whom
-the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-ATI, VA LINUX SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Copyright © 2002 David Dawes
+* Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
+src/i810_common.h
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Except as contained in this notice, the name of the author(s) shall
-not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from
-the author(s).
+* Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
+src/i830_reg.h
+src/i830_3d.c
+src/i915_3d.c
+src/i915_reg.h
+src/xvmc/intel_batchbuffer.c
+
+* Copyright 2005 Tungsten Graphics, Inc., Cedar Park, Texas.
+src/brw_structs.h
+src/brw_defines.h
+
+* Copyright 2005 Red Hat, Inc.
+src/i830_io.c
+
+* Copyright 2005 Adam Jackson:
+src/Makefile.am
+
+* Copyright (c) 2005 Jesse Barnes
+src/i830_exa.c
+
+* Copyright 2005 Thomas Hellstrom. All rights reserved.
+src/xvmc/driDrawable.c
+src/xvmc/driDrawable.h
+
+* Copyright 2005-2006 Luc Verhaegen.
+src/modes/xf86cvt.c
+
+* Copyright 2006 Luc Verhaegen.
+src/modes/xf86EdidModes.c
+
+* Copyright 2006 Dave Airlie <airlied@linux.ie>
+src/i830_i2c.c
+src/i830_sdvo.c
+src/i830_dvo.c
+src/sil164/sil164.c
+src/sil164/sil164.h
+src/sil164/sil164_reg.h
+src/ch7xxx/ch7xxx_reg.h
+src/ch7xxx/ch7xxx.c
+src/ch7xxx/ch7xxx.h
+
+* Copyright 2006 Intel Corporation:
+src/xvmc/i915_xvmc.c
+src/xvmc/i915_xvmc.h
+src/xvmc/i915_structs.h
+src/i915_hwmc.h
+src/i915_hwmc.c
+src/i915_video.c
+src/i915_render.c
+src/i915_3d.h
+src/exa_wm.g4i
+src/exa_wm_src_sample_argb.g4a
+src/exa_wm_mask_affine.g4a
+src/exa_wm_projective.g4i
+src/exa_sf.g4a
+src/exa_wm_affine.g4i
+src/exa_wm_mask_sample_a.g4a
+src/exa_sf_mask.g4a
+src/exa_wm_write.g4a
+src/exa_wm_mask_sample_argb.g4a
+src/exa_wm_ca.g4a
+src/exa_wm_src_affine.g4a
+src/exa_wm_xy.g4a
+src/exa_wm_noca.g4a
+src/exa_wm_ca_srcalpha.g4a
+src/exa_wm_mask_projective.g4a
+src/exa_wm_src_sample_a.g4a
+src/exa_wm_src_projective.g4a
+src/i830_lvds.c
+src/i830_sdvo.h
+src/i830_bios.c
+src/i830_bios.h
+src/i830_debug.c
+src/i830_crt.c
+src/i830_display.c
+src/i830_sdvo_regs.h
+src/i830_render.c
+src/i830_tv.c
+src/i830_display.h
+src/i830_debug.h
+src/packed_yuv_sf.g4a
+src/packed_yuv_wm.g4a
+src/i965_video.c
+src/i965_render.c
+src/ch7017/ch7017.c
+src/ch7017/ch7017_reg.h
+src/sil164/Makefile.am
+src/modes/xf86Modes.h
+src/ivch/ivch.c
+src/ivch/ivch_reg.h
+src/ivch/ivch_module.c
+
+* Copyright 2007 Intel Corporation:
+src/bios_reader/bios_dumper.c
+src/bios_reader/bios_reader.c
+src/i830_hwmc.h
+src/i830_hwmc.c
+src/i830_quirks.c
+src/xvmc/intel_xvmc.c
+src/xvmc/intel_xvmc.h
+src/reg_dumper/idle.c
+src/reg_dumper/stepping.c
+src/reg_dumper/main.c
+src/reg_dumper/reg_dumper.h
+
+* Copyright 2007 Dave Mueller
+src/tfp410/tfp410.c
+src/tfp410/tfp410.h
+src/tfp410/tfp410_reg.h
+
+====
+
+src/i810_dga.c is Copyright 2000 by Alan Hourihane, Sychdyn, North Wales, UK
+and covered by the following license:
+
+-
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Alan Hourihane not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission. Alan Hourihane makes no representations
+ * about the suitability of this software for any purpose. It is provided
+ * "as is" without express or implied warranty.
+ *
+ * ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+-
+
+====
+A few files a covered by the following license:
+
+-
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission. The copyright holders make no representations
+ * about the suitability of this software for any purpose. It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+-
+
+The copyright holders are:
+
+* Copyright 2002 Keith Packard, member of The XFree86 Project, Inc.
+src/modes/xf86RandR12.c
+
+* Copyright 2006 Keith Packard
+src/modes/xf86Crtc.c
+src/modes/xf86RandR12.h
+src/modes/xf86Rename.h
+src/local_xf86Rename.h
+src/modes/xf86DiDGA.c
+src/modes/xf86Rotate.c
+src/modes/xf86Crtc.h
+
+* Copyright 2006 Eric Anholt
+src/i2c_vid.h
+
+* Copyright 2007 Keith Packard
+src/modes/xf86Cursors.c
+
+====
+
+src/parser/xf86Parser.h and src/parser/xf86Optrec.h are covered by a license
+similar to the MIT/X11 license, but with an additional advertising clause:
+
+* Copyright (c) 1997 Metro Link Incorporated
+* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
+* Copyright (c) 1997-2001 by The XFree86 Project, Inc.
+
+-
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Except as contained in this notice, the name of the Metro Link shall not be
+ * used in advertising or otherwise to promote the sale, use or other dealings
+ * in this Software without prior written authorization from Metro Link.
+-
+
+====
+
+src/modes/xf86Modes.c is covered by a license similar to the MIT/X11 license,
+but with an additional advertising clause:
+
+-
+ * Copyright (c) 1997-2003 by The XFree86 Project, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name of the copyright holder(s)
+ * and author(s) shall not be used in advertising or otherwise to promote
+ * the sale, use or other dealings in this Software without prior written
+ * authorization from the copyright holder(s) and author(s).
+ */
+-
+
+====
+
+src/reg_dumper/xprintf.c is covered by a license similar to the MIT/X11 license,
+but with an additional advertising clause:
+
+-
+ * Copyright (c) 2004 Alexander Gottwald
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+-
+
+====
+
+All files generated by the buildsystem toolchain (e.g. autogen.sh) remain
+under the copyright of their authors from the respective tools.
+
+====
+
+
+A couple of files are without explicit copyright:
+
+Some tiny Makefile.am:
+src/reg_dumper/Makefile.am
+src/xvmc/Makefile.am
+src/ch7017/Makefile.am
+src/tfp410/Makefile.am
+src/ivch/Makefile.am
+src/ch7xxx/Makefile.am
+
+
+src/exa_wm_write.g4b
+src/exa_sf.g4b
+src/exa_wm_xy.g4b
+src/packed_yuv_sf.g4b
+src/exa_wm_src_sample_argb.g4b
+src/exa_sf_mask.g4b
+src/exa_wm_src_sample_a.g4b
+src/exa_wm_src_affine.g4b
+src/packed_yuv_wm.g4b
+src/exa_wm_mask_sample_argb.g4b
+src/exa_wm_ca.g4b
+src/exa_wm_mask_affine.g4b
+src/exa_wm_ca_srcalpha.g4b
+src/exa_wm_nomask.g4a
+src/exa_wm_mask_projective.g4b
+src/exa_wm_noca.g4b
+src/exa_wm_mask_sample_a.g4b
+src/exa_wm_src_projective.g4b
+
+
+src/tfp410/tfp410_module.c
+src/ch7xxx/ch7xxx_module.c
+src/ch7017/ch7017_module.c
+src/xvmc/i915_program.h
+src/xvmc/intel_batchbuffer.h
+src/scripts/clock-graph.5c
+src/scripts/clock.5c
+src/scripts/fix.5c
+src/scripts/tv.5c
+src/sil164/sil164_module.c
+src/i810_dri.h
+src/i810_dri.c
+src/i830_dri.h
commit 024491e592fe5e25e0418c93fd3f62802baedd33
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Jun 18 07:16:14 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 3a95b3a..e042584 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.3.2-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.3.2-1) unstable; urgency=low
* New upstream release.
+ Revert "Add FIFO watermark regs to register dumper",
@@ -6,7 +6,7 @@ xserver-xorg-video-intel (2:2.3.2-1) UNRELEASED; urgency=low
+ Fix TV programming: add vblank wait after TV_CTL writes,
closes: #485616.
- -- Brice Goglin <bgoglin@debian.org> Wed, 18 Jun 2008 07:11:44 +0200
+ -- Brice Goglin <bgoglin@debian.org> Wed, 18 Jun 2008 07:16:05 +0200
xserver-xorg-video-intel (2:2.3.1-1) unstable; urgency=low
commit ce9d192a120c4d41613a254707cc3423dbda9a30
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Jun 18 07:15:50 2008 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index 7ec3b7d..422a0ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,245 @@
+commit b80bf50f8ebfe70044e66c7e8558e3031ba3cfca
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Wed Jun 18 10:46:11 2008 +0800
+
+ Bump version 2.3.2
+
+commit 42a16bd38a0d09e3e6f33b2319b195aeacfa5084
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Tue Jun 17 09:46:12 2008 +0800
+
+ Fix compiling with server master in LVDS backlight patch
+ (cherry picked from commit 289790c0467d27e96b537598a6589fc6a36da8b8)
+
+commit 9036c94b28d4f1d65333bc318079f31bf56b3f99
+Author: Lukas Hejtmanek <xhejtman@ics.muni.cz>
+Date: Mon Jun 16 02:49:41 2008 +0800
+
+ Fix maximum backlight issue
+ (cherry picked from commit 4c4ef27779aebf4df90b6233de05be2bb972de4c)
+
+commit df0bbdc7cbb6ff357a81ed28d12e56c9c7d643f7
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Thu Jun 12 14:04:41 2008 +0800
+
+ Fix compiler warning when disable xvmc config
+
+commit d3df74ebb0b61cda347e5e4754f2fc8a4c3110b0
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Jun 10 11:31:22 2008 -0700
+
+ Set up/restore PWRCTXA from enter/leavevt not server start/exit.
+
+ This should improve behavior in the presence of VT switching, but also avoids
+ a crash on X exit from writing the register after unmapping mmio.
+
+commit 9d767d62fec724079178844915cd3feb9df93c7e
+Author: Bryce Harrington <bryce@bryceharrington.org>
+Date: Tue Jun 10 14:10:39 2008 +0800
+
+ Two more Dell quirks
+
+ fd.o #16160
+ (cherry picked from commit 231a302013981cc597ba09ee89b367c8ab56e8ba)
+
+commit 9a8d70fe3d1db2e2d34c79b7d0b271127a63e415
+Author: Jesse Barnes <jbarnes@hobbes.lan>
+Date: Mon Jun 9 08:52:59 2008 -0700
+
+ Fix TV programming: add vblank wait after TV_CTL writes
+
+ Fxies FDO bug #14000; we need to wait for vblank after writing TV_CTL or followi
+ ng "DPMS on" calls may not actually enable the output.
+ (cherry picked from commit 1142be53eb8d2ee8a9b60ace5d49f0ba27332275)
+
+commit 7d9676c8cc309d42c49f82274f7dc43ab327bea3
+Author: Robert Lowery <rglowery@exemail.com.au>
+Date: Tue May 20 21:09:23 2008 +1000
+
+ Fix TV out connection type detection
+
+ Make sure we wait for vblank when using the TV DAC to detect the connection
+ type.
+
+ Fixes FDO bug #14000.
+ (cherry picked from commit 64a8f2433d7774d06119793b57cec6d3be6389c1)
+ (cherry picked from commit e4e61e8c97c585993b4b69b86350b3987178a47e)
+
+commit 4054725c3cf0956cc1717ad8acc558203a7af40d
+Author: Eric Anholt <eric@anholt.net>
+Date: Thu Jun 5 14:55:23 2008 -0700
+
+ Move debug clock printout from ErrorF to X_INFO.
+ (cherry picked from commit bff180e6cac4452ef491c81855eb12bfa03d0bf3)
+
+commit e520316dd5f7bfdffadfa19b3046ba40ca367219
+Author: Eric Anholt <eric@anholt.net>
+Date: Thu Jun 5 14:37:59 2008 -0700
+
+ Remove SVG_WORK_CONTROL init.
+
+ The bit set is now reserved -- used to be a workaround for early revisions.
+ (cherry picked from commit ad459b21b7de4a79552ac155803d5930432fb84b)
+
+commit 34ce546153ce9dd0571ce0a5cec7a481641fbbdd
+Author: Eric Anholt <eric@anholt.net>
+Date: Thu Jun 5 14:37:26 2008 -0700
+
+ Initialize clock gating from EnterVT and save/restore it appropriately.
+
+commit 71befe0581bcc7d75ed982b543bbf575c2f48c37
+Author: Eric Anholt <eric@anholt.net>
+Date: Thu Jun 5 14:09:45 2008 -0700
+
+ Move BIOS scratch register setup to EnterVT instead of PreInit.
+
+ We want these to always be set when our driver's in control. They are
+ already appropriately save/restored at leave/entervt.
+ (cherry picked from commit 8061e5ac27a5f61f940bccc940be922999cc1d3f)
+
+commit ae65ddbbc8064c33febc7608122828998ee15a2e
+Author: Eric Anholt <eric@anholt.net>
+Date: Thu Jun 5 13:57:54 2008 -0700
+
+ Remove gratuitous wait_ring_idle after I830Sync. Syncing implies that.
+ (cherry picked from commit b61cb9283185eb5211e84eb7d8e68beea607c2eb)
+
+commit e0a2b1008f751ee8cddb0d7587514ea574821af6
+Author: Eric Anholt <eric@anholt.net>
+Date: Thu Jun 5 13:39:08 2008 -0700
+
+ Remove duplicated i830_stop_ring()/SetHWOperatingState() in EnterVT().
+ (cherry picked from commit adb4f5a5e826e584ab212d23fc8d474c3e7bb8e8)
+
+commit a4e8b188d469c8092d4314be96a697fb4f780276
+Author: Eric Anholt <eric@anholt.net>
+Date: Thu Jun 5 11:56:42 2008 -0700
+
+ Replace a couple of wait-for-ring-idles with a single function to do so.
+ (cherry picked from commit 7e51384c973a96366b02ea646392c43574674111)
+
+commit 7d267e27c152a4935ec5301d9fbbfd6eff8816d4
+Author: Eric Anholt <eric@anholt.net>
+Date: Thu Jun 5 11:26:02 2008 -0700
+
+ Just remove the mprotect kludge.
+
+ Besides not being #ifdef __linux__ed as requested, some linux kernels break
+ in exciting new ways when you try to mprotect from PROT_NONE back to
+ PROT_READ|PROT_WRITE. Yes, there are bugs in the code we're calling in a
+ bug-exploiting bug workaround.
+
+ If you want this workaround for the original bug exposed when moving to
+ libpciaccess, it's already in libpciaccess.
+ (cherry picked from commit 65306cdd71dad71e4ca7229764f81a0880dd70bf)
+
+commit 85308ab8aaf58b6620a41621128eba0b7e1ffb44
+Author: Hong Liu <hong.liu@intel.com>
+Date: Wed Jun 4 16:58:05 2008 +0800
+
+ Set SDVO sync polarity to default on 965
+
+ Fix fd.o bug 15766
+ (cherry picked from commit beb72ae5aa053303f5cc419e9c9d7c6db964f160)
+
+commit 14dc93cb4dabdd83ee62a2a497c210aeb52f6c30
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Thu Jun 12 13:47:04 2008 +0800
+
+ xvmc: a little cleanup
+
+ Also safe check context size to not exceed surface max.
+
+commit ce674bd39c2fe2844b449fad6cfe83b4d18adad6
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Tue Jun 3 16:13:52 2008 +0800
+
+ xvmc: remove unused dri drawable
+ (cherry picked from commit 96955003557686469c7ae9f7d42620d2851e6fad)
+
+commit 88232a9b9af2c73460eec206c4971679af9dcb43
+Author: Jesse Barnes <jbarnes@hobbes.lan>
+Date: Mon May 26 09:34:34 2008 -0700
+
+ Fixup power saving registers
+
+ Update clock gating disable bits to match docs and allocate a power context
+ memory area so that newer chips can save state and power down the render unit.
+ (cherry picked from commit 89bb53cc7a853d88fc34a0ca65ae2b6227a8dd24)
+
+commit 0deedbcc98a831284f6e9db2510e88e90e01c286
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Mar 24 13:25:37 2008 -0700
+
+ Disable a bunch of clock gating disables on IGD_GM, which doesn't need them.
+
+ Besides our driver having fallen through to the GM965 path for
+ RENCLK_GATE_D1, the BIOS was turning some of these on. It may be relevant
+ for previous platforms as well to zero out the fields that should be zero
+ in the other registers.
+ (cherry picked from commit 552a1b824db31a234d7c5cb71057ed0e0ce64477)
+
+commit 5dd06d08015cf9c0721f34f7005ecd670025c334
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed May 21 14:56:27 2008 -0700
+
+ Define DEFFILEMODE for OS'es that don't have it
+ (cherry picked from commit 165c0865d849b7d280a3a119fe9ae0ad34637df0)
+
+commit 87ace420a34df7425641d089f71830e44fced098
+Author: Shuang He <shuang.he@intel.com>
+Date: Mon May 26 09:20:53 2008 +0800
+
+ Fix typo in xvmc block destroy
+
+commit 288ef6585150f2a58d4c1723efae1a5a7a41772a
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Tue May 20 08:54:01 2008 +0800
+
+ Revert "Add FIFO watermark regs to register dumper"
+
+ This reverts commit 0c00a638ef57aa9d6a3047176b0bfad733f781f0.
+
+ Those FIFO watermark regs are 945-ish, and cause problem
Reply to: