Hello community,
here is the log from the commit of package xorg-x11-driver-video
checked in at Thu Jun 26 01:06:19 CEST 2008.
--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2008-06-18 09:04:58.000000000 +0200
+++ xorg-x11-driver-video/xorg-x11-driver-video.changes 2008-06-25 04:58:31.118237000 +0200
@@ -1,0 +2,20 @@
+Wed Jun 25 04:34:21 CEST 2008 - sndirsch@suse.de
+
+- xf86-video-radeon 6.8.192
+ * ati 6.9.0rc2 release
+- use vesa driver for GeForce 6100 Micro-Star (10de:0242:1462:7207)
+ (bnc #393412)
+
+-------------------------------------------------------------------
+Mon Jun 23 11:27:55 CEST 2008 - sndirsch@suse.de
+
+- xf86-video-nv.diff
+ * obsoletes xf86-video-nv-gf9-mobile.diff
+ * obsoletes xf86-video-nv-commit-745a1d2.diff
+ * Replace copyright notices with stock MIT X11 boilerplate.
+ * Add new chips to the man page and fix capitalization of
+ "Quadro".
+ * Add a note that MODE_PANEL really means "larger than
+ BIOS-programmed panel size".
+
+-------------------------------------------------------------------
Old:
----
xf86-video-ati-6.8.191.tar.bz2
xf86-video-nv-commit-745a1d2.diff
xf86-video-nv-gf9-mobile.diff
New:
----
xf86-video-ati-6.8.192.tar.bz2
xf86-video-nv.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.oB6030/_old 2008-06-26 01:03:10.000000000 +0200
+++ /var/tmp/diff_new_pack.oB6030/_new 2008-06-26 01:03:10.000000000 +0200
@@ -15,7 +15,7 @@
BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
Version: 7.3
-Release: 141
+Release: 142
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -61,7 +61,7 @@
Source43: xf86-video-impact-0.2.0.tar.bz2
Source44: HALlib-4.1.tar.gz
Source45: xf86-video-intel-2.3.2.tar.bz2
-Source46: xf86-video-ati-6.8.191.tar.bz2
+Source46: xf86-video-ati-6.8.192.tar.bz2
Source48: xf86-video-mga-1.9.100.tar.bz2
Source50: xf86-video-xgi-1.5.0.tar.bz2
Source51: xf86-video-geode-2.10.0.tar.bz2
@@ -72,8 +72,7 @@
Source100: sax2-hwinfo-data.tar.gz
Patch: xf86-video-intel.diff
Patch3: ps_nv.diff
-Patch4: xf86-video-nv-gf9-mobile.diff
-Patch5: xf86-video-nv-commit-745a1d2.diff
+Patch4: xf86-video-nv.diff
Patch10: xf86-video-tdfx.diff
Patch12: xf86-video-mga-hal.diff
Patch14: xf86-video-rendition.diff
@@ -106,10 +105,10 @@
rm -rf xf86-video-geode*
%endif
ln -snf mga.man xf86-video-mga-1.9.100/man/mgarandr12.man
-#ln -snf ati.man xf86-video-ati-6.8.191/man/atirandr12.man
-#ln -snf r128.man xf86-video-ati-6.8.191/man/r128randr12.man
-#ln -snf radeon.man xf86-video-ati-6.8.191/man/radeonrandr12.man
-#pushd xf86-video-ati-6.8.191
+#ln -snf ati.man xf86-video-ati-6.8.192/man/atirandr12.man
+#ln -snf r128.man xf86-video-ati-6.8.192/man/r128randr12.man
+#ln -snf radeon.man xf86-video-ati-6.8.192/man/radeonrandr12.man
+#pushd xf86-video-ati-6.8.192
#%patch28 -p1
#popd
#pushd xf86-video-r128-*
@@ -141,7 +140,6 @@
pushd xf86-video-nv-*
%patch3 -p0
%patch4 -p1
-%patch5 -p1
popd
pushd xf86-video-mga-1.4.8/src
tar xzf %{SOURCE44}
@@ -263,6 +261,20 @@
/var/lib/hardware/ids/20.%{name}
%changelog
+* Wed Jun 25 2008 sndirsch@suse.de
+- xf86-video-radeon 6.8.192
+ * ati 6.9.0rc2 release
+- use vesa driver for GeForce 6100 Micro-Star (10de:0242:1462:7207)
+ (bnc #393412)
+* Mon Jun 23 2008 sndirsch@suse.de
+- xf86-video-nv.diff
+ * obsoletes xf86-video-nv-gf9-mobile.diff
+ * obsoletes xf86-video-nv-commit-745a1d2.diff
+ * Replace copyright notices with stock MIT X11 boilerplate.
+ * Add new chips to the man page and fix capitalization of
+ "Quadro".
+ * Add a note that MODE_PANEL really means "larger than
+ BIOS-programmed panel size".
* Wed Jun 18 2008 sndirsch@suse.de
- xf86-video-intel 2.3.2
* includes misc bug fixes and the last 2.3 branch release
++++++ sax2-hwinfo-data.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/usr/share/sax/api/data/cdb/Cards.20.xorg-x11-driver-video new/usr/share/sax/api/data/cdb/Cards.20.xorg-x11-driver-video
--- old/usr/share/sax/api/data/cdb/Cards.20.xorg-x11-driver-video 2008-06-17 04:21:39.000000000 +0200
+++ new/usr/share/sax/api/data/cdb/Cards.20.xorg-x11-driver-video 2008-06-25 04:39:38.000000000 +0200
@@ -28,6 +28,9 @@
NVidia: GeForce 7300 LE {
Driver = vesa
}
+NVidia: GeForce 6100 Micro-Star {
+ Driver = vesa
+}
NVidia: GeForce 9500 {
Driver = nv
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/usr/share/sax/sysp/maps/update/Identity.map.20.xorg-x11-driver-video new/usr/share/sax/sysp/maps/update/Identity.map.20.xorg-x11-driver-video
--- old/usr/share/sax/sysp/maps/update/Identity.map.20.xorg-x11-driver-video 2008-06-17 04:23:17.000000000 +0200
+++ new/usr/share/sax/sysp/maps/update/Identity.map.20.xorg-x11-driver-video 2008-06-25 04:43:32.000000000 +0200
@@ -10,6 +10,7 @@
NAME=NVidia&DEVICE=GeForce 9200M GS&VID=0x10de&DID=0x06E8&SERVER=nv&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT
NAME=NVidia&DEVICE=GeForce 9300M GS&VID=0x10de&DID=0x06E9&SERVER=nv&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT
NAME=NVidia&DEVICE=GeForce 7300 LE&VID=0x10de&DID=0x01D1&SERVER=vesa&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT
+NAME=NVidia&DEVICE=GeForce 6100 Micro-Star&VID=0x10de&DID=0x0242&SERVER=vesa&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT&SUBVENDOR=0x1462&SUBDEVICE=0x7207
NAME=NVidia&DEVICE=GeForce 9500&VID=0x10de&DID=0x0640&SERVER=nv&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT
NAME=NVidia&DEVICE=GeForce 9600 GSO&VID=0x10de&DID=0x0610&SERVER=nv&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT
NAME=NVidia&DEVICE=GeForce 9800 GTX&VID=0x10de&DID=0x0612&SERVER=nv&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/var/lib/hardware/ids/20.xorg-x11-driver-video new/var/lib/hardware/ids/20.xorg-x11-driver-video
--- old/var/lib/hardware/ids/20.xorg-x11-driver-video 2008-06-17 04:25:11.000000000 +0200
+++ new/var/lib/hardware/ids/20.xorg-x11-driver-video 2008-06-25 04:49:09.000000000 +0200
@@ -59,6 +59,13 @@
+driver.xfree 4|vesa
vendor.id pci 0x10de
+&device.id pci 0x0242
+&subvendor.id pci 0x1462
+&subdevice.id pci 0x7207
++device.name GeForce 6100 Micro-Star
++driver.xfree 4|vesa
+
+ vendor.id pci 0x10de
&device.id pci 0x0640
+device.name GeForce 9500
+driver.xfree 4|nv
++++++ xf86-video-ati-6.8.191.tar.bz2 -> xf86-video-ati-6.8.192.tar.bz2 ++++++
++++ 9610 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.8.191/ChangeLog new/xf86-video-ati-6.8.192/ChangeLog
--- old/xf86-video-ati-6.8.191/ChangeLog 2008-06-12 21:11:15.000000000 +0200
+++ new/xf86-video-ati-6.8.192/ChangeLog 2008-06-25 03:04:35.000000000 +0200
@@ -1,3 +1,126 @@
+commit bd68507d2d66e03d8bcde5f6e7ea9b2dbfe8b8a0
+Author: Alex Deucher
+Date: Tue Jun 24 20:59:58 2008 -0400
+
+ RADEON: warning fix
+
+commit 8e534d69c9b19fc085f7c5ca9e18f5ea04f6fc12
+Author: Alex Deucher
+Date: Tue Jun 24 20:08:35 2008 -0400
+
+ RADEON: cleanups
+
+ - fix some warnings
+ - RS400 and RS480 are separate families now (update default tmds and dac2
+ tables)
+
+commit e78e8a21b4040cd7f1983c241c860d9209398396
+Author: Alex Deucher
+Date: Tue Jun 24 19:53:28 2008 -0400
+
+ IGP: attempt to fix VGA on IGP chips
+
+ VGA has never worked on some IGP chips. While the chip only has
+ one DAC, it appears to use a mix of Primary DAC and TVDAC controls.
+
+ See bug 15708
+
+commit faa4b4b8dbe9b8a452cfa60d53874350bb04e0cb
+Author: Jiří Paleček
+Date: Tue Jun 24 19:20:50 2008 -0400
+
+ RADEON: remove extraneous line from new pll code
+
+commit 72feaa37ea07620f5f2ead438dbc72a1c8883cd3
+Author: Jiří Paleček
+Date: Mon Jun 23 15:53:58 2008 -0400
+
+ RADEON: PLL tweaks
+
+ Patch from Jiří Paleček (see debian bug 465864) with some tweaks
+ by me.
+
+ - abort rather than programming bad dividers if no pll dividers can be found
+ - improve the pll selection algorithm
+ - in general, prefer lower ref dividers
+
+ I've tested this patch on a wide variety of chips (r1xx-r6xx) and clocks.
+
+commit 9c2f909ea437a63a408d2398ecabe0b378dbb982
+Author: Alex Deucher
+Date: Mon Jun 23 10:38:15 2008 -0400
+
+ RADEON: adjust randr crtc/output prepare/commit ordering
+
+ This fixes some occasional mode change problems with multiple heads active.
+ It seems radeons generally like to turn on the whole output/crtc setup
+ in one shot.
+
+commit aea9bf75cf0774afd3e65fcf3fd3851f5fb21ca3
+Author: Alex Deucher
+Date: Sat Jun 21 10:57:05 2008 -0400
+
+ 0x1002 0x5657 is actually RV410
+
+ See bug 14289
+
+ com_bios_scratch.diff
+
+commit 38ce8a984f96056b7345bcc06505ba27e0e6d5b4
+Author: Dave Airlie
+Date: Fri Jun 20 14:16:22 2008 +1000
+
+ legacy: use entity MMIO for dpms as this can crossover between zaphod infos
+
+commit 1a7d9bc53512b0a5240176c949e6abf1ae2fb1fd
+Author: Dave Airlie
+Date: Fri Jun 20 14:14:21 2008 +1000
+
+ atombios: use MMIO from the entity not the info
+
+commit ef624b88903b1a87ef5b6388e18291f75776b93d
+Author: Alex Deucher
+Date: Thu Jun 19 18:20:52 2008 -0400
+
+ RADEON: fix read past the end of an array
+
+commit cfe814a481d8cf2005d738a0ca9782f1ed4177f5
+Author: Dave Airlie
+Date: Fri Jun 20 07:51:27 2008 +1000
+
+ r600: don't add fb offset here to make shadowfb work.
+
+ discovered on irc with wpwrak.
+
+commit 5b323a2cbbc412b6dd4e782438b64ee996558d05
+Merge: dd18caa... eed2415...
+Author: Dave Airlie
+Date: Fri Jun 20 07:49:16 2008 +1000
+
+ Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/driver/xf86-video-ati
+
+commit eed241553748125e902c44dcc8cf8e0605be071b
+Author: Alex Deucher
+Date: Tue Jun 17 17:42:31 2008 -0400
+
+ radeon: X_ERROR -> X_WARNING for num gb pipes
+
+ This just means your drm is old, not fatal or anything
+
+commit dd18caa4b2efc430eaae0c4362b65641f9bef440
+Author: Dave Airlie
+Date: Sat Jun 14 18:37:56 2008 +1000
+
+ Revert "ATOM: disable TV-out for now"
+
+ This reverts commit effa245914823371e052cd9aa1143a02350891e7.
+
+commit b416e97a1f16ef700ba1aaca317dee82b7a3cf64
+Author: Alex Deucher
+Date: Fri Jun 13 02:21:31 2008 -0400
+
+ RADEON: man page updates
+
commit 88ce87d79069662de28ecb3c10c140919927d584
Author: Alex Deucher
Date: Thu Jun 12 15:10:47 2008 -0400
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.8.191/compile new/xf86-video-ati-6.8.192/compile
--- old/xf86-video-ati-6.8.191/compile 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-ati-6.8.192/compile 2007-11-27 20:32:08.000000000 +0100
@@ -0,0 +1,142 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand `-c -o'.
+
+scriptversion=2005-05-14.22
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Written by Tom Tromey .
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to or send patches to
+# .
+
+case $1 in
+ '')
+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand `-c -o'.
+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file `INSTALL'.
+
+Report bugs to .
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "compile $scriptversion"
+ exit $?
+ ;;
+esac
+
+ofile=
+cfile=
+eat=
+
+for arg
+do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as `compile cc -o foo foo.c'.
+ # So we strip `-o arg' only if arg is an object.
+ eat=1
+ case $2 in
+ *.o | *.obj)
+ ofile=$2
+ ;;
+ *)
+ set x "$@" -o "$2"
+ shift
+ ;;
+ esac
+ ;;
+ *.c)
+ cfile=$1
+ set x "$@" "$1"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+ # If no `-o' option was seen then we might have been invoked from a
+ # pattern rule where we don't need one. That is ok -- this is a
+ # normal compilation that the losing compiler can handle. If no
+ # `.c' file was seen then we are probably linking. That is also
+ # ok.
+ exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use `[/.-]' here to ensure that we don't use the same name
+# that we are using for the .o file. Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
+while true; do
+ if mkdir "$lockdir" >/dev/null 2>&1; then
+ break
+ fi
+ sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+ mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+ mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.8.191/configure.ac new/xf86-video-ati-6.8.192/configure.ac
--- old/xf86-video-ati-6.8.191/configure.ac 2008-06-12 21:09:03.000000000 +0200
+++ new/xf86-video-ati-6.8.192/configure.ac 2008-06-25 03:00:36.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-ati],
- 6.8.191,
+ 6.8.192,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-ati)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.8.191/man/radeon.man new/xf86-video-ati-6.8.192/man/radeon.man
--- old/xf86-video-ati-6.8.191/man/radeon.man 2008-06-02 02:44:51.000000000 +0200
+++ new/xf86-video-ati-6.8.192/man/radeon.man 2008-06-25 01:40:10.000000000 +0200
@@ -52,11 +52,11 @@
.B RS350
Radeon 9200 IGP
.TP 12
-.B RS400
-Radeon XPRESS 200/200M IGP
+.B RS400/RS480
+Radeon XPRESS 200(M)/1100 IGP
.TP 12
.B RV280
-Radeon 9200PRO/9200/9200SE, M9+
+Radeon 9200PRO/9200/9200SE/9250, M9+
.TP 12
.B R300
Radeon 9700PRO/9700/9500PRO/9500/9600TX, FireGL X1/Z1
@@ -68,9 +68,9 @@
Radeon 9800XT
.TP 12
.B RV350
-Radeon 9600PRO/9600SE/9600, M10/M11, FireGL T2
+Radeon 9600PRO/9600SE/9600/9550, M10/M11, FireGL T2
.TP 12
-.B RV360
+.B RV360
Radeon 9600XT
.TP 12
.B RV370
@@ -91,8 +91,8 @@
.B R480/R481
Radeon X850 PCIE/AGP
.TP 12
-.B RV515
-Radeon X1300/X1400/X1500
+.B RV505/RV515/RV516/RV550
+Radeon X1300/X1400/X1500/X2300
.TP 12
.B R520
Radeon X1800
@@ -114,6 +114,12 @@
.TP 12
.B RV670
Radeon HD 3850/3870
+.TP 12
+.B RV620/RV635
+Radeon HD 3450/3470
+.TP 12
+.B RS780
+Radeon HD 3200
.SH CONFIGURATION DETAILS
Please refer to __xconfigfile__(__filemansuffix__) for general configuration
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.8.191/missing new/xf86-video-ati-6.8.192/missing
--- old/xf86-video-ati-6.8.191/missing 2008-01-29 02:01:28.000000000 +0100
+++ new/xf86-video-ati-6.8.192/missing 2007-11-27 20:32:08.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2005-06-08.21
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,8 +33,6 @@
fi
run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -46,7 +44,7 @@
msg="missing on your system"
-case $1 in
+case "$1" in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -79,7 +77,6 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -109,7 +106,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case $1 in
+case "$1" in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -138,7 +135,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case "$1" in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -167,7 +164,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case $f in
+ case "$f" in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -195,8 +192,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+ test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
if test -f "$file"; then
touch $file
else
@@ -217,25 +214,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if test ! -f y.tab.h; then
+ if [ ! -f y.tab.h ]; then
echo >y.tab.h
fi
- if test ! -f y.tab.c; then
+ if [ ! -f y.tab.c ]; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -247,18 +244,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if test ! -f lex.yy.c; then
+ if [ ! -f lex.yy.c ]; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -270,9 +267,11 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ if test -z "$file"; then
+ file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+ fi
+ if [ -f "$file" ]; then
touch $file
else
test -z "$file" || exec >$file
@@ -290,17 +289,11 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -324,13 +317,13 @@
fi
firstarg="$1"
if shift; then
- case $firstarg in
+ case "$firstarg" in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case $firstarg in
+ case "$firstarg" in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.8.191/src/ati_pciids_gen.h new/xf86-video-ati-6.8.192/src/ati_pciids_gen.h
--- old/xf86-video-ati-6.8.191/src/ati_pciids_gen.h 2008-06-10 01:35:56.000000000 +0200
+++ new/xf86-video-ati-6.8.192/src/ati_pciids_gen.h 2008-06-21 16:55:13.000000000 +0200
@@ -173,6 +173,7 @@
#define PCI_CHIP_RV410_564F 0x564F
#define PCI_CHIP_RV410_5652 0x5652
#define PCI_CHIP_RV410_5653 0x5653
+#define PCI_CHIP_RV410_5657 0x5657
#define PCI_CHIP_MACH64VT 0x5654
#define PCI_CHIP_MACH64VU 0x5655
#define PCI_CHIP_MACH64VV 0x5656
@@ -195,7 +196,6 @@
#define PCI_CHIP_RV370_5B60 0x5B60
#define PCI_CHIP_RV370_5B62 0x5B62
#define PCI_CHIP_RV370_5B63 0x5B63
-#define PCI_CHIP_RV370_5657 0x5657
#define PCI_CHIP_RV370_5B64 0x5B64
#define PCI_CHIP_RV370_5B65 0x5B65
#define PCI_CHIP_RV280_5C61 0x5C61
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.8.191/src/atombios_crtc.c new/xf86-video-ati-6.8.192/src/atombios_crtc.c
--- old/xf86-video-ati-6.8.191/src/atombios_crtc.c 2008-05-28 14:55:14.000000000 +0200
+++ new/xf86-video-ati-6.8.192/src/atombios_crtc.c 2008-06-23 21:31:43.000000000 +0200
@@ -185,8 +185,7 @@
if (IS_AVIVO_VARIANT) {
uint32_t temp;
- if (IS_DCE3_VARIANT)
- pll_flags |= RADEON_PLL_DCE3;
+ pll_flags |= RADEON_PLL_PREFER_LOW_REF_DIV;
RADEONComputePLL(&info->pll, mode->Clock, &temp, &fb_div, &ref_div, &post_div, pll_flags);
sclock = temp;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.8.191/src/legacy_crtc.c new/xf86-video-ati-6.8.192/src/legacy_crtc.c
--- old/xf86-video-ati-6.8.191/src/legacy_crtc.c 2008-06-04 02:33:14.000000000 +0200
+++ new/xf86-video-ati-6.8.192/src/legacy_crtc.c 2008-06-25 02:51:35.000000000 +0200
@@ -636,10 +636,9 @@
legacy_crtc_dpms(xf86CrtcPtr crtc, int mode)
{
int mask;
- ScrnInfoPtr pScrn = crtc->scrn;
RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private;
- RADEONInfoPtr info = RADEONPTR(pScrn);
- unsigned char *RADEONMMIO = info->MMIO;
+ RADEONEntPtr pRADEONEnt = RADEONEntPriv(crtc->scrn);
+ unsigned char *RADEONMMIO = pRADEONEnt->MMIO;
mask = radeon_crtc->crtc_id ? (RADEON_CRTC2_DISP_DIS | RADEON_CRTC2_VSYNC_DIS | RADEON_CRTC2_HSYNC_DIS | RADEON_CRTC2_DISP_REQ_EN_B) : (RADEON_CRTC_DISPLAY_DIS | RADEON_CRTC_HSYNC_DIS | RADEON_CRTC_VSYNC_DIS);
@@ -1730,7 +1729,7 @@
RADEONInfoPtr info = RADEONPTR(pScrn);
int i = 0;
double dot_clock = 0;
- int pll_flags = RADEON_PLL_LEGACY;
+ int pll_flags = RADEON_PLL_LEGACY | RADEON_PLL_PREFER_LOW_REF_DIV;
Bool update_tv_routing = FALSE;
Bool tilingChanged = FALSE;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.8.191/src/legacy_output.c new/xf86-video-ati-6.8.192/src/legacy_output.c
--- old/xf86-video-ati-6.8.191/src/legacy_output.c 2008-05-22 07:17:02.000000000 +0200
+++ new/xf86-video-ati-6.8.192/src/legacy_output.c 2008-06-25 02:20:42.000000000 +0200
@@ -727,6 +727,14 @@
save->crtc2_gen_cntl |= RADEON_CRTC2_CRT2_ON;
}
tv_dac_change = 1;
+ /* IGP chips seem to use a mix of Primary and TVDAC controls */
+ if (info->IsIGP) {
+ tmp = INREG(RADEON_CRTC_EXT_CNTL);
+ tmp |= RADEON_CRTC_CRT_ON;
+ OUTREG(RADEON_CRTC_EXT_CNTL, tmp);
+ save->crtc_ext_cntl |= RADEON_CRTC_CRT_ON;
+ RADEONDacPowerSet(pScrn, bEnable, TRUE);
+ }
}
} else if (radeon_output->MonType == MT_DFP) {
if (radeon_output->TMDSType == TMDS_INT) {
@@ -807,6 +815,14 @@
save->crtc2_gen_cntl &= ~RADEON_CRTC2_CRT2_ON;
}
}
+ /* IGP chips seem to use a mix of Primary and TVDAC controls */
+ if (info->IsIGP) {
+ tmp = INREG(RADEON_CRTC_EXT_CNTL);
+ tmp &= ~RADEON_CRTC_CRT_ON;
+ OUTREG(RADEON_CRTC_EXT_CNTL, tmp);
+ save->crtc_ext_cntl &= ~RADEON_CRTC_CRT_ON;
+ RADEONDacPowerSet(pScrn, bEnable, TRUE);
+ }
}
} else if (radeon_output->MonType == MT_DFP) {
if (radeon_output->TMDSType == TMDS_INT) {
@@ -1367,6 +1383,7 @@
{
Bool IsPrimary = crtc_num == 0 ? TRUE : FALSE;
RADEONOutputPrivatePtr radeon_output = output->driver_private;
+ RADEONInfoPtr info = RADEONPTR(pScrn);
if (crtc_num == 0)
RADEONInitRMXRegisters(output, save, mode);
@@ -1376,6 +1393,9 @@
RADEONInitDACRegisters(output, save, mode, IsPrimary);
} else {
RADEONInitDAC2Registers(output, save, mode, IsPrimary);
+ /* IGP chips seem to use a mix of primary and TVDAC controls */
+ if (info->IsIGP)
+ RADEONInitDACRegisters(output, save, mode, IsPrimary);
}
} else if (radeon_output->MonType == MT_LCD) {
RADEONInitLVDSRegisters(output, save, mode, IsPrimary);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.8.191/src/pcidb/ati_pciids.csv new/xf86-video-ati-6.8.192/src/pcidb/ati_pciids.csv
--- old/xf86-video-ati-6.8.191/src/pcidb/ati_pciids.csv 2008-06-10 01:35:56.000000000 +0200
+++ new/xf86-video-ati-6.8.192/src/pcidb/ati_pciids.csv 2008-06-21 16:54:58.000000000 +0200
@@ -174,6 +174,7 @@
"0x564F","RV410_564F","RV410",1,,,,,"ATI Mobility Radeon X700 XL (M26) (PCIE)"
"0x5652","RV410_5652","RV410",1,,,,,"ATI Mobility Radeon X700 (M26) (PCIE)"
"0x5653","RV410_5653","RV410",1,,,,,"ATI Mobility Radeon X700 (M26) (PCIE)"
+"0x5657","RV410_5657","RV410",,,,,,"ATI Radeon X550XTX 5657 (PCIE)"
"0x5654","MACH64VT","MACH64",,,,,,
"0x5655","MACH64VU","MACH64",,,,,,
"0x5656","MACH64VV","MACH64",,,,,,
@@ -196,7 +197,6 @@
"0x5B60","RV370_5B60","RV380",,,,,,"ATI Radeon X300 (RV370) 5B60 (PCIE)"
"0x5B62","RV370_5B62","RV380",,,,,,"ATI Radeon X600 (RV370) 5B62 (PCIE)"
"0x5B63","RV370_5B63","RV380",,,,,,"ATI Radeon X550 (RV370) 5B63 (PCIE)"
-"0x5657","RV370_5657","RV380",,,,,,"ATI Radeon X550XTX (RV370) 5657 (PCIE)"
"0x5B64","RV370_5B64","RV380",,,,,,"ATI FireGL V3100 (RV370) 5B64 (PCIE)"
"0x5B65","RV370_5B65","RV380",,,,,,"ATI FireMV 2200 PCIE (RV370) 5B65 (PCIE)"
"0x5C61","RV280_5C61","RV280",1,,,,,"ATI Radeon Mobility 9200 (M9+) 5C61 (AGP)"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.8.191/src/radeon_accel.c new/xf86-video-ati-6.8.192/src/radeon_accel.c
--- old/xf86-video-ati-6.8.191/src/radeon_accel.c 2008-06-12 20:47:04.000000000 +0200
+++ new/xf86-video-ati-6.8.192/src/radeon_accel.c 2008-06-17 23:40:28.000000000 +0200
@@ -381,7 +381,7 @@
if (drmCommandWriteRead(info->drmFD, DRM_RADEON_GETPARAM, &np,
sizeof(np)) < 0) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"Failed to determine num pipes from DRM, falling back to "
"manual look-up!\n");
info->num_gb_pipes = 0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.8.191/src/radeon_atombios.c new/xf86-video-ati-6.8.192/src/radeon_atombios.c
--- old/xf86-video-ati-6.8.191/src/radeon_atombios.c 2008-06-12 20:47:04.000000000 +0200
+++ new/xf86-video-ati-6.8.192/src/radeon_atombios.c 2008-06-21 16:53:22.000000000 +0200
@@ -1787,13 +1787,6 @@
continue;
}
#endif
-#if 1
- if (i == ATOM_DEVICE_TV1_INDEX) {
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Skipping TV-Out\n");
- info->BiosConnector[i].valid = FALSE;
- continue;
- }
-#endif
info->BiosConnector[i].valid = TRUE;
info->BiosConnector[i].output_id = ci.sucI2cId.sbfAccess.bfI2C_LineMux;
@@ -2054,8 +2047,8 @@
CailReadATIRegister(VOID* CAIL, UINT32 idx)
{
ScrnInfoPtr pScrn = xf86Screens[((atomBiosHandlePtr)CAIL)->scrnIndex];
- RADEONInfoPtr info = RADEONPTR(pScrn);
- unsigned char *RADEONMMIO = info->MMIO;
+ RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
+ unsigned char *RADEONMMIO = pRADEONEnt->MMIO;
UINT32 ret;
CAILFUNC(CAIL);
@@ -2068,8 +2061,8 @@
CailWriteATIRegister(VOID *CAIL, UINT32 idx, UINT32 data)
{
ScrnInfoPtr pScrn = xf86Screens[((atomBiosHandlePtr)CAIL)->scrnIndex];
- RADEONInfoPtr info = RADEONPTR(pScrn);
- unsigned char *RADEONMMIO = info->MMIO;
+ RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
+ unsigned char *RADEONMMIO = pRADEONEnt->MMIO;
CAILFUNC(CAIL);
OUTREG(idx << 2,data);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.8.191/src/radeon_chipinfo_gen.h new/xf86-video-ati-6.8.192/src/radeon_chipinfo_gen.h
--- old/xf86-video-ati-6.8.191/src/radeon_chipinfo_gen.h 2008-06-10 01:35:56.000000000 +0200
+++ new/xf86-video-ati-6.8.192/src/radeon_chipinfo_gen.h 2008-06-21 16:55:13.000000000 +0200
@@ -96,6 +96,7 @@
{ 0x564F, CHIP_FAMILY_RV410, 1, 0, 0, 0, 0 },
{ 0x5652, CHIP_FAMILY_RV410, 1, 0, 0, 0, 0 },
{ 0x5653, CHIP_FAMILY_RV410, 1, 0, 0, 0, 0 },
+ { 0x5657, CHIP_FAMILY_RV410, 0, 0, 0, 0, 0 },
{ 0x5834, CHIP_FAMILY_RS300, 0, 1, 0, 0, 1 },
{ 0x5835, CHIP_FAMILY_RS300, 1, 1, 0, 0, 1 },
{ 0x5954, CHIP_FAMILY_RS480, 0, 1, 0, 0, 1 },
@@ -115,7 +116,6 @@
{ 0x5B60, CHIP_FAMILY_RV380, 0, 0, 0, 0, 0 },
{ 0x5B62, CHIP_FAMILY_RV380, 0, 0, 0, 0, 0 },
{ 0x5B63, CHIP_FAMILY_RV380, 0, 0, 0, 0, 0 },
- { 0x5657, CHIP_FAMILY_RV380, 0, 0, 0, 0, 0 },
{ 0x5B64, CHIP_FAMILY_RV380, 0, 0, 0, 0, 0 },
{ 0x5B65, CHIP_FAMILY_RV380, 0, 0, 0, 0, 0 },
{ 0x5C61, CHIP_FAMILY_RV280, 1, 0, 0, 0, 0 },
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.8.191/src/radeon_chipset_gen.h new/xf86-video-ati-6.8.192/src/radeon_chipset_gen.h
--- old/xf86-video-ati-6.8.191/src/radeon_chipset_gen.h 2008-06-10 01:35:56.000000000 +0200
+++ new/xf86-video-ati-6.8.192/src/radeon_chipset_gen.h 2008-06-21 16:55:13.000000000 +0200
@@ -96,6 +96,7 @@
{ PCI_CHIP_RV410_564F, "ATI Mobility Radeon X700 XL (M26) (PCIE)" },
{ PCI_CHIP_RV410_5652, "ATI Mobility Radeon X700 (M26) (PCIE)" },
{ PCI_CHIP_RV410_5653, "ATI Mobility Radeon X700 (M26) (PCIE)" },
+ { PCI_CHIP_RV410_5657, "ATI Radeon X550XTX 5657 (PCIE)" },
{ PCI_CHIP_RS300_5834, "ATI Radeon 9100 IGP (A5) 5834" },
{ PCI_CHIP_RS300_5835, "ATI Radeon Mobility 9100 IGP (U3) 5835" },
{ PCI_CHIP_RS480_5954, "ATI Radeon XPRESS 200 5954 (PCIE)" },
@@ -115,7 +116,6 @@
{ PCI_CHIP_RV370_5B60, "ATI Radeon X300 (RV370) 5B60 (PCIE)" },
{ PCI_CHIP_RV370_5B62, "ATI Radeon X600 (RV370) 5B62 (PCIE)" },
{ PCI_CHIP_RV370_5B63, "ATI Radeon X550 (RV370) 5B63 (PCIE)" },
- { PCI_CHIP_RV370_5657, "ATI Radeon X550XTX (RV370) 5657 (PCIE)" },
{ PCI_CHIP_RV370_5B64, "ATI FireGL V3100 (RV370) 5B64 (PCIE)" },
{ PCI_CHIP_RV370_5B65, "ATI FireMV 2200 PCIE (RV370) 5B65 (PCIE)" },
{ PCI_CHIP_RV280_5C61, "ATI Radeon Mobility 9200 (M9+) 5C61 (AGP)" },
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.8.191/src/radeon_crtc.c new/xf86-video-ati-6.8.192/src/radeon_crtc.c
--- old/xf86-video-ati-6.8.191/src/radeon_crtc.c 2008-05-13 15:44:14.000000000 +0200
+++ new/xf86-video-ati-6.8.192/src/radeon_crtc.c 2008-06-25 01:19:14.000000000 +0200
@@ -59,7 +59,7 @@
int x, int y);
extern void atombios_crtc_dpms(xf86CrtcPtr crtc, int mode);
-static void
+void
radeon_crtc_dpms(xf86CrtcPtr crtc, int mode)
{
RADEONInfoPtr info = RADEONPTR(crtc->scrn);
@@ -110,7 +110,6 @@
if (radeon_crtc->enabled)
crtc->funcs->hide_cursor(crtc);
- radeon_crtc_dpms(crtc, DPMSModeOff);
}
static uint32_t RADEONDiv(CARD64 n, uint32_t d)
@@ -133,7 +132,7 @@
uint32_t best_post_div = 1;
uint32_t best_ref_div = 1;
uint32_t best_feedback_div = 1;
- uint32_t best_freq = 1;
+ uint32_t best_freq = -1;
uint32_t best_error = 0xffffffff;
uint32_t best_vco_diff = 1;
uint32_t post_div;
@@ -144,10 +143,20 @@
if (flags & RADEON_PLL_USE_REF_DIV)
min_ref_div = max_ref_div = pll->reference_div;
+ else {
+ while (min_ref_div < max_ref_div-1) {
+ uint32_t mid=(min_ref_div+max_ref_div)/2;
+ uint32_t pll_in = pll->reference_freq / mid;
+ if (pll_in < pll->pll_in_min)
+ max_ref_div = mid;
+ else if (pll_in > pll->pll_in_max)
+ min_ref_div = mid;
+ else break;
+ }
+ }
for (post_div = pll->min_post_div; post_div <= pll->max_post_div; ++post_div) {
uint32_t ref_div;
- uint32_t vco = (freq / 10000) * post_div;
if ((flags & RADEON_PLL_NO_ODD_POST_DIV) && (post_div & 1))
continue;
@@ -162,45 +171,71 @@
continue;
}
- if (vco < pll->pll_out_min || vco > pll->pll_out_max)
- continue;
-
for (ref_div = min_ref_div; ref_div <= max_ref_div; ++ref_div) {
uint32_t feedback_div, current_freq, error, vco_diff;
uint32_t pll_in = pll->reference_freq / ref_div;
+ uint32_t min_feed_div = pll->min_feedback_div;
+ uint32_t max_feed_div = pll->max_feedback_div+1;
if (pll_in < pll->pll_in_min || pll_in > pll->pll_in_max)
continue;
- feedback_div = RADEONDiv((CARD64)freq * ref_div * post_div,
- pll->reference_freq * 10000);
+ while (min_feed_div < max_feed_div) {
+ uint32_t vco;
- if (feedback_div < pll->min_feedback_div || feedback_div > pll->max_feedback_div)
- continue;
+ feedback_div = (min_feed_div+max_feed_div)/2;
+
+ vco = RADEONDiv((CARD64)pll->reference_freq * feedback_div,
+ ref_div);
+
+ if (vco < pll->pll_out_min) {
+ min_feed_div = feedback_div+1;
+ continue;
+ } else if(vco > pll->pll_out_max) {
+ max_feed_div = feedback_div;
+ continue;
+ }
+
+ current_freq = RADEONDiv((CARD64)pll->reference_freq * 10000 * feedback_div,
+ ref_div * post_div);
- current_freq = RADEONDiv((CARD64)pll->reference_freq * 10000 * feedback_div,
- ref_div * post_div);
+ error = abs(current_freq - freq);
+ vco_diff = abs(vco - best_vco);
- error = abs(current_freq - freq);
- vco_diff = abs(vco - best_vco);
+ if ((best_vco == 0 && error < best_error) ||
+ (best_vco != 0 &&
+ (error < best_error - 100 ||
+ (abs(error - best_error) < 100 && vco_diff < best_vco_diff )))) {
+ best_post_div = post_div;
+ best_ref_div = ref_div;
+ best_feedback_div = feedback_div;
+ best_freq = current_freq;
+ best_error = error;
+ best_vco_diff = vco_diff;
+ } else if (current_freq == freq) {
+ if (best_freq == -1) {
+ best_post_div = post_div;
+ best_ref_div = ref_div;
+ best_feedback_div = feedback_div;
+ best_freq = current_freq;
+ best_error = error;
+ best_vco_diff = vco_diff;
+ } else if ((flags & RADEON_PLL_PREFER_LOW_REF_DIV) && (ref_div < best_ref_div)) {
+ best_post_div = post_div;
+ best_ref_div = ref_div;
+ best_feedback_div = feedback_div;
+ best_freq = current_freq;
+ best_error = error;
+ best_vco_diff = vco_diff;
+ }
+ }
- if ((best_vco == 0 && error < best_error) ||
- (ref_div == pll->reference_div) ||
- (best_vco != 0 &&
- (error < best_error - 100 ||
- (abs(error - best_error) < 100 && vco_diff < best_vco_diff )))) {
- best_post_div = post_div;
- best_ref_div = ref_div;
- best_feedback_div = feedback_div;
- best_freq = current_freq;
- best_error = error;
- best_vco_diff = vco_diff;
+ if (current_freq < freq)
+ min_feed_div = feedback_div+1;
+ else
+ max_feed_div = feedback_div;
}
}
- if (!(flags & RADEON_PLL_DCE3)) {
- if (best_freq == freq)
- break;
- }
}
ErrorF("best_freq: %u\n", (unsigned int)best_freq);
@@ -208,6 +243,8 @@
ErrorF("best_ref_div: %u\n", (unsigned int)best_ref_div);
ErrorF("best_post_div: %u\n", (unsigned int)best_post_div);
+ if (best_freq == -1)
+ FatalError("Couldn't find valid PLL dividers\n");
*chosen_dot_clock_freq = best_freq / 10000;
*chosen_feedback_div = best_feedback_div;
*chosen_reference_div = best_ref_div;
@@ -232,25 +269,8 @@
static void
radeon_crtc_mode_commit(xf86CrtcPtr crtc)
{
- RADEONInfoPtr info = RADEONPTR(crtc->scrn);
- RADEONEntPtr pRADEONEnt = RADEONEntPriv(crtc->scrn);
- RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private;
-
- if (info->ChipFamily >= CHIP_FAMILY_R600) {
- xf86CrtcPtr other;
- if (radeon_crtc->crtc_id == 1)
- other = pRADEONEnt->pCrtc[0];
- else
- other = pRADEONEnt->pCrtc[1];
- if (other->enabled)
- radeon_crtc_dpms(other, DPMSModeOn);
- }
-
- radeon_crtc_dpms(crtc, DPMSModeOn);
-
if (crtc->scrn->pScreen != NULL)
xf86_reload_cursors(crtc->scrn->pScreen);
-
}
void
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.8.191/src/radeon_driver.c new/xf86-video-ati-6.8.192/src/radeon_driver.c
--- old/xf86-video-ati-6.8.191/src/radeon_driver.c 2008-06-10 01:35:56.000000000 +0200
+++ new/xf86-video-ati-6.8.192/src/radeon_driver.c 2008-06-25 01:40:10.000000000 +0200
@@ -224,8 +224,7 @@
stride = (pScrn->displayWidth * pScrn->bitsPerPixel) / 8;
*size = stride;
- return ((uint8_t *)info->FB + pScrn->fbOffset +
- row * stride + offset);
+ return ((uint8_t *)info->FB + row * stride + offset);
}
static Bool
RADEONCreateScreenResources (ScreenPtr pScreen)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.8.191/src/radeon.h new/xf86-video-ati-6.8.192/src/radeon.h
--- old/xf86-video-ati-6.8.191/src/radeon.h 2008-06-10 01:35:56.000000000 +0200
+++ new/xf86-video-ati-6.8.192/src/radeon.h 2008-06-25 01:40:10.000000000 +0200
@@ -220,7 +220,7 @@
#define RADEON_PLL_NO_ODD_POST_DIV (1 << 1)
#define RADEON_PLL_USE_REF_DIV (1 << 2)
#define RADEON_PLL_LEGACY (1 << 3)
-#define RADEON_PLL_DCE3 (1 << 4)
+#define RADEON_PLL_PREFER_LOW_REF_DIV (1 << 4)
typedef struct {
uint16_t reference_freq;
@@ -880,6 +880,7 @@
extern void RADEONWaitForIdleMMIO(ScrnInfoPtr pScrn);
/* radeon_crtc.c */
+extern void radeon_crtc_dpms(xf86CrtcPtr crtc, int mode);
extern void radeon_crtc_load_lut(xf86CrtcPtr crtc);
extern void radeon_crtc_modeset_ioctl(xf86CrtcPtr crtc, Bool post);
extern Bool RADEONAllocateControllers(ScrnInfoPtr pScrn, int mask);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.8.191/src/radeon_output.c new/xf86-video-ati-6.8.192/src/radeon_output.c
--- old/xf86-video-ati-6.8.191/src/radeon_output.c 2008-06-09 17:49:42.000000000 +0200
+++ new/xf86-video-ati-6.8.192/src/radeon_output.c 2008-06-25 02:06:37.000000000 +0200
@@ -74,12 +74,13 @@
MT_DP
};
-const char *TMDSTypeName[5] = {
+const char *TMDSTypeName[6] = {
"None",
"Internal",
"External",
"LVTMA",
- "DDIA"
+ "DDIA",
+ "UNIPHY"
};
const char *DACTypeName[4] = {
@@ -143,6 +144,7 @@
{{0xffffffff, 0xb01cb}, {0, 0}, {0, 0}, {0, 0}}, /*CHIP_FAMILY_R420*/
{{0xffffffff, 0xb01cb}, {0, 0}, {0, 0}, {0, 0}}, /*CHIP_FAMILY_RV410*/ /* FIXME: just values from r420 used... */
{{15000, 0xb0155}, {0xffffffff, 0xb01cb}, {0, 0}, {0, 0}}, /*CHIP_FAMILY_RS400*/ /* FIXME: just values from rv380 used... */
+ {{15000, 0xb0155}, {0xffffffff, 0xb01cb}, {0, 0}, {0, 0}}, /*CHIP_FAMILY_RS480*/ /* FIXME: just values from rv380 used... */
};
static const uint32_t default_tvdac_adj [CHIP_FAMILY_LAST] =
@@ -165,6 +167,7 @@
0x01080000, /* r420 */
0x01080000, /* rv410 */ /* FIXME: just values from r420 used... */
0x00780000, /* rs400 */ /* FIXME: just values from rv380 used... */
+ 0x00780000, /* rs480 */ /* FIXME: just values from rv380 used... */
};
@@ -583,8 +586,26 @@
static void
radeon_mode_prepare(xf86OutputPtr output)
{
+ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR (output->scrn);
+ int o;
+
+ for (o = 0; o < config->num_output; o++) {
+ xf86OutputPtr loop_output = config->output[o];
+ if (loop_output == output)
+ continue;
+ else if (loop_output->crtc) {
+ xf86CrtcPtr other_crtc = loop_output->crtc;
+ if (other_crtc->enabled) {
+ radeon_dpms(loop_output, DPMSModeOff);
+ radeon_crtc_dpms(other_crtc, DPMSModeOff);
+ }
+ }
+ }
+
radeon_bios_output_lock(output, TRUE);
radeon_dpms(output, DPMSModeOff);
+ radeon_crtc_dpms(output->crtc, DPMSModeOff);
+
}
static void
@@ -604,7 +625,24 @@
static void
radeon_mode_commit(xf86OutputPtr output)
{
+ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR (output->scrn);
+ int o;
+
+ for (o = 0; o < config->num_output; o++) {
+ xf86OutputPtr loop_output = config->output[o];
+ if (loop_output == output)
+ continue;
+ else if (loop_output->crtc) {
+ xf86CrtcPtr other_crtc = loop_output->crtc;
+ if (other_crtc->enabled) {
+ radeon_dpms(loop_output, DPMSModeOn);
+ radeon_crtc_dpms(other_crtc, DPMSModeOn);
+ }
+ }
+ }
+
radeon_dpms(output, DPMSModeOn);
+ radeon_crtc_dpms(output->crtc, DPMSModeOn);
radeon_bios_output_lock(output, FALSE);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.8.191/src/radeon_pci_chipset_gen.h new/xf86-video-ati-6.8.192/src/radeon_pci_chipset_gen.h
--- old/xf86-video-ati-6.8.191/src/radeon_pci_chipset_gen.h 2008-06-10 01:35:56.000000000 +0200
+++ new/xf86-video-ati-6.8.192/src/radeon_pci_chipset_gen.h 2008-06-21 16:55:13.000000000 +0200
@@ -96,6 +96,7 @@
{ PCI_CHIP_RV410_564F, PCI_CHIP_RV410_564F, RES_SHARED_VGA },
{ PCI_CHIP_RV410_5652, PCI_CHIP_RV410_5652, RES_SHARED_VGA },
{ PCI_CHIP_RV410_5653, PCI_CHIP_RV410_5653, RES_SHARED_VGA },
+ { PCI_CHIP_RV410_5657, PCI_CHIP_RV410_5657, RES_SHARED_VGA },
{ PCI_CHIP_RS300_5834, PCI_CHIP_RS300_5834, RES_SHARED_VGA },
{ PCI_CHIP_RS300_5835, PCI_CHIP_RS300_5835, RES_SHARED_VGA },
{ PCI_CHIP_RS480_5954, PCI_CHIP_RS480_5954, RES_SHARED_VGA },
@@ -115,7 +116,6 @@
{ PCI_CHIP_RV370_5B60, PCI_CHIP_RV370_5B60, RES_SHARED_VGA },
{ PCI_CHIP_RV370_5B62, PCI_CHIP_RV370_5B62, RES_SHARED_VGA },
{ PCI_CHIP_RV370_5B63, PCI_CHIP_RV370_5B63, RES_SHARED_VGA },
- { PCI_CHIP_RV370_5657, PCI_CHIP_RV370_5657, RES_SHARED_VGA },
{ PCI_CHIP_RV370_5B64, PCI_CHIP_RV370_5B64, RES_SHARED_VGA },
{ PCI_CHIP_RV370_5B65, PCI_CHIP_RV370_5B65, RES_SHARED_VGA },
{ PCI_CHIP_RV280_5C61, PCI_CHIP_RV280_5C61, RES_SHARED_VGA },
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ati-6.8.191/src/radeon_pci_device_match_gen.h new/xf86-video-ati-6.8.192/src/radeon_pci_device_match_gen.h
--- old/xf86-video-ati-6.8.191/src/radeon_pci_device_match_gen.h 2008-06-10 01:35:56.000000000 +0200
+++ new/xf86-video-ati-6.8.192/src/radeon_pci_device_match_gen.h 2008-06-21 16:55:13.000000000 +0200
@@ -96,6 +96,7 @@
ATI_DEVICE_MATCH( PCI_CHIP_RV410_564F, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_RV410_5652, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_RV410_5653, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_RV410_5657, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_RS300_5834, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_RS300_5835, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_RS480_5954, 0 ),
@@ -115,7 +116,6 @@
ATI_DEVICE_MATCH( PCI_CHIP_RV370_5B60, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_RV370_5B62, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_RV370_5B63, 0 ),
- ATI_DEVICE_MATCH( PCI_CHIP_RV370_5657, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_RV370_5B64, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_RV370_5B65, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_RV280_5C61, 0 ),
++++++ xf86-video-nv-commit-745a1d2.diff -> xf86-video-nv.diff ++++++
++++ 975 lines (skipped)
++++ between xorg-x11-driver-video/xf86-video-nv-commit-745a1d2.diff
++++ and xorg-x11-driver-video/xf86-video-nv.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org