xserver-xorg-video-intel: Changes to 'debian-experimental'
ChangeLog | 276 ++++++++++++++++++++++++++
aclocal.m4 | 2
configure | 20 -
configure.ac | 2
debian/changelog | 21 ++
debian/rules | 2
ltmain.sh | 2
man/intel.man | 17 +
src/Makefile.am | 97 ++++-----
src/Makefile.in | 155 +++++++-------
src/exa_sf.g4a | 78 ++++++-
src/exa_sf.g4b | 15 +
src/exa_sf_mask.g4a | 105 ++++++----
src/exa_sf_mask.g4b | 15 +
src/exa_sf_mask_prog.h | 25 --
src/exa_sf_prog.h | 17 -
src/exa_sf_rotation.g4a | 55 -----
src/exa_sf_rotation_prog.h | 20 -
src/exa_wm.g4i | 140 +++++++++++++
src/exa_wm_affine.g4i | 44 ++++
src/exa_wm_ca.g4a | 38 +++
src/exa_wm_ca.g4b | 4
src/exa_wm_ca_srcalpha.g4a | 37 +++
src/exa_wm_ca_srcalpha.g4b | 4
src/exa_wm_mask_affine.g4a | 41 +++
src/exa_wm_mask_affine.g4b | 8
src/exa_wm_mask_projective.g4a | 53 +++++
src/exa_wm_mask_projective.g4b | 16 +
src/exa_wm_mask_sample_a.g4a | 48 ++++
src/exa_wm_mask_sample_a.g4b | 2
src/exa_wm_mask_sample_argb.g4a | 48 ++++
src/exa_wm_mask_sample_argb.g4b | 2
src/exa_wm_maskca.g4a | 228 ----------------------
src/exa_wm_maskca_prog.h | 95 ---------
src/exa_wm_maskca_srcalpha.g4a | 228 ----------------------
src/exa_wm_maskca_srcalpha_prog.h | 95 ---------
src/exa_wm_masknoca.g4a | 228 ----------------------
src/exa_wm_masknoca_prog.h | 95 ---------
src/exa_wm_noca.g4a | 38 +++
src/exa_wm_noca.g4b | 4
src/exa_wm_nomask.g4a | 96 +++------
src/exa_wm_nomask_prog.h | 70 ------
src/exa_wm_projective.g4i | 51 ++++
src/exa_wm_rotation.g4a | 184 -----------------
src/exa_wm_rotation_prog.h | 70 ------
src/exa_wm_src_affine.g4a | 45 ++++
src/exa_wm_src_affine.g4b | 8
src/exa_wm_src_projective.g4a | 49 ++++
src/exa_wm_src_projective.g4b | 16 +
src/exa_wm_src_sample_a.g4a | 47 ++++
src/exa_wm_src_sample_a.g4b | 2
src/exa_wm_src_sample_argb.g4a | 47 ++++
src/exa_wm_src_sample_argb.g4b | 2
src/exa_wm_write.g4a | 74 +++++++
src/exa_wm_write.g4b | 18 +
src/exa_wm_xy.g4a | 52 +++++
src/exa_wm_xy.g4b | 4
src/i810.h | 1
src/i810_reg.h | 1
src/i830.h | 3
src/i830_display.c | 33 ++-
src/i830_driver.c | 8
src/i830_lvds.c | 42 +---
src/i830_quirks.c | 12 +
src/i830_video.c | 50 +++-
src/i965_render.c | 393 +++++++++++++++++++++++++-------------
src/i965_video.c | 5
src/packed_yuv_sf.g4b | 17 +
src/packed_yuv_wm.g4a | 144 ++++++++-----
src/packed_yuv_wm.g4b | 79 +++++++
src/sf_prog.h | 17 -
src/wm_prog.h | 82 -------
72 files changed, 2143 insertions(+), 1999 deletions(-)
New commits:
commit 354d1a607cf820af3d01bf51ed2c70aaa60d5d98
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Apr 15 15:04:47 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index ca5bc9c..95f9ddb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-video-intel (2:2.2.99.903-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.2.99.903-1) experimental; urgency=low
* New upstream release candidate.
+ Fix LVDS regression: disable panel fitting on 855GM,
and fix dither setting, closes: #473838.
- -- Brice Goglin <bgoglin@debian.org> Tue, 15 Apr 2008 15:04:07 +0200
+ -- Brice Goglin <bgoglin@debian.org> Tue, 15 Apr 2008 15:04:32 +0200
xserver-xorg-video-intel (2:2.2.99.902-1) experimental; urgency=low
commit eed13674554d8678f54d770b8774c086d19a8e7b
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Apr 15 15:03:26 2008 +0200
New upstream release candidate
diff --git a/ChangeLog b/ChangeLog
index de743df..2af8588 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,279 @@
+commit 768fa9437c6f96405aa827701135712670e09ab3
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Mon Apr 14 10:02:54 2008 +0800
+
+ Bump version 2.2.99.903
+
+ 2.3-rc3
+
+commit 1d8383923bebf38ab8ada6a262cb4fc8c30e074a
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Mon Apr 14 10:02:00 2008 +0800
+
+ Remove old sf/wm program from Makefile
+
+ Fix distcheck
+
+commit 2d0b74d0bafbd1b668f7e4a1b4ce3237e182a42f
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Apr 11 11:22:29 2008 -0700
+
+ Revert "remove '#line NUM ...' in macro process"
+
+ This reverts commit f47486fab3dffcbb03e7ad89f777abba1e887299.
+
+ Sorry for failing to push the #line processing changes to intel-gen4asm;
+ those are now pushed, so this change should no longer be necessary. Having
+ correct file name and line numbers in the error messages is awfully nice
+ though.
+ (cherry picked from commit da85d1b822dcb31698e9c5ab85a7bb27ad745eee)
+
+commit 709e1e955c9b011cf547c5d2df7062c27e921d8e
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Fri Apr 11 10:12:40 2008 +0800
+
+ remove '#line NUM ...' in macro process
+
+ intel-gen4asm doesn't allow '#' line
+ (cherry picked from commit f47486fab3dffcbb03e7ad89f777abba1e887299)
+
+commit e17168f29953ac276d5ecc2d8f459f2e513c8d1b
+Author: Hong Liu <hong.liu@intel.com>
+Date: Fri Apr 11 09:54:34 2008 +0800
+
+ Bug #14935: Fix i9xx reference clock for spread spectrum.
+ (cherry picked from commit 5c9cde37e769287fb7bf4e08c3600a33c2e92dce)
+
+commit 8c23ab274a502bb1a1face5b17776e577a8f35ef
+Author: Eric Anholt <eric@anholt.net>
+Date: Thu Apr 10 16:06:41 2008 -0700
+
+ Fix compiler warning from 24-bit lvds change.
+ (cherry picked from commit 152a50703aa5e9ebaa9abbe448518742734a5eb7)
+
+commit 23dc90f35c6e5da33c09ebdfc53cc7837d93c886
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Apr 9 16:27:40 2008 -0500
+
+ Single memcpy when pitches align on planar image transfer
+ (cherry picked from commit d5a80e1e3ab5724d34b20f9ee6f830efd0f5b076)
+
+commit 7af82ca69fab431c744a8ca36a282d071ceb83c1
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Apr 9 10:00:08 2008 -0500
+
+ Remove .g4b files on clean
+ (cherry picked from commit f270456e5612cb88933e6aabcd9a816c5c292229)
+
+commit 601f9d3310653552a1d38acc7d5818c24bbaf53b
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Apr 9 02:02:56 2008 -0500
+
+ Remove sync after 965 video put.
+
+ The hardware has been marked as needing a sync, so the next video put will
+ block waiting for the previous one to complete. Adding a sync here just
+ stalls the video playback for no good reason.
+ (cherry picked from commit 3fc3d1a701bae257b70aa7b7654c722f30e71399)
+
+commit 42559c54ad0f436e749edfe75172522a5baa3b97
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Apr 8 16:09:00 2008 -0500
+
+ Use symbolic names for channels in YUV code
+ (cherry picked from commit b68d9f4245d0ebe3371c179401ff145f1a4d101b)
+
+commit bddd411cf99c4c6b8a914589828ba09cc4cb6f0b
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Apr 8 16:08:20 2008 -0500
+
+ Rename src/mask/data registers to indicate channel
+ (cherry picked from commit 781be9d47289713b0a8fcd95c769a9c6241d62e9)
+
+commit 592c5faf031253a8b3274f811a136fd9e42c1a18
+Author: Mike Isely <isely@pobox.com>
+Date: Wed Apr 9 14:15:03 2008 +0800
+
+ Implement support for 24 bit pixel format
+
+ The Intel driver appears to be coded to only work with displays
+ expecting 18 bit pixels. However I have an application using a LCD
+ display that expects pixel data in 24 bit format. The difference is
+ only 2 bits in a single GPU register. This patch implements that
+ change, controlled by a new driver option, "LVDS24Bit". The default
+ value is false, which is the previous behavior. When set to true,
+ then 24 bit panels should work (at least the one I'm testing here
+ does).
+
+ Fd.o bug #15201
+
+ Signed-off-by: Mike Isely <isely@pobox.com>
+ (cherry picked from commit e031cc02e65acfbafb48136dad414751e04425c5)
+
+commit a83e55e1131025dc049ae219d5e2d3861066f4b7
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Wed Apr 9 14:03:45 2008 +0800
+
+ Include <stdint.h> in i810.h for integer types definition
+ (cherry picked from commit 79b18980ac9f60b1978abe421352df965aed1681)
+
+commit 55223b00df78404d6a5bbc5d67a232db1baf1a35
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Wed Apr 9 17:34:17 2008 +0800
+
+ Fix LVDS regression
+
+ Disable panel fitting on 855GM, and fix dither setting.
+ (cherry picked from commit 2b720262e1235f1c9da860ba3e9181f0c377aa5e)
+
+commit b0f1fc70ff72413a5c591fa77144eae0df0735c6
+Author: David Schleef <ds@schleef.org>
+Date: Tue Apr 8 12:43:20 2008 -0700
+
+ Bug #15219: Fix default overlay CSC factors, and use BT709 if available.
+
+ Using the updated factors even when BT709 conversion isn't available
+ (non-965) should still give us better color reproduction. Tested on a
+ 945GM, examining the +/-5% of black bars of videotestsrc.
+ (cherry picked from commit af92f4f885c8eae2211d09080b2289aa5bab9ec1)
+
+commit 24248097988775d62f6c416f2988e74d31c91cd0
+Author: Bryce Harrington <bryce@bryceharrington.org>
+Date: Mon Apr 7 17:26:49 2008 +0800
+
+ Quirks from Ubuntu/Dell
+
+ FD bug #15353. Launchpad bug ID is available for reference.
+
+commit 19320b33f06ca07a89f58d689a101f44ecfcd03b
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Apr 4 19:17:55 2008 -0700
+
+ Forgot to build exa_wm_src_sample_argb.g4b
+ (cherry picked from commit 0147c1c84872f7a109721a53d88a539932d9be81)
+
+commit 1b9cd443941ea80507df78520be8798871c11647
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Apr 1 00:54:13 2008 -0700
+
+ Remove extra flushing
+ (cherry picked from commit 90886f9a602d58b754e9a8d0f1a9c40803d34fa2)
+
+commit 6809ac3f309364778fcdd46629a16b7b92e0b953
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Apr 1 00:16:05 2008 -0700
+
+ Add projective versions of the PS kernels
+ (cherry picked from commit 0836373dc6e2f8612f120074980561f7ac11f6f7)
+
+commit a5264efc7f36971aa06869feed9980a154cdddbe
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Apr 1 00:06:08 2008 -0700
+
+ Shrink WM thread to 32 registers and 1024 scratch space.
+
+ Saving registers means we can run more in parallel.
+ (cherry picked from commit bfd803e085e938866efb45c67a79facef78ec399)
+
+commit 09c65c29335ab5192f7398cb2c46c91d3fee2a60
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Mar 31 23:50:20 2008 -0700
+
+ Fix composite with mask using new compositing thread code
+
+ Clean up register allocation to never overlap
+ Always write 4 values for each texture vertex.
+ (cherry picked from commit a6492661ae07310128eb73c3ef037c42ce7ab184)
+
+commit ff643d5b490095a202963fa799ba1ee657cf07ed
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Mar 31 12:06:37 2008 -0700
+
+ remove old shader source files
+ (cherry picked from commit f8081178eb6fda0e405967cbacad532561619262)
+
+commit 55110c54c7d40413121484995117b921eb7cab42
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Mar 31 12:05:56 2008 -0700
+
+ remove old monolithic shaders
+ (cherry picked from commit 879f8717b09f79156b218ee9cc2107700190d586)
+
+commit bfd67e6ff556050684a3093381d383ef22c35ae1
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Mar 31 12:04:00 2008 -0700
+
+ remove old monolithic shaders
+ (cherry picked from commit 6db8faeb754897b21af045d00f50db9640b080bb)
+
+commit ae8a5ef1a223edfc7e586a77d0ca2cfc69d116b2
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Mar 31 11:59:14 2008 -0700
+
+ Back to new shaders, fix urb read length
+ (cherry picked from commit 6bb92213374f278387c539bbe05b773e87e11b90)
+
+commit 5becbf9cd88c11941a5ae588da6a4a65711dfad3
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Mar 31 11:31:31 2008 -0700
+
+ Dont set the compr bit on 8-unit sends
+ (cherry picked from commit 05710145b6fc4ed2c528128b2e6022591a53d050)
+
+commit a7b21a94574d403fd3d526db4e69e69c46cf09a0
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Mar 31 02:20:43 2008 -0700
+
+ Use m4 to clean up gen4 asm progs. Start adding projective transform support.
+
+ Use macros for register names, modularize functions into separate files.
+ (cherry picked from commit 08500507284f13ad7084eb231b43e117e9728129)
+
+commit a696a0faab13c11e4ed4ff2d66430f41bb107443
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun Mar 30 19:19:46 2008 -0700
+
+ Remove rotation sf and wm progs
+ (cherry picked from commit 949d73271d7100c1f028fd60f185f4929461304e)
+
+commit b19cf5e23f014ec65629dd1b0703bca54b973e0c
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun Mar 30 19:14:18 2008 -0700
+
+ Fix the sf_mask program to compute and pass corrected uvw cooefficients
+
+ sf_mask is the same as sf except that it must compute both src and mask uvw
+ cooefficients, which are conveniently adjacent in the same registers, and so
+ need only an extended execution width
+ (cherry picked from commit 492ff1494f782240e6ca68919b2d0b9aa400fc53)
+
+commit b6d54fffbd44b6cc516b49d4fc41b01483663a33
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun Mar 30 00:54:51 2008 -0700
+
+ Reimplement wm program for nomask case to handle affine transforms
+
+ This involves correctly computing u/v locations based on x/y vectors and
+ line constants computed in new sf program.
+
+ Also, use fewer instructions to make this go a bit faster (2X for 500x500
+ composite).
+ (cherry picked from commit 6304b38423f99190a5e54f1a7dcaa75adfad4f2a)
+
+commit 90dd1058b29a33d234ee56b3f21716a6f4b2302e
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun Mar 30 00:54:07 2008 -0700
+
+ Clarify comment in exa_sf program
+ (cherry picked from commit 771a56b1ed0df69345c723cb62a73b6842cd8227)
+
+commit 278b0aeb84b5e69142fa3a2c093db4c4642f32ad
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Mar 29 14:28:05 2008 -0700
+
+ Compute du/dv/dw in no-mask SF prog
+ (cherry picked from commit 4f469189fed541549e5d470b2529275a29cc2f20)
+
commit 21783ec9dfad9aae0837fd2d8eb313a77f031046
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Mon Mar 31 10:03:24 2008 +0800
diff --git a/aclocal.m4 b/aclocal.m4
index 37f4306..d2f0323 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -21,7 +21,7 @@ To do so, use the procedure documented by the package, typically `autoreconf'.])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 52 Debian 1.5.26-2 AC_PROG_LIBTOOL
+# serial 52 Debian 1.5.26-3 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
diff --git a/configure b/configure
index 6e11bb9..57333a8 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-video-intel 2.2.99.902.
+# Generated by GNU Autoconf 2.61 for xf86-video-intel 2.2.99.903.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xf86-video-intel'
PACKAGE_TARNAME='xf86-video-intel'
-PACKAGE_VERSION='2.2.99.902'
-PACKAGE_STRING='xf86-video-intel 2.2.99.902'
+PACKAGE_VERSION='2.2.99.903'
+PACKAGE_STRING='xf86-video-intel 2.2.99.903'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1455,7 +1455,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-video-intel 2.2.99.902 to adapt to many kinds of systems.
+\`configure' configures xf86-video-intel 2.2.99.903 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1525,7 +1525,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-intel 2.2.99.902:";;
+ short | recursive ) echo "Configuration of xf86-video-intel 2.2.99.903:";;
esac
cat <<\_ACEOF
@@ -1651,7 +1651,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-intel configure 2.2.99.902
+xf86-video-intel configure 2.2.99.903
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1665,7 +1665,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-video-intel $as_me 2.2.99.902, which was
+It was created by xf86-video-intel $as_me 2.2.99.903, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2360,7 +2360,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-video-intel'
- VERSION='2.2.99.902'
+ VERSION='2.2.99.903'
cat >>confdefs.h <<_ACEOF
@@ -23208,7 +23208,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-video-intel $as_me 2.2.99.902, which was
+This file was extended by xf86-video-intel $as_me 2.2.99.903, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23261,7 +23261,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-video-intel config.status 2.2.99.902
+xf86-video-intel config.status 2.2.99.903
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 24c6e34..ca5bc9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.2.99.903-1) UNRELEASED; urgency=low
+
+ * New upstream release candidate.
+ + Fix LVDS regression: disable panel fitting on 855GM,
+ and fix dither setting, closes: #473838.
+
+ -- Brice Goglin <bgoglin@debian.org> Tue, 15 Apr 2008 15:04:07 +0200
+
xserver-xorg-video-intel (2:2.2.99.902-1) experimental; urgency=low
* New upstream release candidate.
diff --git a/ltmain.sh b/ltmain.sh
index b2f25d9..bba8b1c 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -43,7 +43,7 @@ EXIT_FAILURE=1
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION="1.5.26 Debian 1.5.26-2"
+VERSION="1.5.26 Debian 1.5.26-3"
TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
diff --git a/src/Makefile.in b/src/Makefile.in
index e8677bd..39337df 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -82,16 +82,15 @@ am__installdirs = "$(DESTDIR)$(intel_drv_ladir)" \
intel_drv_laLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(intel_drv_la_LTLIBRARIES)
intel_drv_la_LIBADD =
-am__intel_drv_la_SOURCES_DIST = 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 i810_dga.c i810_driver.c i810.h i810_io.c \
- i810_memory.c i810_reg.h i810_ring.h i810_video.c i810_wmark.c \
- i830_3d.c i830_accel.c i830_bios.c i830_bios.h i830_common.h \
- i830_crt.c i830_cursor.c i830_debug.c i830_debug.h \
- i830_display.c i830_display.h i830_quirks.c i830_driver.c \
- i830_dvo.c i830.h i830_i2c.c i830_io.c i830_lvds.c \
- i830_memory.c i830_modes.c i830_video.c i830_video.h \
- i830_reg.h i830_ring.h i830_sdvo.c i830_sdvo.h \
+am__intel_drv_la_SOURCES_DIST = brw_defines.h brw_structs.h common.h \
+ i2c_vid.h i810_accel.c i810_common.h i810_cursor.c i810_dga.c \
+ i810_driver.c i810.h i810_io.c i810_memory.c i810_reg.h \
+ i810_ring.h i810_video.c i810_wmark.c i830_3d.c i830_accel.c \
+ i830_bios.c i830_bios.h i830_common.h i830_crt.c i830_cursor.c \
+ i830_debug.c i830_debug.h i830_display.c i830_display.h \
+ i830_quirks.c i830_driver.c i830_dvo.c i830.h i830_i2c.c \
+ i830_io.c i830_lvds.c i830_memory.c i830_modes.c i830_video.c \
+ i830_video.h i830_reg.h i830_ring.h i830_sdvo.c i830_sdvo.h \
i830_sdvo_regs.h i830_tv.c i915_3d.c i915_3d.h i915_reg.h \
i915_video.c i965_video.c i830_exa.c i830_xaa.c i830_render.c \
i915_render.c i965_render.c local_xf86Rename.h \
@@ -338,56 +337,79 @@ INTEL_XVMC_SRCS = \
i915_hwmc.c \
i915_hwmc.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 \
- i810_dga.c i810_driver.c i810.h i810_io.c i810_memory.c \
- i810_reg.h i810_ring.h i810_video.c i810_wmark.c i830_3d.c \
- i830_accel.c i830_bios.c i830_bios.h i830_common.h i830_crt.c \
- i830_cursor.c i830_debug.c i830_debug.h i830_display.c \
- i830_display.h i830_quirks.c i830_driver.c i830_dvo.c i830.h \
- i830_i2c.c i830_io.c i830_lvds.c i830_memory.c i830_modes.c \
- i830_video.c i830_video.h i830_reg.h i830_ring.h i830_sdvo.c \
- i830_sdvo.h i830_sdvo_regs.h i830_tv.c i915_3d.c i915_3d.h \
- i915_reg.h i915_video.c i965_video.c i830_exa.c i830_xaa.c \
- i830_render.c i915_render.c i965_render.c $(am__append_1) \
- $(am__append_2) $(am__append_3)
+intel_drv_la_SOURCES = brw_defines.h brw_structs.h common.h i2c_vid.h \
+ i810_accel.c i810_common.h i810_cursor.c i810_dga.c \
+ i810_driver.c i810.h i810_io.c i810_memory.c i810_reg.h \
+ i810_ring.h i810_video.c i810_wmark.c i830_3d.c i830_accel.c \
+ i830_bios.c i830_bios.h i830_common.h i830_crt.c i830_cursor.c \
+ i830_debug.c i830_debug.h i830_display.c i830_display.h \
+ i830_quirks.c i830_driver.c i830_dvo.c i830.h i830_i2c.c \
+ i830_io.c i830_lvds.c i830_memory.c i830_modes.c i830_video.c \
+ i830_video.h i830_reg.h i830_ring.h i830_sdvo.c i830_sdvo.h \
+ i830_sdvo_regs.h i830_tv.c i915_3d.c i915_3d.h i915_reg.h \
+ i915_video.c i965_video.c i830_exa.c i830_xaa.c i830_render.c \
+ i915_render.c i965_render.c $(am__append_1) $(am__append_2) \
+ $(am__append_3)
INTEL_G4A = \
packed_yuv_sf.g4a \
packed_yuv_wm.g4a \
exa_sf.g4a \
exa_sf_mask.g4a \
- exa_sf_rotation.g4a \
- exa_wm_maskca.g4a \
- exa_wm_maskca_srcalpha.g4a \
- exa_wm_masknoca.g4a \
- exa_wm_nomask.g4a \
- exa_wm_rotation.g4a
-
-INTEL_G4H = \
- sf_prog.h \
- wm_prog.h \
- exa_sf_mask_prog.h \
- exa_sf_prog.h \
- exa_sf_rotation_prog.h \
- exa_wm_maskca_prog.h \
- exa_wm_maskca_srcalpha_prog.h \
- exa_wm_masknoca_prog.h \
- exa_wm_nomask_prog.h \
- exa_wm_rotation_prog.h
+ exa_wm_src_affine.g4a \
+ exa_wm_src_projective.g4a \
+ exa_wm_src_sample_argb.g4a \
+ exa_wm_src_sample_a.g4a \
+ exa_wm_mask_affine.g4a \
+ exa_wm_mask_projective.g4a \
+ exa_wm_mask_sample_argb.g4a \
+ exa_wm_mask_sample_a.g4a \
+ exa_wm_noca.g4a \
+ exa_wm_ca.g4a \
+ exa_wm_ca_srcalpha.g4a \
+ exa_wm_write.g4a \
+ exa_wm_xy.g4a
+
+INTEL_G4I = \
+ exa_wm.g4i \
+ exa_wm_affine.g4i \
+ exa_wm_projective.g4i
+
+INTEL_G4B = \
+ packed_yuv_sf.g4b \
+ packed_yuv_wm.g4b \
+ exa_sf.g4b \
+ exa_sf_mask.g4b \
+ exa_wm_src_affine.g4b \
+ exa_wm_src_projective.g4b \
+ exa_wm_src_sample_argb.g4b \
+ exa_wm_src_sample_a.g4b \
+ exa_wm_mask_affine.g4b \
+ exa_wm_mask_projective.g4b \
+ exa_wm_mask_sample_argb.g4b \
+ exa_wm_mask_sample_a.g4b \
+ exa_wm_noca.g4b \
+ exa_wm_ca.g4b \
+ exa_wm_ca_srcalpha.g4b \
+ exa_wm_write.g4b \
+ exa_wm_xy.g4b
EXTRA_DIST = \
$(XMODE_SRCS) \
$(INTEL_G4A) \
- $(INTEL_G4H) \
+ $(INTEL_G4I) \
+ $(INTEL_G4B) \
$(INTEL_DRI_SRCS) \
$(INTEL_XVMC_SRCS)
+@HAVE_GEN4ASM_TRUE@SUFFIXES = .g4a .g4b
+@HAVE_GEN4ASM_TRUE@BUILT_SOURCES = $(INTEL_G4B)
pcidatadir = $(datadir)/xserver-xorg/pci
pcidata_DATA = intel.ids
-all: all-recursive
+all: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
+.SUFFIXES: .g4a .g4b .c .lo .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -775,14 +797,16 @@ distdir: $(DISTFILES)
fi; \
done
check-am: all-am
-check: check-recursive
+check: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) check-recursive
all-am: Makefile $(LTLIBRARIES) $(DATA)
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(intel_drv_ladir)" "$(DESTDIR)$(pcidatadir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
-install: install-recursive
+install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
uninstall: uninstall-recursive
@@ -806,10 +830,12 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
+ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+@HAVE_GEN4ASM_FALSE@clean-local:
clean: clean-recursive
clean-am: clean-generic clean-intel_drv_laLTLIBRARIES clean-libtool \
- mostlyclean-am
+ clean-local mostlyclean-am
distclean: distclean-recursive
-rm -rf ./$(DEPDIR)
@@ -872,7 +898,7 @@ uninstall-am: uninstall-intel_drv_laLTLIBRARIES uninstall-local \
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-generic \
- clean-intel_drv_laLTLIBRARIES clean-libtool ctags \
+ clean-intel_drv_laLTLIBRARIES clean-libtool clean-local ctags \
ctags-recursive distclean distclean-compile distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
@@ -888,36 +914,13 @@ uninstall-am: uninstall-intel_drv_laLTLIBRARIES uninstall-local \
uninstall-intel_drv_laLTLIBRARIES uninstall-local \
uninstall-pcidataDATA
+@HAVE_GEN4ASM_TRUE@.g4a.g4b:
+@HAVE_GEN4ASM_TRUE@ m4 -s $*.g4a > $*.g4m && intel-gen4asm -o $@ $*.g4m && rm $*.g4m
-@HAVE_GEN4ASM_TRUE@sf_prog.h: packed_yuv_sf.g4a
-@HAVE_GEN4ASM_TRUE@ intel-gen4asm -o sf_prog.h packed_yuv_sf.g4a
-
-@HAVE_GEN4ASM_TRUE@wm_prog.h: packed_yuv_wm.g4a
-@HAVE_GEN4ASM_TRUE@ intel-gen4asm -o wm_prog.h packed_yuv_wm.g4a
-
-@HAVE_GEN4ASM_TRUE@exa_sf_mask_prog.h: exa_sf_mask.g4a
-@HAVE_GEN4ASM_TRUE@ intel-gen4asm -o exa_sf_mask_prog.h exa_sf_mask.g4a
-
-@HAVE_GEN4ASM_TRUE@exa_sf_prog.h: exa_sf.g4a
-@HAVE_GEN4ASM_TRUE@ intel-gen4asm -o exa_sf_prog.h exa_sf.g4a
-
-@HAVE_GEN4ASM_TRUE@exa_sf_rotation_prog.h: exa_sf_rotation.g4a
-@HAVE_GEN4ASM_TRUE@ intel-gen4asm -o exa_sf_rotation_prog.h exa_sf_rotation.g4a
-
-@HAVE_GEN4ASM_TRUE@exa_wm_maskca_prog.h: exa_wm_maskca.g4a
-@HAVE_GEN4ASM_TRUE@ intel-gen4asm -o exa_wm_maskca_prog.h exa_wm_maskca.g4a
-
-@HAVE_GEN4ASM_TRUE@exa_wm_maskca_srcalpha_prog.h: exa_wm_maskca_srcalpha.g4a
-@HAVE_GEN4ASM_TRUE@ intel-gen4asm -o exa_wm_maskca_srcalpha_prog.h exa_wm_maskca_srcalpha.g4a
-
-@HAVE_GEN4ASM_TRUE@exa_wm_masknoca_prog.h: exa_wm_masknoca.g4a
-@HAVE_GEN4ASM_TRUE@ intel-gen4asm -o exa_wm_masknoca_prog.h exa_wm_masknoca.g4a
-
-@HAVE_GEN4ASM_TRUE@exa_wm_nomask_prog.h: exa_wm_nomask.g4a
-@HAVE_GEN4ASM_TRUE@ intel-gen4asm -o exa_wm_nomask_prog.h exa_wm_nomask.g4a
+@HAVE_GEN4ASM_TRUE@$(INTEL_G4B): $(INTEL_G4I)
-@HAVE_GEN4ASM_TRUE@exa_wm_rotation_prog.h: exa_wm_rotation.g4a
-@HAVE_GEN4ASM_TRUE@ intel-gen4asm -o exa_wm_rotation_prog.h exa_wm_rotation.g4a
+@HAVE_GEN4ASM_TRUE@clean-local:
+@HAVE_GEN4ASM_TRUE@ -rm -f $(INTEL_G4B)
install-data-local: install-intel_drv_laLTLIBRARIES
(cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so && ln -s intel_drv.so i810_drv.so)
commit 768fa9437c6f96405aa827701135712670e09ab3
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Mon Apr 14 10:02:54 2008 +0800
Bump version 2.2.99.903
2.3-rc3
diff --git a/configure.ac b/configure.ac
index 4439bca..170d59b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-intel],
- 2.2.99.902,
+ 2.2.99.903,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-intel)
commit 1d8383923bebf38ab8ada6a262cb4fc8c30e074a
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Mon Apr 14 10:02:00 2008 +0800
Remove old sf/wm program from Makefile
Fix distcheck
diff --git a/src/Makefile.am b/src/Makefile.am
index 1b11330..6049a9c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -71,8 +71,6 @@ INTEL_XVMC_SRCS = \
intel_drv_la_SOURCES = \
brw_defines.h \
brw_structs.h \
- sf_prog.h \
- wm_prog.h \
common.h \
i2c_vid.h \
i810_accel.c \
commit 2d0b74d0bafbd1b668f7e4a1b4ce3237e182a42f
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 11 11:22:29 2008 -0700
Revert "remove '#line NUM ...' in macro process"
This reverts commit f47486fab3dffcbb03e7ad89f777abba1e887299.
Sorry for failing to push the #line processing changes to intel-gen4asm;
those are now pushed, so this change should no longer be necessary. Having
correct file name and line numbers in the error messages is awfully nice
though.
(cherry picked from commit da85d1b822dcb31698e9c5ab85a7bb27ad745eee)
diff --git a/src/Makefile.am b/src/Makefile.am
index c4cfff9..1b11330 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -182,7 +182,7 @@ if HAVE_GEN4ASM
SUFFIXES = .g4a .g4b
.g4a.g4b:
- m4 $*.g4a > $*.g4m && intel-gen4asm -o $@ $*.g4m && rm $*.g4m
+ m4 -s $*.g4a > $*.g4m && intel-gen4asm -o $@ $*.g4m && rm $*.g4m
$(INTEL_G4B): $(INTEL_G4I)
commit 1e81b66ae59664b9a9f51017ee57a9ca9a98cb41
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 13 02:10:28 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 09390a7..bd5d07b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.2.1-2) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.2.1-2) unstable; urgency=low
* Add the ${shlibs:Depends} substvar to the -dbg package's dependencies, to
bring in libpciaccess0 (closes: #467215).
@@ -9,7 +9,7 @@ xserver-xorg-video-intel (2:2.2.1-2) UNRELEASED; urgency=low
/usr/bin/Xorg and other modules, and that's not a bug, so we want
dpkg-shlibdeps to shut up about symbols it can't find.
- -- Julien Cristau <jcristau@debian.org> Sun, 24 Feb 2008 10:29:49 +0100
+ -- Julien Cristau <jcristau@debian.org> Sun, 13 Apr 2008 02:10:18 +0200
xserver-xorg-video-intel (2:2.2.1-1) unstable; urgency=low
commit b151ec7d6d05b508f541f747d3e5bbc60b61eab2
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 13 02:09:44 2008 +0200
Run dpkg-shlibdeps with --warnings=6
Drivers reference symbols from /usr/bin/Xorg and other modules, and
that's not a bug, so we want dpkg-shlibdeps to shut up about symbols it
can't find.
diff --git a/debian/changelog b/debian/changelog
index 9500ad5..09390a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ xserver-xorg-video-intel (2:2.2.1-2) UNRELEASED; urgency=low
* Only build on x86, this package doesn't make sense anywhere else.
* The Vcs-* fields are now recognized by dpkg, so drop the XS- prefix.
* configure: check for pciaccess 0.10 instead of 0.10.0 (closes: #470266).
+ * Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from
+ /usr/bin/Xorg and other modules, and that's not a bug, so we want
+ dpkg-shlibdeps to shut up about symbols it can't find.
-- Julien Cristau <jcristau@debian.org> Sun, 24 Feb 2008 10:29:49 +0100
diff --git a/debian/rules b/debian/rules
index 3ffd87f..fdaddeb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,7 +82,7 @@ binary-arch: build install serverabi
dh_compress
dh_fixperms
dh_makeshlibs
- dh_shlibdeps
+ dh_shlibdeps -- --warnings=6
dh_installdeb
dh_gencontrol
dh_md5sums
commit b805eef766acdd095f4ab5d6e44abc246635eec4
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 13 01:54:19 2008 +0200
Add bug closer
diff --git a/debian/changelog b/debian/changelog
index 56df6e0..9500ad5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-video-intel (2:2.2.1-2) UNRELEASED; urgency=low
bring in libpciaccess0 (closes: #467215).
* Only build on x86, this package doesn't make sense anywhere else.
* The Vcs-* fields are now recognized by dpkg, so drop the XS- prefix.
+ * configure: check for pciaccess 0.10 instead of 0.10.0 (closes: #470266).
-- Julien Cristau <jcristau@debian.org> Sun, 24 Feb 2008 10:29:49 +0100
commit 709e1e955c9b011cf547c5d2df7062c27e921d8e
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Fri Apr 11 10:12:40 2008 +0800
remove '#line NUM ...' in macro process
intel-gen4asm doesn't allow '#' line
(cherry picked from commit f47486fab3dffcbb03e7ad89f777abba1e887299)
diff --git a/src/Makefile.am b/src/Makefile.am
index 1b11330..c4cfff9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -182,7 +182,7 @@ if HAVE_GEN4ASM
SUFFIXES = .g4a .g4b
.g4a.g4b:
- m4 -s $*.g4a > $*.g4m && intel-gen4asm -o $@ $*.g4m && rm $*.g4m
+ m4 $*.g4a > $*.g4m && intel-gen4asm -o $@ $*.g4m && rm $*.g4m
$(INTEL_G4B): $(INTEL_G4I)
commit e17168f29953ac276d5ecc2d8f459f2e513c8d1b
Author: Hong Liu <hong.liu@intel.com>
Date: Fri Apr 11 09:54:34 2008 +0800
Bug #14935: Fix i9xx reference clock for spread spectrum.
(cherry picked from commit 5c9cde37e769287fb7bf4e08c3600a33c2e92dce)
diff --git a/src/i830_display.c b/src/i830_display.c
index 0588947..4910d96 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -1713,8 +1713,10 @@ i830_crtc_clock_get(ScrnInfoPtr pScrn, xf86CrtcPtr crtc)
return 0;
}
- /* XXX: Handle the 100Mhz refclk */
- i9xx_clock(96000, &clock);
+ if ((dpll & PLL_REF_INPUT_MASK) == PLLB_REF_INPUT_SPREADSPECTRUMIN)
+ i9xx_clock(100000, &clock);
+ else
+ i9xx_clock(96000, &clock);
} else {
Bool is_lvds = (pipe == 1) && (INREG(LVDS) & LVDS_PORT_EN);
commit 8c23ab274a502bb1a1face5b17776e577a8f35ef
Author: Eric Anholt <eric@anholt.net>
Date: Thu Apr 10 16:06:41 2008 -0700
Fix compiler warning from 24-bit lvds change.
(cherry picked from commit 152a50703aa5e9ebaa9abbe448518742734a5eb7)
diff --git a/src/i830_display.c b/src/i830_display.c
index 4091e79..0588947 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -1080,7 +1080,7 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
int i;
int refclk;
intel_clock_t clock;
- uint32_t dpll = 0, fp = 0, dspcntr, pipeconf;
+ uint32_t dpll = 0, fp = 0, dspcntr, pipeconf, lvds_bits = 0;
Bool ok, is_sdvo = FALSE, is_dvo = FALSE;
Bool is_crt = FALSE, is_lvds = FALSE, is_tv = FALSE;
@@ -1097,6 +1097,7 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
switch (intel_output->type) {
case I830_OUTPUT_LVDS:
is_lvds = TRUE;
+ lvds_bits = intel_output->lvds_bits;
break;
case I830_OUTPUT_SDVO:
is_sdvo = TRUE;
@@ -1314,7 +1315,7 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
lvds |= LVDS_DITHER_ENABLE;
}
- lvds |= intel_output->lvds_bits;
+ lvds |= lvds_bits;
OUTREG(LVDS, lvds);
POSTING_READ(LVDS);
commit 23dc90f35c6e5da33c09ebdfc53cc7837d93c886
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 9 16:27:40 2008 -0500
Single memcpy when pitches align on planar image transfer
(cherry picked from commit d5a80e1e3ab5724d34b20f9ee6f830efd0f5b076)
diff --git a/src/i830_video.c b/src/i830_video.c
index 14dab8f..64024d2 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -1441,11 +1441,14 @@ I830CopyPlanarData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv,
Reply to: