Hello community,
here is the log from the commit of package xorg-x11-driver-video
checked in at Mon Jun 23 01:56:53 CEST 2008.
--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2008-06-06 12:31:31.000000000 +0200
+++ xorg-x11-driver-video/xorg-x11-driver-video.changes 2008-06-18 09:04:58.923471000 +0200
@@ -1,0 +2,55 @@
+Wed Jun 18 09:05:22 CEST 2008 - sndirsch@suse.de
+
+- xf86-video-intel 2.3.2
+ * includes misc bug fixes and the last 2.3 branch release
+
+-------------------------------------------------------------------
+Wed Jun 18 03:33:43 CEST 2008 - sndirsch@suse.de
+
+- xf86-video-geode 2.10.0
+ * Unmap the PCI memory when we close the screen
+ * Bring over the DCON detection code from the OLPC tree
+ * Fix build for git-master (missing device pointers).
+
+-------------------------------------------------------------------
+Tue Jun 17 04:19:50 CEST 2008 - sndirsch@suse.de
+
+- xf86-video-nv-commit-745a1d2.diff
+ * GeForce GTX 280 and 260 chips
+
+-------------------------------------------------------------------
+Fri Jun 13 16:04:03 CEST 2008 - sndirsch@suse.de
+
+- xf86-video-vmware 10.16.2
+ * More xorg and xfree86 backwards compatibility
+ * Fix VMWARE_CTRL and Xinerama Initialization
+
+-------------------------------------------------------------------
+Thu Jun 12 21:40:17 CEST 2008 - sndirsch@suse.de
+
+- xf86-video-radeon 6.8.191
+ * ati 6.9.0rc1 release. Lots of changes since the last release.
+ Main things are EXA composite support for r3xx/r4xx/r5xx chips
+ and textured video support on all radeons.
+- xf86-video-r128 6.8.0
+- xf86-video-mach64 6.8.0
+
+-------------------------------------------------------------------
+Thu Jun 12 16:21:33 CEST 2008 - sndirsch@suse.de
+
+- make the RANDR 1.2 compatible radeon driver (6.8.0) our default
+ "radeon" driver
+- renamed previous default "radeon" driver (6.6.3) to "radeonold"
+
+-------------------------------------------------------------------
+Thu Jun 12 06:19:45 CEST 2008 - sndirsch@suse.de
+
+- specfile cleanup
+- removed dead sources/patches
+
+-------------------------------------------------------------------
+Mon Jun 9 16:52:50 CEST 2008 - sndirsch@suse.de
+
+- back to xf86-video-glint 1.1.0 to fix Xserver crash (bnc #398350)
+
+-------------------------------------------------------------------
Old:
----
bug-263199_radeon-autocrt.diff
radeon_dell.diff
radeon-Fix-CRT-on-RS400.diff
radeon-vbios-ppc.diff
radeon-xrandr-dotclock.diff
xf86-video-ati-6.6.193.tar.bz2
xf86-video-ati-6.8.0.tar.bz2
xf86-video-ati-AGPFastWrite-risk-reduction.diff
xf86-video-ati-bug296856.diff
xf86-video-ati-disable_rmx_dell_rn50.diff
xf86-video-ati-mergedfb-dpi.diff
xf86-video-ati-opma.diff
xf86-video-geode-2.9.0.tar.bz2
xf86-video-glint-1.2.0.tar.bz2
xf86-video-intel-2.3.1.tar.bz2
xf86-video-vmware-10.16.0.tar.bz2
New:
----
xf86-video-ati-6.8.191.tar.bz2
xf86-video-geode-2.10.0.tar.bz2
xf86-video-glint-1.1.1.tar.bz2
xf86-video-glint.diff
xf86-video-intel-2.3.2.tar.bz2
xf86-video-mach64-6.8.0.tar.bz2
xf86-video-nv-commit-745a1d2.diff
xf86-video-r128-6.8.0.tar.bz2
xf86-video-vmware-10.16.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.e28671/_old 2008-06-23 01:50:40.000000000 +0200
+++ /var/tmp/diff_new_pack.e28671/_new 2008-06-23 01:50:40.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: 139
+Release: 141
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -26,13 +26,12 @@
Source0: xf86-video-apm-1.2.0.tar.bz2
Source1: xf86-video-ark-0.7.0.tar.bz2
Source2: xf86-video-ast-0.85.0.tar.bz2
-Source3: xf86-video-ati-6.6.193.tar.bz2
Source4: xf86-video-chips-1.2.0.tar.bz2
Source5: xf86-video-cirrus-1.2.1.tar.bz2
Source6: xf86-video-cyrix-X11R7.1-1.1.0.tar.bz2
Source7: xf86-video-dummy-0.3.0.tar.bz2
Source8: xf86-video-fbdev-0.4.0.tar.bz2
-Source9: xf86-video-glint-1.2.0.tar.bz2
+Source9: xf86-video-glint-1.1.1.tar.bz2
Source10: xf86-video-i128-1.3.0.tar.bz2
Source11: xf86-video-i740-1.2.0.tar.bz2
Source12: xf86-video-i810-1.7.4.tar.bz2
@@ -57,40 +56,33 @@
Source38: xf86-video-vesa-1.3.0.tar.bz2
Source39: xf86-video-vga-X11R7.1-4.1.0.tar.bz2
Source40: xf86-video-via-0.2.2.tar.bz2
-Source41: xf86-video-vmware-10.16.0.tar.bz2
+Source41: xf86-video-vmware-10.16.2.tar.bz2
Source42: xf86-video-voodoo-1.2.0.tar.bz2
Source43: xf86-video-impact-0.2.0.tar.bz2
Source44: HALlib-4.1.tar.gz
-Source45: xf86-video-intel-2.3.1.tar.bz2
-Source46: xf86-video-ati-6.8.0.tar.bz2
+Source45: xf86-video-intel-2.3.2.tar.bz2
+Source46: xf86-video-ati-6.8.191.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.9.0.tar.bz2
+Source51: xf86-video-geode-2.10.0.tar.bz2
Source52: xf86-video-ati-6.6.3.tar.bz2
Source53: xf86-video-xgixp-7945371.tar.bz2
+Source54: xf86-video-mach64-6.8.0.tar.bz2
+Source55: xf86-video-r128-6.8.0.tar.bz2
Source100: sax2-hwinfo-data.tar.gz
Patch: xf86-video-intel.diff
-Patch1: radeon-xrandr-dotclock.diff
-Patch2: radeon_dell.diff
Patch3: ps_nv.diff
Patch4: xf86-video-nv-gf9-mobile.diff
+Patch5: xf86-video-nv-commit-745a1d2.diff
Patch10: xf86-video-tdfx.diff
Patch12: xf86-video-mga-hal.diff
Patch14: xf86-video-rendition.diff
Patch16: xf86-video-nsc.diff
-Patch18: radeon-vbios-ppc.diff
-Patch27: xf86-video-ati-mergedfb-dpi.diff
Patch28: xf86-video-ati.randr12.diff
Patch30: xf86-video-mga.randr12.diff
Patch31: xf86-video-ati-mergedfb-disable.diff
-Patch33: bug-263199_radeon-autocrt.diff
-Patch34: radeon-Fix-CRT-on-RS400.diff
-Patch37: xf86-video-ati-AGPFastWrite-risk-reduction.diff
-Patch39: xf86-video-ati-bug296856.diff
Patch41: xf86-video-xgi.diff
-Patch42: xf86-video-ati-opma.diff
Patch44: xf86-video-ati.radeonold.diff
-Patch46: xf86-video-ati-disable_rmx_dell_rn50.diff
Patch47: xf86-video-vmware-10.15.2.diff
Patch51: xf86-video-s3virge.diff
Patch52: xf86-video-intel-default2xaa.diff
@@ -99,6 +91,7 @@
Patch101: xf86-video-ati-6.6.3-compile-cfb.patch
Patch102: xf86-video-ati-6.6.3-if0.patch
Patch103: xf86-video-ati-6.7.197-r128-xvideo.patch
+Patch104: xf86-video-glint.diff
%description
This package contains X.Org video drivers.
@@ -112,22 +105,25 @@
%ifnarch %ix86
rm -rf xf86-video-geode*
%endif
-ln -snf ati.man xf86-video-ati-6.8.0/man/atirandr12.man
-ln -snf r128.man xf86-video-ati-6.8.0/man/r128randr12.man
-ln -snf radeon.man xf86-video-ati-6.8.0/man/radeonrandr12.man
ln -snf mga.man xf86-video-mga-1.9.100/man/mgarandr12.man
-pushd xf86-video-ati-6.8.0
-%patch28 -p1
-%ifnarch ppc ppc64
-%patch103 -p1
-%endif
-popd
-#ln -snf ati.man xf86-video-ati-6.6.3/man/atiold.man
-#ln -snf r128.man xf86-video-ati-6.6.3/man/r128old.man
-#ln -snf radeon.man xf86-video-ati-6.6.3/man/radeonold.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
+#%patch28 -p1
+#popd
+#pushd xf86-video-r128-*
+#%ifnarch ppc ppc64
+### not adjusted yet to mach64/r128/radeon driver split
+#%patch103 -p1
+#%endif
+#popd
+ln -snf ati.man xf86-video-ati-6.6.3/man/atiold.man
+ln -snf r128.man xf86-video-ati-6.6.3/man/r128old.man
+ln -snf radeon.man xf86-video-ati-6.6.3/man/radeonold.man
pushd xf86-video-ati-6.6.3
%patch31 -p0
-#%patch44 -p1
+%patch44 -p1
%patch53 -p1
%ifnarch ppc ppc64
%patch100 -p1
@@ -142,30 +138,10 @@
%patch -p0
%patch52 -p0
popd
-pushd xf86-video-ati-6.6.193/src
-%patch1 -p1
-### disabled (obsolete?) (Bug #138458)
-#%patch2 -p0
-%patch18 -p1
-%patch27 -p0
-popd
-pushd xf86-video-ati-6.6.193
-%patch33 -p1
-%patch31 -p0
-%patch34 -p1
-%patch37 -p1
-%patch39 -p1
-%patch42 -p1
-%patch46 -p1
-%ifnarch ppc ppc64
-%patch100 -p1
-%patch101 -p1
-%patch102 -p1
-%endif
-popd
pushd xf86-video-nv-*
%patch3 -p0
%patch4 -p1
+%patch5 -p1
popd
pushd xf86-video-mga-1.4.8/src
tar xzf %{SOURCE44}
@@ -191,6 +167,9 @@
pushd xf86-video-s3virge-*
%patch51
popd
+pushd xf86-video-glint-*
+%patch104 -p0
+popd
%build
for dir in xf86-video-nv-* \
@@ -200,7 +179,6 @@
-e xf86-video-mga-1.9.100 \
-e xf86-video-ati-6.6.3 \
-e xf86-video-ati-6.8 \
- -e xf86-video-ati-6.6.193 \
); do
pushd $dir
case $dir in
@@ -229,7 +207,6 @@
-e xf86-video-mga-1.9.100 \
-e xf86-video-ati-6.6.3 \
-e xf86-video-ati-6.8 \
- -e xf86-video-ati-6.6.193 \
); do
make -C $dir install DESTDIR=$RPM_BUILD_ROOT
done
@@ -286,6 +263,37 @@
/var/lib/hardware/ids/20.%{name}
%changelog
+* Wed Jun 18 2008 sndirsch@suse.de
+- xf86-video-intel 2.3.2
+ * includes misc bug fixes and the last 2.3 branch release
+* Wed Jun 18 2008 sndirsch@suse.de
+- xf86-video-geode 2.10.0
+ * Unmap the PCI memory when we close the screen
+ * Bring over the DCON detection code from the OLPC tree
+ * Fix build for git-master (missing device pointers).
+* Tue Jun 17 2008 sndirsch@suse.de
+- xf86-video-nv-commit-745a1d2.diff
+ * GeForce GTX 280 and 260 chips
+* Fri Jun 13 2008 sndirsch@suse.de
+- xf86-video-vmware 10.16.2
+ * More xorg and xfree86 backwards compatibility
+ * Fix VMWARE_CTRL and Xinerama Initialization
+* Thu Jun 12 2008 sndirsch@suse.de
+- xf86-video-radeon 6.8.191
+ * ati 6.9.0rc1 release. Lots of changes since the last release.
+ Main things are EXA composite support for r3xx/r4xx/r5xx chips
+ and textured video support on all radeons.
+- xf86-video-r128 6.8.0
+- xf86-video-mach64 6.8.0
+* Thu Jun 12 2008 sndirsch@suse.de
+- make the RANDR 1.2 compatible radeon driver (6.8.0) our default
+ "radeon" driver
+- renamed previous default "radeon" driver (6.6.3) to "radeonold"
+* Thu Jun 12 2008 sndirsch@suse.de
+- specfile cleanup
+- removed dead sources/patches
+* Mon Jun 09 2008 sndirsch@suse.de
+- back to xf86-video-glint 1.1.0 to fix Xserver crash (bnc #398350)
* Fri Jun 06 2008 sndirsch@suse.de
- xf86-video-nv-gf9-mobile.diff
* GeForce 9 mobile chips.
++++++ 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-06 12:17:46.000000000 +0200
+++ new/usr/share/sax/api/data/cdb/Cards.20.xorg-x11-driver-video 2008-06-17 04:21:39.000000000 +0200
@@ -1,3 +1,9 @@
+NVidia: GeForce GTX 280 {
+ Driver = nv
+}
+NVidia: GeForce GTX 260 {
+ Driver = nv
+}
NVidia: GeForce 9650M GS {
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-06 12:22:46.000000000 +0200
+++ new/usr/share/sax/sysp/maps/update/Identity.map.20.xorg-x11-driver-video 2008-06-17 04:23:17.000000000 +0200
@@ -1,3 +1,5 @@
+NAME=NVidia&DEVICE=GeForce GTX 280&VID=0x10de&DID=0x05E1&SERVER=nv&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT
+NAME=NVidia&DEVICE=GeForce GTX 260&VID=0x10de&DID=0x05E2&SERVER=nv&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT
NAME=NVidia&DEVICE=GeForce 9650M GS&VID=0x10de&DID=0x0408&SERVER=nv&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT
NAME=NVidia&DEVICE=GeForce 9300M G&VID=0x10de&DID=0x042E&SERVER=nv&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT
NAME=NVidia&DEVICE=GeForce 9600M GT&VID=0x10de&DID=0x0647&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-06 12:27:21.000000000 +0200
+++ new/var/lib/hardware/ids/20.xorg-x11-driver-video 2008-06-17 04:25:11.000000000 +0200
@@ -1,4 +1,14 @@
vendor.id pci 0x10de
+&device.id pci 0x05e1
++device.name GeForce GTX 280
++driver.xfree 4|nv
+
+ vendor.id pci 0x10de
+&device.id pci 0x05e2
++device.name GeForce GTX 260
++driver.xfree 4|nv
+
+ vendor.id pci 0x10de
&device.id pci 0x0408
+device.name GeForce 9650M GS
+driver.xfree 4|nv
++++++ xf86-video-ati-6.6.193.tar.bz2 -> xf86-video-ati-6.8.191.tar.bz2 ++++++
++++ 128476 lines of diff (skipped)
++++++ xf86-video-geode-2.9.0.tar.bz2 -> xf86-video-geode-2.10.0.tar.bz2 ++++++
++++ 3516 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-geode-2.9.0/ChangeLog new/xf86-video-geode-2.10.0/ChangeLog
--- old/xf86-video-geode-2.9.0/ChangeLog 2008-05-07 21:39:34.000000000 +0200
+++ new/xf86-video-geode-2.10.0/ChangeLog 2008-06-14 00:02:45.000000000 +0200
@@ -1,3 +1,53 @@
+commit e98927f2c60acd9262cfb6fca2491fe0decc7aa5
+Author: Jordan Crouse
+Date: Fri Jun 13 15:59:44 2008 -0600
+
+ Bump to version 2.10.0
+
+commit 2fc546c0d129fe7d3edee6b0cbfd530de33e2209
+Author: Jordan Crouse
+Date: Tue Jun 10 12:08:53 2008 -0600
+
+ geode: Bring over the DCON detection code from the OLPC tree
+
+commit 489546dfd2dd295db63f31e123b0073a6fa330a9
+Author: Jordan Crouse
+Date: Tue Jun 10 12:08:52 2008 -0600
+
+ geode: Unmap the PCI memory when we close the screen
+
+commit 739eb15da7bb0d2ca681eeb9a308b1297ee4eca7
+Author: Peter Hutterer
+Date: Wed May 28 11:13:54 2008 +0930
+
+ Fix build for git-master (missing device pointers).
+
+ We don't have an updated Video ABI yet, so use the XINPUT ABI as check for
+ when to use which call.
+
+ Note that the check is not optimal. We only check for the position of the VCP,
+ not of any other device to adjust the viewpoint. This needs to be fixed.
+
+commit 5186a2b736e30b7d68a75f861f51047491182e57
+Author: Peter Hutterer
+Date: Wed May 28 10:54:09 2008 +0930
+
+ Revert "Fix build (missing device pointers)."
+
+ Silly me, this breaks the build for non-git-master servers.
+
+ This reverts commit 3005e9c7eb10e212c956e87b3631548e268c794e.
+
+commit 3005e9c7eb10e212c956e87b3631548e268c794e
+Author: Peter Hutterer
+Date: Wed May 28 09:25:06 2008 +0930
+
+ Fix build (missing device pointers).
+
+ miPointerGetScreen, miPointerGetPosition and pScreen->SetCursorPosition all
+ require a device argument now. For lack of other choices, just pass in the
+ VCP.
+
commit 94b9029e335ddbe7c22a8fe4bf69858b75179219
Author: Martin-Éric Racine
Date: Wed May 7 22:35:23 2008 +0300
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-geode-2.9.0/configure.ac new/xf86-video-geode-2.10.0/configure.ac
--- old/xf86-video-geode-2.9.0/configure.ac 2008-05-07 21:34:49.000000000 +0200
+++ new/xf86-video-geode-2.10.0/configure.ac 2008-06-13 23:49:21.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-geode],
- 2.9.0,
+ 2.10.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver%2Fgeode],
xf86-video-geode)
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-geode-2.9.0/src/geode_dcon.c new/xf86-video-geode-2.10.0/src/geode_dcon.c
--- old/xf86-video-geode-2.9.0/src/geode_dcon.c 2008-05-07 21:29:06.000000000 +0200
+++ new/xf86-video-geode-2.10.0/src/geode_dcon.c 2008-06-10 22:18:54.000000000 +0200
@@ -35,11 +35,56 @@
#include "geode.h"
#include
+#include
+
+#define DCON_SLEEP_FILE "/sys/devices/platform/dcon/sleep"
static Bool
dcon_present(void)
{
- return access("/sys/devices/platform/dcon", F_OK) == 0;
+ static int _dval = -1;
+
+ if (_dval == -1)
+ _dval = (access("/sys/devices/platform/dcon", F_OK) == 0);
+
+ return (Bool) _dval;
+}
+
+int
+DCONDPMSSet(ScrnInfoPtr pScrni, int mode, int flags)
+{
+ static int failed = -1;
+ int fd;
+ char value[1];
+
+ if (failed == -1)
+ failed = !dcon_present();
+
+ if (failed)
+ return 0;
+
+ fd = open(DCON_SLEEP_FILE, O_WRONLY);
+
+ if (fd < 0) {
+ failed = 1;
+ return 0;
+ }
+
+ switch (mode) {
+ case DPMSModeOn:
+ value[0] = '0';
+ break;
+ case DPMSModeStandby:
+ case DPMSModeSuspend:
+ case DPMSModeOff:
+ value[0] = '1';
+ break;
+ }
+
+ write(fd, value, sizeof(value));
+ close(fd);
+
+ return 1;
}
Bool
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-geode-2.9.0/src/geode.h new/xf86-video-geode-2.10.0/src/geode.h
--- old/xf86-video-geode-2.9.0/src/geode.h 2008-05-07 21:29:06.000000000 +0200
+++ new/xf86-video-geode-2.10.0/src/geode.h 2008-06-10 22:18:54.000000000 +0200
@@ -234,6 +234,7 @@
#define OUTPUT_CRT 0x02
#define OUTPUT_TV 0x04
#define OUTPUT_VOP 0x08
+#define OUTPUT_DCON 0x10
typedef struct _geodeRec
{
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-geode-2.9.0/src/gx_randr.c new/xf86-video-geode-2.10.0/src/gx_randr.c
--- old/xf86-video-geode-2.9.0/src/gx_randr.c 2008-05-07 21:29:06.000000000 +0200
+++ new/xf86-video-geode-2.10.0/src/gx_randr.c 2008-06-10 22:18:43.000000000 +0200
@@ -247,7 +247,12 @@
pRandr->virtualY = pScrni->virtualY;
}
+/* FIXME: we don't have a new video ABI yet */
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 3
+ miPointerGetPosition(inputInfo.pointer, &px, &py);
+#else
miPointerPosition(&px, &py);
+#endif
for (mode = pScrni->modes;; mode = mode->next) {
if (pRandr->maxX == 0 || pRandr->maxY == 0) {
@@ -286,13 +291,26 @@
return FALSE;
}
- if (pScreen == miPointerCurrentScreen()) {
+/* FIXME: we don't have a new video ABI yet */
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 3
+ if (pScreen == miPointerGetScreen(inputInfo.pointer))
+#else
+ if (pScreen == miPointerCurrentScreen())
+#endif
+ {
px = (px >= pScreen->width ? (pScreen->width - 1) : px);
py = (py >= pScreen->height ? (pScreen->height - 1) : py);
xf86SetViewport(pScreen, px, py);
- (*pScreen->SetCursorPosition) (pScreen, px, py, FALSE);
+/* FIXME: we don't have a new video ABI yet */
+ (*pScreen->SetCursorPosition) (
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 3
+ inputInfo.pointer,
+#endif
+ pScreen,
+ px, py,
+ FALSE);
}
return TRUE;
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-geode-2.9.0/src/lx_driver.c new/xf86-video-geode-2.10.0/src/lx_driver.c
--- old/xf86-video-geode-2.9.0/src/lx_driver.c 2008-05-07 21:29:06.000000000 +0200
+++ new/xf86-video-geode-2.10.0/src/lx_driver.c 2008-06-10 22:18:54.000000000 +0200
@@ -418,6 +418,13 @@
return NULL;
return ptr;
}
+
+static inline int
+unmap_pci_mem(ScrnInfoPtr pScrni, struct pci_device *dev, void *ptr, int size)
+{
+ return pci_device_unmap_range(dev, ptr, size);
+}
+
#endif
static Bool
@@ -518,7 +525,7 @@
OptionInfoRec *GeodeOptions = &LX_GeodeOptions[0];
rgb defaultWeight = { 0, 0, 0 };
int modecnt;
- char *s, *panelgeo = NULL;
+ char *s;
if (pScrni->numEntities != 1)
return FALSE;
@@ -629,7 +636,7 @@
&pGeode->tryHWCursor);
if (!xf86GetOptValInteger(GeodeOptions, LX_OPTION_FBSIZE,
- (int *) &(pGeode->FBAvail)))
+ (int *)&(pGeode->FBAvail)))
pGeode->FBAvail = 0;
/* For compatability - allow SWCursor too */
@@ -659,7 +666,7 @@
}
xf86GetOptValInteger(GeodeOptions, LX_OPTION_EXA_SCRATCH_BFRSZ,
- (int *) &(pGeode->exaBfrSz));
+ (int *)&(pGeode->exaBfrSz));
if (pGeode->exaBfrSz <= 0)
pGeode->exaBfrSz = 0;
@@ -669,23 +676,23 @@
pGeode->Output &= ~OUTPUT_PANEL;
}
- panelgeo = xf86GetOptValString(GeodeOptions, LX_OPTION_PANEL_GEOMETRY);
-
- /* Get the panel information - if it is specified on the command line,
- * then go with that - otherwise try to determine it by probing the
- * BIOS - the BIOS may tell us that the panel doesn't exist, so the
- * value of the output bitmask may change
+ /* Panel detection code -
+ * 1. See if an OLPC DCON is attached - we can make some assumptions
+ * about the panel if so.
+ * 2. Use override options specified in the config
+ * 3. "Autodetect" the panel through VSA
*/
if (dcon_init(pScrni)) {
- pGeode->Output = OUTPUT_PANEL;
+ pGeode->Output = OUTPUT_PANEL | OUTPUT_DCON;
} else if (pGeode->Output & OUTPUT_PANEL) {
+ char *panelgeo =
+ xf86GetOptValString(GeodeOptions, LX_OPTION_PANEL_GEOMETRY);
+
if (panelgeo != NULL)
GeodeGetFPGeometry(panelgeo, &pGeode->PanelX, &pGeode->PanelY);
else {
- Bool ret = lx_get_panel(&pGeode->PanelX, &pGeode->PanelY);
-
- if (ret == FALSE)
+ if (!lx_get_panel(&pGeode->PanelX, &pGeode->PanelY))
pGeode->Output &= ~OUTPUT_PANEL;
}
}
@@ -697,6 +704,9 @@
xf86DrvMsg(pScrni->scrnIndex, X_INFO, " PANEL: %s\n",
pGeode->Output & OUTPUT_PANEL ? "YES" : "NO");
+ xf86DrvMsg(pScrni->scrnIndex, X_INFO, " DCON: %s\n",
+ pGeode->Output & OUTPUT_DCON ? "YES" : "NO");
+
xf86DrvMsg(pScrni->scrnIndex, X_INFO, " VGA: %s\n",
pGeode->useVGA ? "YES" : "NO");
@@ -848,15 +858,23 @@
LXUnmapMem(ScrnInfoPtr pScrni)
{
GeodeRec *pGeode = GEODEPTR(pScrni);
+ pciVideoPtr pci = xf86GetPciInfoForEntity(pGeode->pEnt->index);
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrni->scrnIndex, (pointer) cim_gp_ptr, LX_GP_REG_SIZE);
xf86UnMapVidMem(pScrni->scrnIndex, (pointer) cim_vg_ptr, LX_VG_REG_SIZE);
xf86UnMapVidMem(pScrni->scrnIndex, (pointer) cim_vid_ptr,
LX_VID_REG_SIZE);
xf86UnMapVidMem(pScrni->scrnIndex, (pointer) cim_vip_ptr,
LX_VIP_REG_SIZE);
+#else
+ unmap_pci_mem(pScrni, pci, cim_gp_ptr, LX_GP_REG_SIZE);
+ unmap_pci_mem(pScrni, pci, cim_vg_ptr, LX_VG_REG_SIZE);
+ unmap_pci_mem(pScrni, pci, cim_vid_ptr, LX_VID_REG_SIZE);
+ unmap_pci_mem(pScrni, pci, cim_vip_ptr, LX_VIP_REG_SIZE);
+ unmap_pci_mem(pScrni, pci, cim_fb_ptr, pGeode->FBAvail + CIM_CMD_BFR_SZ);
+#endif
- xf86UnMapVidMem(pScrni->scrnIndex, cim_fb_ptr, pGeode->FBAvail);
xf86UnMapVidMem(pScrni->scrnIndex, XpressROMPtr, 0x10000);
return TRUE;
@@ -1189,9 +1207,16 @@
static void
LXDPMSSet(ScrnInfoPtr pScrni, int mode, int flags)
{
+ GeodeRec *pGeode = GEODEPTR(pScrni);
+
if (!pScrni->vtSema)
return;
+ if (pGeode->Output & OUTPUT_DCON) {
+ if (DCONDPMSSet(pScrni, mode, flags))
+ return;
+ }
+
switch (mode) {
case DPMSModeOn:
lx_enable_dac_power(pScrni, 1);
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-geode-2.9.0/src/lx_randr.c new/xf86-video-geode-2.10.0/src/lx_randr.c
--- old/xf86-video-geode-2.9.0/src/lx_randr.c 2008-05-07 21:29:06.000000000 +0200
+++ new/xf86-video-geode-2.10.0/src/lx_randr.c 2008-06-10 22:18:43.000000000 +0200
@@ -246,7 +246,12 @@
pRandr->virtualY = pScrni->virtualY;
}
+/* FIXME: we don't have a new video ABI yet */
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 3
+ miPointerGetPosition(inputInfo.pointer, &px, &py);
+#else
miPointerPosition(&px, &py);
+#endif
for (mode = pScrni->modes;; mode = mode->next) {
if (pRandr->maxX == 0 || pRandr->maxY == 0) {
@@ -285,13 +290,26 @@
return FALSE;
}
- if (pScreen == miPointerCurrentScreen()) {
+/* FIXME: we don't have a new video ABI yet */
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 3
+ if (pScreen == miPointerGetScreen(inputInfo.pointer))
+#else
+ if (pScreen == miPointerCurrentScreen())
+#endif
+ {
px = (px >= pScreen->width ? (pScreen->width - 1) : px);
py = (py >= pScreen->height ? (pScreen->height - 1) : py);
xf86SetViewport(pScreen, px, py);
- (*pScreen->SetCursorPosition) (pScreen, px, py, FALSE);
+ (*pScreen->SetCursorPosition) (
+/* FIXME: we don't have a new video ABI yet */
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 3
+ inputInfo.pointer,
+#endif
+ pScreen,
+ px, py,
+ FALSE);
}
return TRUE;
++++++ xf86-video-glint-1.2.0.tar.bz2 -> xf86-video-glint-1.1.1.tar.bz2 ++++++
++++ 22401 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-glint-1.2.0/config.h.in new/xf86-video-glint-1.1.1/config.h.in
--- old/xf86-video-glint-1.2.0/config.h.in 2008-03-19 18:57:11.000000000 +0100
+++ new/xf86-video-glint-1.1.1/config.h.in 2006-04-08 03:23:13.000000000 +0200
@@ -50,15 +50,6 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-/* Major version of this package */
-#undef PACKAGE_VERSION_MAJOR
-
-/* Minor version of this package */
-#undef PACKAGE_VERSION_MINOR
-
-/* Patch version of this package */
-#undef PACKAGE_VERSION_PATCHLEVEL
-
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
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-glint-1.2.0/configure.ac new/xf86-video-glint-1.1.1/configure.ac
--- old/xf86-video-glint-1.2.0/configure.ac 2008-03-19 18:56:59.000000000 +0100
+++ new/xf86-video-glint-1.1.1/configure.ac 2006-04-08 03:21:45.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-glint],
- 1.2.0,
+ 1.1.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-glint)
@@ -64,12 +64,6 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
-SAVE_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
-AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
- [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
- [#include "xorg-server.h"])
-CPPFLAGS="$SAVE_CPPFLAGS"
# Checks for header files.
AC_HEADER_STDC
@@ -102,13 +96,6 @@
AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
fi
-if test "x$XSERVER_LIBPCIACCESS" = xyes; then
- PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
- XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
-fi
-AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
-
-
AC_SUBST([DRI_CFLAGS])
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
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-glint-1.2.0/DRI.txt new/xf86-video-glint-1.1.1/DRI.txt
--- old/xf86-video-glint-1.2.0/DRI.txt 2008-03-19 15:29:36.000000000 +0100
+++ new/xf86-video-glint-1.1.1/DRI.txt 2004-04-23 21:33:32.000000000 +0200
@@ -9,7 +9,7 @@
of this document provided the copyright notice and this permission
notice are preserved on all copies.
-$XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/DRI.txt,v 1.2 2000/02/23 04:47:06 martin Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/DRI.txt,v 1.1 1999/06/14 07:31:50 dawes Exp $
GLINT State Transition Strategy
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-glint-1.2.0/man/Makefile.am new/xf86-video-glint-1.1.1/man/Makefile.am
--- old/xf86-video-glint-1.2.0/man/Makefile.am 2008-03-19 15:29:36.000000000 +0100
+++ new/xf86-video-glint-1.1.1/man/Makefile.am 2005-12-06 23:48:34.000000000 +0100
@@ -1,3 +1,4 @@
+# $Id: Makefile.am,v 1.5 2005/11/28 22:04:09 alanc Exp $
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
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-glint-1.2.0/missing new/xf86-video-glint-1.1.1/missing
--- old/xf86-video-glint-1.2.0/missing 2008-03-19 18:57:12.000000000 +0100
+++ new/xf86-video-glint-1.1.1/missing 2006-04-07 17:51:29.000000000 +0200
@@ -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-glint-1.2.0/README.pm3 new/xf86-video-glint-1.1.1/README.pm3
--- old/xf86-video-glint-1.2.0/README.pm3 2008-03-19 15:29:36.000000000 +0100
+++ new/xf86-video-glint-1.1.1/README.pm3 2004-04-23 21:33:32.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/README.pm3,v 1.13 2002/05/07 23:15:58 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/README.pm3,v 1.12 2001/08/18 11:37:30 alanh Exp $ */
STATUS as of Tue, 8 May 2001 19:01:39 +0200
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-glint-1.2.0/src/glint_common.h new/xf86-video-glint-1.1.1/src/glint_common.h
--- old/xf86-video-glint-1.2.0/src/glint_common.h 2008-03-19 15:29:36.000000000 +0100
+++ new/xf86-video-glint-1.1.1/src/glint_common.h 2004-04-23 21:33:32.000000000 +0200
@@ -25,7 +25,7 @@
* Converted to common header format:
* Jens Owen
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_common.h,v 1.2 2003/04/03 16:52:18 dawes Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_common.h,v 1.1 2002/10/30 12:52:15 alanh Exp $
*
*/
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-glint-1.2.0/src/glint_dri.c new/xf86-video-glint-1.1.1/src/glint_dri.c
--- old/xf86-video-glint-1.2.0/src/glint_dri.c 2008-03-19 15:29:36.000000000 +0100
+++ new/xf86-video-glint-1.1.1/src/glint_dri.c 2006-04-04 14:06:57.000000000 +0200
@@ -489,18 +489,16 @@
if (xf86LoaderCheckSymbol("DRICreatePCIBusID")) {
pDRIInfo->busIdString = DRICreatePCIBusID(pGlint->PciInfo);
} else {
-#ifndef XSERVER_LIBPCIACCESS
pDRIInfo->busIdString = xalloc(64); /* Freed in DRIDestroyInfoRec */
sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d",
((pciConfigPtr)pGlint->PciInfo->thisCard)->busnum,
((pciConfigPtr)pGlint->PciInfo->thisCard)->devnum,
((pciConfigPtr)pGlint->PciInfo->thisCard)->funcnum);
-#endif
}
pDRIInfo->ddxDriverMajorVersion = GLINT_MAJOR_VERSION;
pDRIInfo->ddxDriverMinorVersion = GLINT_MINOR_VERSION;
pDRIInfo->ddxDriverPatchVersion = GLINT_PATCHLEVEL;
- pDRIInfo->frameBufferPhysicalAddress = (pointer) pGlint->FbAddress;
+ pDRIInfo->frameBufferPhysicalAddress = pGlint->FbAddress;
pDRIInfo->frameBufferSize = pGlint->FbMapSize;
pDRIInfo->frameBufferStride =
pScrn->displayWidth * (pScrn->bitsPerPixel >> 3);
@@ -777,9 +775,12 @@
if (pGlint->irq <= 0) {
pGlint->irq = drmGetInterruptFromBusID(pGlint->drmSubFD,
- PCI_CFG_BUS(pGlint->PciInfo),
- PCI_CFG_DEV(pGlint->PciInfo),
- PCI_CFG_FUNC(pGlint->PciInfo));
+ ((pciConfigPtr)pGlint->PciInfo
+ ->thisCard)->busnum,
+ ((pciConfigPtr)pGlint->PciInfo
+ ->thisCard)->devnum,
+ ((pciConfigPtr)pGlint->PciInfo
+ ->thisCard)->funcnum);
}
return TRUE;
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-glint-1.2.0/src/glint_dri.h new/xf86-video-glint-1.1.1/src/glint_dri.h
--- old/xf86-video-glint-1.2.0/src/glint_dri.h 2008-03-19 15:29:36.000000000 +0100
+++ new/xf86-video-glint-1.1.1/src/glint_dri.h 2004-04-23 21:33:32.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.h,v 1.7 2002/10/30 12:52:16 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.h,v 1.6 2002/02/22 21:45:16 dawes Exp $ */
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
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-glint-1.2.0/src/glint_driver.c new/xf86-video-glint-1.1.1/src/glint_driver.c
--- old/xf86-video-glint-1.2.0/src/glint_driver.c 2008-03-19 15:29:36.000000000 +0100
+++ new/xf86-video-glint-1.1.1/src/glint_driver.c 2006-04-07 21:06:52.000000000 +0200
@@ -344,7 +344,7 @@
#ifdef XFree86LOADER
-#ifdef XF86DRI_DEVEL
+#ifdef XF86DRI
static const char *drmSymbols[] = {
"drmAddBufs",
"drmAddMap",
@@ -414,7 +414,7 @@
xaaSymbols, xf8_32bppSymbols,
shadowSymbols, fbdevHWSymbols, GLINTint10Symbols,
vbeSymbols, ramdacSymbols,
-#ifdef XF86DRI_DEVEL
+#ifdef XF86DRI
drmSymbols, driSymbols,
#endif
NULL);
@@ -651,12 +651,10 @@
&devSections)) <= 0) {
return FALSE;
}
-
-#ifndef XSERVER_LIBPCIACCESS
+
checkusedPci = xf86GetPciVideoInfo();
- if (checkusedPci == NULL && devSections /* for xf86DoProbe */)
- {
+ if (checkusedPci == NULL && devSections /* for xf86DoProbe */) {
/*
* Changed the behaviour to try probing using the FBDev support
* when no PCI cards have been found. This is for systems without
@@ -723,9 +721,8 @@
xfree(devSections);
- } else if (checkusedPci)
-#endif
-{
+ } else if (checkusedPci) {
+
if (flags & PROBE_DETECT) {
/* HACK, Currently when -configuring, we only return VGA
* based chips. Manual configuring is necessary to poke
@@ -748,8 +745,8 @@
if (!(flags & PROBE_DETECT))
for (i = 0; i < numUsed; i++) {
ScrnInfoPtr pScrn = NULL;
- GLINTEntPtr pGlintEnt = NULL;
- DevUnion *pPriv;
+ GLINTEntPtr pGlintEnt = NULL;
+ DevUnion *pPriv;
pPci = xf86GetPciInfoForEntity(usedChips[i]);
/* Allocate a ScrnInfoRec and claim the slot */
@@ -759,16 +756,14 @@
/* Claim specifics, when we KNOW ! the board */
-#ifndef XSERVER_LIBPCIACCESS
+
/* Appian Jeronimo J2000 */
- if ((PCI_SUB_VENDOR_ID(pPci) == 0x1097) &&
- (PCI_SUB_DEVICE_ID(pPci) == 0x3d32)) {
+ if ((pPci->subsysVendor == 0x1097) &&
+ (pPci->subsysCard == 0x3d32)) {
int eIndex;
- int init_func;
-
if (!xf86IsEntityShared(usedChips[i])) {
eIndex = xf86ClaimPciSlot(pPci->bus,
- pPci->device,
+ pPci->device,
1,
drv, -1 /* XXX */,
NULL, FALSE);
@@ -783,15 +778,15 @@
}
} else
/* Only claim other chips when GAMMA is used */
- if ((PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GAMMA) ||
- (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GAMMA2) ||
- (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_DELTA)) {
+ if ((pPci->chipType == PCI_CHIP_GAMMA) ||
+ (pPci->chipType == PCI_CHIP_GAMMA2) ||
+ (pPci->chipType == PCI_CHIP_DELTA)) {
while (*checkusedPci != NULL) {
int eIndex;
/* make sure we claim all but our source device */
- if ((pPci->bus == PCI_DEV_BUS(*checkusedPci) &&
- pPci->device == PCI_DEV_DEV((*checkusedPci)) &&
- pPci->func != PCI_DEV_FUNC(*checkusedPci))) {
+ if ((pPci->bus == (*checkusedPci)->bus &&
+ pPci->device == (*checkusedPci)->device) &&
+ pPci->func != (*checkusedPci)->func) {
/* Claim other entities on the same card */
eIndex = xf86ClaimPciSlot((*checkusedPci)->bus,
@@ -804,9 +799,9 @@
xf86AddEntityToScreen(pScrn,eIndex);
} else {
ErrorF("BusID %d:%d:%d already claimed\n",
- PCI_DEV_BUS(*checkusedPci),
- PCI_DEV_DEV(*checkusedPci),
- PCI_DEV_FUNC(*checkusedPci));
+ (*checkusedPci)->bus,
+ (*checkusedPci)->device,
+ (*checkusedPci)->func);
xfree(usedChips);
return FALSE;
}
@@ -814,7 +809,6 @@
checkusedPci++;
}
}
-#endif
/* Fill in what we can of the ScrnInfoRec */
pScrn->driverVersion = GLINT_VERSION;
@@ -831,8 +825,8 @@
/* Allow sharing if Appian J2000 detected */
/* (later Diamond FireGL3000 support too) */
- if ((PCI_SUB_VENDOR_ID(pPci) == 0x1097) &&
- (PCI_SUB_DEVICE_ID(pPci) == 0x3d32)) {
+ if ((pPci->subsysVendor == 0x1097) &&
+ (pPci->subsysCard == 0x3d32)) {
xf86SetEntitySharable(usedChips[i]);
/* Allocate an entity private if necessary */
if (GLINTEntityIndex < 0)
@@ -1037,10 +1031,8 @@
if (pGlint->pEnt->location.type == BUS_PCI)
{
pGlint->PciInfo = xf86GetPciInfoForEntity(pGlint->pEnt->index);
-#ifndef XSERVER_LIBPCIACCESS
pGlint->PciTag = pciTag(pGlint->PciInfo->bus, pGlint->PciInfo->device,
pGlint->PciInfo->func);
-#endif
}
pGlint->InFifoSpace = 0; /* Force a Read of FIFO space on first run */
@@ -1054,14 +1046,14 @@
for (i = 1; i < pScrn->numEntities; i++) {
pEnt = xf86GetEntityInfo(pScrn->entityList[i]);
pPci = xf86GetPciInfoForEntity(pEnt->index);
- if ( (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_MX) ||
- (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_PERMEDIA) ||
- (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_TI_PERMEDIA) ||
- (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_500TX) ||
- (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_300SX) ||
- (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_R4) ||
- (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_PERMEDIA3) ) {
- pGlint->MultiChip = PCI_DEV_DEVICE_ID(pPci);
+ if ( (pPci->chipType == PCI_CHIP_MX) ||
+ (pPci->chipType == PCI_CHIP_PERMEDIA) ||
+ (pPci->chipType == PCI_CHIP_TI_PERMEDIA) ||
+ (pPci->chipType == PCI_CHIP_500TX) ||
+ (pPci->chipType == PCI_CHIP_300SX) ||
+ (pPci->chipType == PCI_CHIP_R4) ||
+ (pPci->chipType == PCI_CHIP_PERMEDIA3) ) {
+ pGlint->MultiChip = pPci->chipType;
if (pGlint->numMultiDevices >= GLINT_MAX_MULTI_DEVICES) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"%d multiple chips unsupported, aborting. (Max - 2)\n",
@@ -1079,9 +1071,9 @@
EntityInfoPtr pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
pciVideoPtr pPci = xf86GetPciInfoForEntity(pEnt->index);
- if ( ((PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GAMMA) ||
- (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GAMMA2) ||
- (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_DELTA)) &&
+ if ( ((pPci->chipType == PCI_CHIP_GAMMA) ||
+ (pPci->chipType == PCI_CHIP_GAMMA2) ||
+ (pPci->chipType == PCI_CHIP_DELTA)) &&
(pGlint->numMultiDevices == 0) ) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Gamma/Delta with ZERO connected chips, aborting\n");
@@ -1093,9 +1085,9 @@
EntityInfoPtr pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
pciVideoPtr pPci = xf86GetPciInfoForEntity(pEnt->index);
- if ((PCI_DEV_DEVICE_ID(pPci) != PCI_CHIP_GAMMA) &&
- (PCI_DEV_DEVICE_ID(pPci) != PCI_CHIP_GAMMA2) &&
- (PCI_DEV_DEVICE_ID(pPci) != PCI_CHIP_DELTA)) {
+ if ((pPci->chipType != PCI_CHIP_GAMMA) &&
+ (pPci->chipType != PCI_CHIP_GAMMA2) &&
+ (pPci->chipType != PCI_CHIP_DELTA)) {
GLINTProbeDDC(pScrn, pGlint->pEnt->index);
return TRUE;
} else
@@ -1322,8 +1314,8 @@
pGlint->Chipset);
} else {
from = X_PROBED;
- pGlint->Chipset = PCI_DEV_VENDOR_ID(pGlint->PciInfo) << 16 |
- PCI_DEV_DEVICE_ID(pGlint->PciInfo);
+ pGlint->Chipset = pGlint->PciInfo->vendor << 16 |
+ pGlint->PciInfo->chipType;
pScrn->chipset = (char *)xf86TokenToString(GLINTChipsets,
pGlint->Chipset);
}
@@ -1332,7 +1324,7 @@
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
pGlint->ChipRev);
} else {
- pGlint->ChipRev = PCI_DEV_REVISION(pGlint->PciInfo);
+ pGlint->ChipRev = pGlint->PciInfo->chipRev;
}
}
@@ -1378,7 +1370,7 @@
pGlint->FbAddress = pGlint->pEnt->device->MemBase;
from = X_CONFIG;
} else {
- pGlint->FbAddress = PCI_REGION_BASE(pGlint->PciInfo, 2, REGION_MEM) & 0xFF800000;
+ pGlint->FbAddress = pGlint->PciInfo->memBase[2] & 0xFF800000;
}
if (pGlint->FbAddress)
@@ -1388,11 +1380,11 @@
/* Trap GAMMA & DELTA specification, with no linear address */
/* Find the first GLINT chip and use that address */
if (pGlint->FbAddress == 0) {
- if (PCI_REGION_BASE(pGlint->MultiPciInfo[0], 2, REGION_MEM)) {
- pGlint->FbAddress = PCI_REGION_BASE(pGlint->MultiPciInfo[0], 2, REGION_MEM);
+ if (pGlint->MultiPciInfo[0]->memBase[2]) {
+ pGlint->FbAddress = pGlint->MultiPciInfo[0]->memBase[2];
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
"FrameBuffer used from first rasterizer chip at 0x%lx\n",
- PCI_REGION_BASE(pGlint->MultiPciInfo[0], 2, REGION_MEM));
+ pGlint->MultiPciInfo[0]->memBase[2]);
} else {
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
"No FrameBuffer memory - aborting\n");
@@ -1408,7 +1400,7 @@
pGlint->IOAddress = pGlint->pEnt->device->IOBase;
from = X_CONFIG;
} else {
- pGlint->IOAddress = PCI_REGION_BASE(pGlint->MultiPciInfo[0], 0, REGION_MEM) & 0xFFFFC000;
+ pGlint->IOAddress = pGlint->PciInfo->memBase[0] & 0xFFFFC000;
}
if ((IS_J2000) && (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA)) {
@@ -1492,9 +1484,12 @@
/* Delta has a bug, we need to fix it here */
{
int basecopro =
- PCI_REGION_BASE(pGlint->MultiPciInfo[0], 0, REGION_MEM) & 0xFFFFC000;
- int basedelta = PCI_REGION_BASE(pGlint->PciInfo, 0, REGION_MEM) & 0xFFFFC000;
- int dummy;
+ pGlint->MultiPciInfo[0]->memBase[0] & 0xFFFFC000;
+ int basedelta = pGlint->PciInfo->memBase[0] & 0xFFFFC000;
+ int glintdelta = pGlint->PciTag;
+ int glintcopro = pciTag(pGlint->MultiPciInfo[0]->bus,
+ pGlint->MultiPciInfo[0]->device,
+ pGlint->MultiPciInfo[0]->func);
int base3copro, offset;
if( (basedelta & 0x20000) ^ (basecopro & 0x20000) ) {
@@ -1504,7 +1499,7 @@
} else {
offset = 0x1c; /* base3 */
}
- PCI_READ_LONG(pGlint->MultiPciInfo[0], &base3copro, offset);
+ base3copro = pciReadLong(glintcopro, offset);
if( (basecopro & 0x20000) ^ (base3copro & 0x20000) ) {
/*
* oops, still different; we know that base3
@@ -1520,27 +1515,25 @@
* read value
* write new value
*/
- PCI_READ_LONG(pGlint->PciInfo, &dummy, 0x10);
- PCI_WRITE_LONG(pGlint->PciInfo, 0xffffffff, 0x10);
- PCI_READ_LONG(pGlint->PciInfo, &dummy, 0x10);
- PCI_WRITE_LONG(pGlint->PciInfo, base3copro, 0x10);
+ (void) pciReadLong(glintdelta, 0x10);
+ pciWriteLong(glintdelta, 0x10, 0xffffffff);
+ (void) pciReadLong(glintdelta, 0x10);
+ pciWriteLong(glintdelta, 0x10, base3copro);
/*
* additionally,sometimes we see the baserom which might
* confuse the chip, so let's make sure that is disabled
*/
- PCI_READ_LONG(pGlint->MultiPciInfo[0], &dummy, 0x30);
- PCI_WRITE_LONG(pGlint->MultiPciInfo[0], 0xffffffff, 0x30);
- PCI_READ_LONG(pGlint->MultiPciInfo[0], &dummy, 0x30);
- PCI_WRITE_LONG(pGlint->MultiPciInfo[0], 0, 0x30);
+ (void) pciReadLong(glintcopro, 0x30);
+ pciWriteLong(glintcopro, 0x30, 0xffffffff);
+ (void) pciReadLong(glintcopro, 0x30);
+ pciWriteLong(glintcopro, 0x30, 0);
/*
* now update our internal structure accordingly
*/
- pGlint->IOAddress = base3copro;
-#ifndef XSERVER_LIBPCIACCESS
+ pGlint->IOAddress =
pGlint->PciInfo->memBase[0] = base3copro;
-#endif
xf86DrvMsg(pScrn->scrnIndex, from,
"Delta Bug - Changing MMIO registers to 0x%lX\n",
(unsigned long)pGlint->IOAddress);
@@ -2465,47 +2458,17 @@
* Map IO registers to virtual address space
* We always map VGA IO registers - even if we don't need them
*/
-#ifndef XSERVER_LIBPCIACCESS
pGlint->IOBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO_32BIT,
pGlint->PciTag, pGlint->IOAddress, 0x20000);
-#else
- {
- void** result = (void**)&pGlint->IOBase;
- int err = pci_device_map_range(pGlint->PciInfo,
- pGlint->IOAddress,
- 0x20000,
- PCI_DEV_MAP_FLAG_WRITABLE,
- result);
-
- if (err)
- return FALSE;
- }
-#endif
if (pGlint->IOBase == NULL)
return FALSE;
if (pGlint->FbMapSize != 0) {
-#ifndef XSERVER_LIBPCIACCESS
pGlint->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
pGlint->PciTag,
pGlint->FbAddress,
pGlint->FbMapSize);
-#else
- {
- void** result = (void**)&pGlint->FbBase;
- int err = pci_device_map_range(pGlint->PciInfo,
- pGlint->FbAddress,
- pGlint->FbMapSize,
- PCI_DEV_MAP_FLAG_WRITABLE |
- PCI_DEV_MAP_FLAG_WRITE_COMBINE,
- result);
-
- if (err)
- return FALSE;
- }
-
-#endif
if (pGlint->FbBase == NULL)
return FALSE;
}
@@ -2540,20 +2503,11 @@
/*
* Unmap IO registers to virtual address space
*/
-#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pGlint->IOBase, 0x20000);
-#else
- pci_device_unmap_range(pGlint->PciInfo, pGlint->IOBase, 0x20000);
-#endif
pGlint->IOBase = NULL;
- if (pGlint->FbBase != NULL) {
-#ifndef XSERVER_LIBPCIACCESS
+ if (pGlint->FbBase != NULL)
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pGlint->FbBase, pGlint->FbMapSize);
-#else
- pci_device_unmap_range(pGlint->PciInfo, pGlint->FbBase, pGlint->FbMapSize);
-#endif
- }
pGlint->FbBase = NULL;
TRACE_EXIT("GLINTUnmapMem");
@@ -2970,7 +2924,7 @@
return FALSE;
}
-#ifdef XF86DRI_DEVEL
+#ifdef XF86DRI
/*
* Setup DRI after visuals have been established, but before fbScreenInit
* is called. fbScreenInit will eventually call into the drivers
@@ -3199,7 +3153,7 @@
xf86DPMSInit(pScreen, (DPMSSetProcPtr)GLINTDisplayPowerManagementSet, 0);
-#ifdef XF86DRI_DEVEL
+#ifdef XF86DRI
if (pGlint->directRenderingEnabled) {
/* Now that mi, cfb, drm and others have done their thing,
* complete the DRI setup.
@@ -3508,7 +3462,7 @@
GLINTPtr pGlint = GLINTPTR(pScrn);
TRACE_ENTER("GLINTCloseScreen");
-#ifdef XF86DRI_DEVEL
+#ifdef XF86DRI
if (pGlint->directRenderingEnabled) {
GLINTDRICloseScreen(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-glint-1.2.0/src/glint.h new/xf86-video-glint-1.1.1/src/glint.h
--- old/xf86-video-glint-1.2.0/src/glint.h 2008-03-19 15:29:36.000000000 +0100
+++ new/xf86-video-glint-1.1.1/src/glint.h 2006-04-08 03:22:04.000000000 +0200
@@ -30,19 +30,13 @@
#ifndef _GLINT_H_
#define _GLINT_H_
-#include
-#include
-#include
-
-#include "glintpcirename.h"
-
#include "xaa.h"
#include "xf86RamDac.h"
#include "xf86cmap.h"
#include "xf86i2c.h"
#include "xf86DDC.h"
#include "xf86xv.h"
-#ifdef XF86DRI_DEVEL
+#ifdef XF86DRI
#include "xf86drm.h"
#include "sarea.h"
#define _XF86DRI_SERVER_
@@ -50,15 +44,18 @@
#include "GL/glxint.h"
#include "glint_dripriv.h"
#endif
+#include
+#include
+#include
#define GLINT_MAX_MULTI_DEVICES 2
#define GLINT_VERSION 4000
#define GLINT_NAME "GLINT"
#define GLINT_DRIVER_NAME "glint"
-#define GLINT_MAJOR_VERSION PACKAGE_VERSION_MAJOR
-#define GLINT_MINOR_VERSION PACKAGE_VERSION_MINOR
-#define GLINT_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
+#define GLINT_MAJOR_VERSION 1
+#define GLINT_MINOR_VERSION 1
+#define GLINT_PATCHLEVEL 1
typedef struct {
CARD32 glintRegs[0x2000];
@@ -80,9 +77,7 @@
int numMultiDevices;
int MultiChip;
Bool MultiAperture;
-#ifndef XSERVER_LIBPCIACCESS
PCITAG PciTag;
-#endif
EntityInfoPtr pEnt;
GLINTEntPtr entityPrivate;
RamDacHelperRecPtr RamDac;
@@ -174,7 +169,7 @@
void (*VideoTimerCallback)(ScrnInfoPtr, Time);
XF86VideoAdaptorPtr adaptor;
int videoKey;
-#ifdef XF86DRI_DEVEL
+#ifdef XF86DRI
Bool directRenderingEnabled;
Bool PCIMode;
DRIInfoPtr pDRIInfo;
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-glint-1.2.0/src/glintpcirename.h new/xf86-video-glint-1.1.1/src/glintpcirename.h
--- old/xf86-video-glint-1.2.0/src/glintpcirename.h 2008-03-19 15:29:36.000000000 +0100
+++ new/xf86-video-glint-1.1.1/src/glintpcirename.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,122 +0,0 @@
-/*
- * Copyright 2007 George Sapountzis
- *
- * 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS 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.
- */
-
-/**
- * Macros for porting drivers from legacy xfree86 PCI code to the pciaccess
- * library. The main purpose being to facilitate source code compatibility.
- */
-
-#ifndef SISPCIRENAME_H
-#define SISPCIRENAME_H
-
-enum region_type {
- REGION_MEM,
- REGION_IO
-};
-
-#ifndef XSERVER_LIBPCIACCESS
-
-/* pciVideoPtr */
-#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor)
-#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->chipType)
-#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->chipRev)
-
-#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subsysVendor)
-#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subsysCard)
-
-#define PCI_DEV_TAG(_pcidev) pciTag((_pcidev)->bus, \
- (_pcidev)->device, \
- (_pcidev)->func)
-#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
-#define PCI_DEV_DEV(_pcidev) ((_pcidev)->device)
-#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
-
-/* pciConfigPtr */
-#define PCI_CFG_TAG(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->tag)
-#define PCI_CFG_BUS(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->busnum)
-#define PCI_CFG_DEV(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->devnum)
-#define PCI_CFG_FUNC(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->funcnum)
-
-/* region addr: xfree86 uses different fields for memory regions and I/O ports */
-#define PCI_REGION_BASE(_pcidev, _b, _type) \
- (((_type) == REGION_MEM) ? (_pcidev)->memBase[(_b)] \
- : (_pcidev)->ioBase[(_b)])
-
-/* region size: xfree86 uses the log2 of the region size,
- * but with zero meaning no region, not size of one XXX */
-#define PCI_REGION_SIZE(_pcidev, _b) \
- (((_pcidev)->size[(_b)] > 0) ? (1 << (_pcidev)->size[(_b)]) : 0)
-
-/* read/write PCI configuration space */
-#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
- *(_value_ptr) = pciReadByte(PCI_CFG_TAG(_pcidev), (_offset))
-
-#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
- *(_value_ptr) = pciReadLong(PCI_CFG_TAG(_pcidev), (_offset))
-
-#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
- pciWriteLong(PCI_CFG_TAG(_pcidev), (_offset), (_value))
-
-#else /* XSERVER_LIBPCIACCESS */
-
-typedef struct pci_device *pciVideoPtr;
-
-#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor_id)
-#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->device_id)
-#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->revision)
-
-#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subvendor_id)
-#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subdevice_id)
-
-/* pci-rework functions take a 'pci_device' parameter instead of a tag */
-#define PCI_DEV_TAG(_pcidev) (_pcidev)
-
-/* PCI_DEV macros, typically used in printf's, add domain ? XXX */
-#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
-#define PCI_DEV_DEV(_pcidev) ((_pcidev)->dev)
-#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
-
-/* pci-rework functions take a 'pci_device' parameter instead of a tag */
-#define PCI_CFG_TAG(_pcidev) (_pcidev)
-
-/* PCI_CFG macros, typically used in DRI init, contain the domain */
-#define PCI_CFG_BUS(_pcidev) (((_pcidev)->domain << 8) | \
- (_pcidev)->bus)
-#define PCI_CFG_DEV(_pcidev) ((_pcidev)->dev)
-#define PCI_CFG_FUNC(_pcidev) ((_pcidev)->func)
-
-#define PCI_REGION_BASE(_pcidev, _b, _type) ((_pcidev)->regions[(_b)].base_addr)
-#define PCI_REGION_SIZE(_pcidev, _b) ((_pcidev)->regions[(_b)].size)
-
-#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
- pci_device_cfg_read_u8((_pcidev), (_value_ptr), (_offset))
-
-#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
- pci_device_cfg_read_u32((_pcidev), (_value_ptr), (_offset))
-
-#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
- pci_device_cfg_write_u32((_pcidev), (_value), (_offset))
-
-#endif /* XSERVER_LIBPCIACCESS */
-
-#endif /* SISPCIRENAME_H */
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-glint-1.2.0/src/glint_regs.h new/xf86-video-glint-1.1.1/src/glint_regs.h
--- old/xf86-video-glint-1.2.0/src/glint_regs.h 2008-03-19 15:29:36.000000000 +0100
+++ new/xf86-video-glint-1.1.1/src/glint_regs.h 2004-04-23 21:33:32.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_regs.h,v 1.36 2003/01/12 03:55:47 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_regs.h,v 1.36tsi Exp $ */
/*
* glint register file
@@ -34,46 +34,46 @@
#define PCI_CHIP_3DLABS_GAMMA2 0x0E
/* The boards we know */
-#define IS_GLORIAXXL ((PCI_SUB_VENDOR_ID(pGlint->PciInfo) == 0x1048) && \
- (PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x0a42))
+#define IS_GLORIAXXL ((pGlint->PciInfo->subsysVendor == 0x1048) && \
+ (pGlint->PciInfo->subsysCard == 0x0a42))
-#define IS_GLORIASYNERGY ((PCI_SUB_VENDOR_ID(pGlint->PciInfo) == 0x1048) && \
- (PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x0a32))
+#define IS_GLORIASYNERGY ((pGlint->PciInfo->subsysVendor == 0x1048) && \
+ (pGlint->PciInfo->subsysCard == 0x0a32))
-#define IS_GMX2000 ((PCI_SUB_VENDOR_ID(pGlint->PciInfo) == 0x3d3d) && \
- (PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x0106))
+#define IS_GMX2000 ((pGlint->PciInfo->subsysVendor == 0x3d3d) && \
+ (pGlint->PciInfo->subsysCard == 0x0106))
-#define IS_J2000 ((PCI_SUB_VENDOR_ID(pGlint->PciInfo) == 0x1097) && \
- (PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x3d32))
+#define IS_J2000 ((pGlint->PciInfo->subsysVendor == 0x1097) && \
+ (pGlint->PciInfo->subsysCard == 0x3d32))
-#define IS_JPRO ((PCI_SUB_VENDOR_ID(pGlint->PciInfo) == 0x1097) && \
- (PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x3db3))
+#define IS_JPRO ((pGlint->PciInfo->subsysVendor == 0x1097) && \
+ (pGlint->PciInfo->subsysCard == 0x3db3))
/* COMPAQ OEM VX1 PCI
* subsys == 0x0121 if VGA is enabled
* subsys == 0x000a if VGA has never been enabled
*/
-#define IS_PCI_QVX1 (PCI_SUB_VENDOR_ID(pGlint->PciInfo) == 0x3d3d && \
- ((PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x0121) || \
- (PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x000a)))
+#define IS_PCI_QVX1 (pGlint->PciInfo->subsysVendor == 0x3d3d && \
+ ((pGlint->PciInfo->subsysCard == 0x0121) || \
+ (pGlint->PciInfo->subsysCard == 0x000a)))
/* COMPAQ OEM VX1 AGP
* subsys == 0x0144 if VGA is enabled
* subsys == 0x000c if VGA has never been enabled
*/
-#define IS_AGP_QVX1 (PCI_SUB_VENDOR_ID(pGlint->PciInfo) == 0x3d3d && \
- ((PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x0144) || \
- (PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x000c)))
+#define IS_AGP_QVX1 (pGlint->PciInfo->subsysVendor == 0x3d3d && \
+ ((pGlint->PciInfo->subsysCard == 0x0144) || \
+ (pGlint->PciInfo->subsysCard == 0x000c)))
#define IS_QVX1 (IS_PCI_QVX1 || IS_AGP_QVX1)
-#define IS_ELSA_SYNERGY ((PCI_SUB_VENDOR_ID(pGlint->PciInfo) == 0x1048) && \
- (PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x0a32))
+#define IS_ELSA_SYNERGY ((pGlint->PciInfo->subsysVendor == 0x1048) && \
+ (pGlint->PciInfo->subsysCard == 0x0a32))
/* COMPAQ OEM Permedia 2V with VGA disable jumper - 0x13e9 ? */
-#define IS_QPM2V ((PCI_SUB_VENDOR_ID(pGlint->PciInfo) == 0x13e9) && \
- ((PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x0100) || \
- (PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x0002)))
+#define IS_QPM2V ((pGlint->PciInfo->subsysVendor == 0x13e9) && \
+ ((pGlint->PciInfo->subsysCard == 0x0100) || \
+ (pGlint->PciInfo->subsysCard == 0x0002)))
/**********************************************
* GLINT 500TX Configuration Region Registers *
@@ -1248,8 +1248,7 @@
#define GLINTDACDelay(x) do { \
int delay = x; \
- unsigned char tmp; \
- while(delay--){tmp = GLINT_READ_REG(InFIFOSpace);}; \
+ while(delay--){(void)GLINT_READ_REG(InFIFOSpace);}; \
} while(0)
#define GLINT_MASK_WRITE_REG(v,m,r) \
@@ -1282,7 +1281,7 @@
} \
}
-#ifndef XF86DRI_DEVEL
+#ifndef XF86DRI
#define LOADROP(rop) \
{ \
if (pGlint->ROP != rop) { \
@@ -1307,7 +1306,7 @@
} \
}
-#ifndef XF86DRI_DEVEL
+#ifndef XF86DRI
#define DO_PLANEMASK(planemask) \
{ \
if (planemask != pGlint->planemask) { \
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-glint-1.2.0/src/Makefile.am new/xf86-video-glint-1.1.1/src/Makefile.am
--- old/xf86-video-glint-1.2.0/src/Makefile.am 2008-03-19 18:59:45.000000000 +0100
+++ new/xf86-video-glint-1.1.1/src/Makefile.am 2005-09-27 22:53:19.000000000 +0200
@@ -33,7 +33,6 @@
glint_dga.c \
glint_driver.c \
glint.h \
- glintpcirename.h \
glint_regs.h \
glint_shadow.c \
IBMramdac.c \
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-glint-1.2.0/src/pm2_video.c new/xf86-video-glint-1.1.1/src/pm2_video.c
--- old/xf86-video-glint-1.2.0/src/pm2_video.c 2008-03-19 15:29:36.000000000 +0100
+++ new/xf86-video-glint-1.1.1/src/pm2_video.c 2006-04-08 01:29:32.000000000 +0200
@@ -41,8 +41,6 @@
#include
#include
#include
-#include
-#include
#undef MIN
#undef ABS
@@ -2769,9 +2767,9 @@
xvipc.pAPriv = pAPriv; /* Server head ID */
xvipc.op = OP_CONNECT;
- xvipc.a = PCI_DEV_BUS(pGlint->PciInfo);
- xvipc.b = PCI_DEV_DEV(pGlint->PciInfo);
- xvipc.c = PCI_DEV_FUNC(pGlint->PciInfo);
+ xvipc.a = pGlint->PciInfo->bus;
+ xvipc.b = pGlint->PciInfo->device;
+ xvipc.c = pGlint->PciInfo->func;
xvipc.d = pScrn->videoRam << 10; /* XF86Config overrides probing */
@@ -3006,10 +3004,8 @@
break;
}
- if (VideoIO) {
- unsigned int temp;
- PCI_READ_LONG(pGlint->PciInfo, &temp, PCI_SUBSYSTEM_ID_REG);
- switch (temp) {
+ if (VideoIO)
+ switch (pciReadLong(pGlint->PciTag, PCI_SUBSYSTEM_ID_REG)) {
case PCI_SUBSYSTEM_ID_WINNER_2000_P2A:
case PCI_SUBSYSTEM_ID_WINNER_2000_P2C:
case PCI_SUBSYSTEM_ID_GLORIA_SYNERGY_P2A:
@@ -3020,7 +3016,7 @@
xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED, 1, "No Xv vio support for this board\n");
VideoIO = FALSE;
}
- }
+
if (pGlint->NoAccel && !VideoIO)
return;
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-glint-1.2.0/src/pm3_accel.c new/xf86-video-glint-1.1.1/src/pm3_accel.c
--- old/xf86-video-glint-1.2.0/src/pm3_accel.c 2008-03-19 15:29:36.000000000 +0100
+++ new/xf86-video-glint-1.1.1/src/pm3_accel.c 2006-04-07 21:07:59.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XdotOrg: driver/xf86-video-glint/src/pm3_accel.c,v 1.5 2005/07/11 02:29:49 ajax Exp $ */
+/* $XdotOrg: driver/xf86-video-glint/src/pm3_accel.c,v 1.6 2006/04/07 19:07:59 ajax Exp $ */
/*
* Copyright 2000-2001 by Sven Luther .
*
@@ -67,7 +67,7 @@
#define PM3_OTHERWRITEMASK \
(pGlint->PM3_UsingSGRAM ? PM3FBSoftwareWriteMask : PM3FBHardwareWriteMask )
-#ifndef XF86DRI_DEVEL
+#ifndef XF86DRI
#define PM3_PLANEMASK(planemask) \
{ \
if (planemask != pGlint->planemask) { \
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-glint-1.2.0/src/pm3_dac.c new/xf86-video-glint-1.1.1/src/pm3_dac.c
--- old/xf86-video-glint-1.2.0/src/pm3_dac.c 2008-03-19 15:29:36.000000000 +0100
+++ new/xf86-video-glint-1.1.1/src/pm3_dac.c 2006-04-04 14:06:57.000000000 +0200
@@ -65,24 +65,10 @@
* regardless of memory configuration */
pGlint->FbMapSize = 64*1024*1024;
-#ifndef XSERVER_LIBPCIACCESS
/* Mark as VIDMEM_MMIO to avoid write-combining while detecting memory */
pGlint->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO,
pGlint->PciTag, pGlint->FbAddress, pGlint->FbMapSize);
-#else
- {
- void** result = (void**)&pGlint->FbBase;
- int err = pci_device_map_range(pGlint->PciInfo,
- pGlint->FbAddress,
- pGlint->FbMapSize,
- PCI_DEV_MAP_FLAG_WRITABLE,
- result);
-
- if (err)
- return FALSE;
- }
-#endif
if (pGlint->FbBase == NULL)
return 0;
@@ -133,12 +119,8 @@
GLINT_SLOW_WRITE_REG(temp, PM3MemBypassWriteMask);
-#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pGlint->FbBase,
pGlint->FbMapSize);
-#else
- pci_device_unmap_range(pGlint->PciInfo, pGlint->FbBase, pGlint->FbMapSize);
-#endif
pGlint->FbBase = NULL;
pGlint->FbMapSize = 0;
@@ -484,8 +466,10 @@
if (pGlint->MultiAperture) {
STOREREG(GMultGLINTAperture, pGlint->realWidth);
- STOREREG(GMultGLINT1, PCI_REGION_BASE(pGlint->MultiPciInfo[0], 2, REGION_MEM) & 0xFF800000);
- STOREREG(GMultGLINT2, PCI_REGION_BASE(pGlint->MultiPciInfo[1], 2, REGION_MEM) & 0xFF800000);
+ STOREREG(GMultGLINT1,
+ pGlint->MultiPciInfo[0]->memBase[2] & 0xFF800000);
+ STOREREG(GMultGLINT2,
+ pGlint->MultiPciInfo[1]->memBase[2] & 0xFF800000);
}
STOREREG(PM3MemBypassWriteMask, 0xffffffff);
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-glint-1.2.0/src/pm3_regs.h new/xf86-video-glint-1.1.1/src/pm3_regs.h
--- old/xf86-video-glint-1.2.0/src/pm3_regs.h 2008-03-19 15:29:36.000000000 +0100
+++ new/xf86-video-glint-1.1.1/src/pm3_regs.h 2004-04-23 21:33:33.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_regs.h,v 1.10 2003/01/12 03:55:47 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_regs.h,v 1.9tsi Exp $ */
/*
* glint register file
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-glint-1.2.0/src/tx_accel.c new/xf86-video-glint-1.1.1/src/tx_accel.c
--- old/xf86-video-glint-1.2.0/src/tx_accel.c 2008-03-19 15:29:36.000000000 +0100
+++ new/xf86-video-glint-1.1.1/src/tx_accel.c 2006-04-04 14:06:57.000000000 +0200
@@ -296,7 +296,7 @@
){
GLINTPtr pGlint = GLINTPTR(pScrn);
-#ifndef XF86DRI_DEVEL
+#ifndef XF86DRI
if (w != pGlint->startxsub) {
GLINT_WRITE_REG(w<<16, StartXSub);
pGlint->startxsub = w;
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-glint-1.2.0/src/tx_dac.c new/xf86-video-glint-1.1.1/src/tx_dac.c
--- old/xf86-video-glint-1.2.0/src/tx_dac.c 2008-03-19 15:29:36.000000000 +0100
+++ new/xf86-video-glint-1.1.1/src/tx_dac.c 2006-04-04 14:06:57.000000000 +0200
@@ -69,8 +69,10 @@
* as incorrect scanline interleaving when software rendering.
*/
STOREREG(GMultGLINTAperture, pGlint->realWidth);
- STOREREG(GMultGLINT1, PCI_REGION_BASE(pGlint->MultiPciInfo[0], 2, REGION_MEM) & 0xFF800000);
- STOREREG(GMultGLINT2, PCI_REGION_BASE(pGlint->MultiPciInfo[1], 2, REGION_MEM) & 0xFF800000);
+ STOREREG(GMultGLINT1,
+ pGlint->MultiPciInfo[0]->memBase[2] & 0xFF800000);
+ STOREREG(GMultGLINT2,
+ pGlint->MultiPciInfo[1]->memBase[2] & 0xFF800000);
}
if (IS_GMX2000 || IS_GLORIAXXL) {
++++++ xf86-video-glint.diff ++++++
--- src/glint_dri.c.orig 2008-06-09 17:17:53.572411548 +0200
+++ src/glint_dri.c 2008-06-09 17:18:11.614386022 +0200
@@ -498,7 +498,7 @@ GLINTDRIScreenInit(ScreenPtr pScreen)
pDRIInfo->ddxDriverMajorVersion = GLINT_MAJOR_VERSION;
pDRIInfo->ddxDriverMinorVersion = GLINT_MINOR_VERSION;
pDRIInfo->ddxDriverPatchVersion = GLINT_PATCHLEVEL;
- pDRIInfo->frameBufferPhysicalAddress = pGlint->FbAddress;
+ pDRIInfo->frameBufferPhysicalAddress = (pointer) pGlint->FbAddress;
pDRIInfo->frameBufferSize = pGlint->FbMapSize;
pDRIInfo->frameBufferStride =
pScrn->displayWidth * (pScrn->bitsPerPixel >> 3);
++++++ xf86-video-intel-2.3.1.tar.bz2 -> xf86-video-intel-2.3.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.3.1/configure new/xf86-video-intel-2.3.2/configure
--- old/xf86-video-intel-2.3.1/configure 2008-05-12 03:01:58.000000000 +0200
+++ new/xf86-video-intel-2.3.2/configure 2008-06-18 04:26:05.000000000 +0200
@@ -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.3.1.
+# Generated by GNU Autoconf 2.61 for xf86-video-intel 2.3.2.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='xf86-video-intel'
PACKAGE_TARNAME='xf86-video-intel'
-PACKAGE_VERSION='2.3.1'
-PACKAGE_STRING='xf86-video-intel 2.3.1'
+PACKAGE_VERSION='2.3.2'
+PACKAGE_STRING='xf86-video-intel 2.3.2'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1459,7 +1459,7 @@
# 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.3.1 to adapt to many kinds of systems.
+\`configure' configures xf86-video-intel 2.3.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1529,7 +1529,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-intel 2.3.1:";;
+ short | recursive ) echo "Configuration of xf86-video-intel 2.3.2:";;
esac
cat <<\_ACEOF
@@ -1659,7 +1659,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-intel configure 2.3.1
+xf86-video-intel configure 2.3.2
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1673,7 +1673,7 @@
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.3.1, which was
+It was created by xf86-video-intel $as_me 2.3.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2368,7 +2368,7 @@
# Define the identity of the package.
PACKAGE='xf86-video-intel'
- VERSION='2.3.1'
+ VERSION='2.3.2'
cat >>confdefs.h <<_ACEOF
@@ -22409,12 +22409,12 @@
pkg_cv_DRI_CFLAGS="$DRI_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm xf86driproto\"") >&5
- ($PKG_CONFIG --exists --print-errors "libdrm xf86driproto") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm xf86driproto glproto\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libdrm xf86driproto glproto") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_DRI_CFLAGS=`$PKG_CONFIG --cflags "libdrm xf86driproto" 2>/dev/null`
+ pkg_cv_DRI_CFLAGS=`$PKG_CONFIG --cflags "libdrm xf86driproto glproto" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -22427,12 +22427,12 @@
pkg_cv_DRI_LIBS="$DRI_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm xf86driproto\"") >&5
- ($PKG_CONFIG --exists --print-errors "libdrm xf86driproto") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm xf86driproto glproto\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libdrm xf86driproto glproto") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_DRI_LIBS=`$PKG_CONFIG --libs "libdrm xf86driproto" 2>/dev/null`
+ pkg_cv_DRI_LIBS=`$PKG_CONFIG --libs "libdrm xf86driproto glproto" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -22451,14 +22451,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- DRI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdrm xf86driproto"`
+ DRI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdrm xf86driproto glproto"`
else
- DRI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdrm xf86driproto"`
+ DRI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdrm xf86driproto glproto"`
fi
# Put the nasty error message in config.log where it belongs
echo "$DRI_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: Package requirements (libdrm xf86driproto) were not met:
+ { { echo "$as_me:$LINENO: error: Package requirements (libdrm xf86driproto glproto) were not met:
$DRI_PKG_ERRORS
@@ -22469,7 +22469,7 @@
and DRI_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
-echo "$as_me: error: Package requirements (libdrm xf86driproto) were not met:
+echo "$as_me: error: Package requirements (libdrm xf86driproto glproto) were not met:
$DRI_PKG_ERRORS
@@ -23599,7 +23599,7 @@
# 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.3.1, which was
+This file was extended by xf86-video-intel $as_me 2.3.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23652,7 +23652,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-video-intel config.status 2.3.1
+xf86-video-intel config.status 2.3.2
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.3.1/configure.ac new/xf86-video-intel-2.3.2/configure.ac
--- old/xf86-video-intel-2.3.1/configure.ac 2008-05-12 03:01:15.000000000 +0200
+++ new/xf86-video-intel-2.3.2/configure.ac 2008-06-18 04:25:52.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-intel],
- 2.3.1,
+ 2.3.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-intel)
@@ -197,7 +197,7 @@
AM_CONDITIONAL(DRI, test x$DRI = xyes)
if test "$DRI" = yes; then
- PKG_CHECK_MODULES(DRI, [libdrm xf86driproto])
+ 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])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.3.1/src/bios_reader/bios_dumper.c new/xf86-video-intel-2.3.2/src/bios_reader/bios_dumper.c
--- old/xf86-video-intel-2.3.1/src/bios_reader/bios_dumper.c 2008-03-26 02:15:45.000000000 +0100
+++ new/xf86-video-intel-2.3.2/src/bios_reader/bios_dumper.c 2008-06-13 03:46:03.000000000 +0200
@@ -36,6 +36,10 @@
#include
#include
+#ifndef DEFFILEMODE
+#define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH) /* 0666*/
+#endif
+
static void usage(void)
{
fprintf(stderr, "usage: bios_dumper <filename>\n");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.3.1/src/i810_reg.h new/xf86-video-intel-2.3.2/src/i810_reg.h
--- old/xf86-video-intel-2.3.1/src/i810_reg.h 2008-05-07 05:11:34.000000000 +0200
+++ new/xf86-video-intel-2.3.2/src/i810_reg.h 2008-06-17 03:49:16.000000000 +0200
@@ -460,6 +460,8 @@
* - new bits for i810
* - new register hwstam (mask)
*/
+#define PWRCTXA 0x2088 /* 965GM+ only */
+#define PWRCTX_EN (1<<0)
#define HWSTAM 0x2098 /* p290 */
#define IER 0x20a0 /* p291 */
#define IIR 0x20a4 /* p292 */
@@ -497,7 +499,6 @@
*/
#define FWATER_BLC 0x20d8
#define FWATER_BLC2 0x20dc
-#define FWATER_BLC_SELF 0x20e0
#define MM_BURST_LENGTH 0x00700000
#define MM_FIFO_WATERMARK 0x0001F000
#define LM_BURST_LENGTH 0x00000700
@@ -1121,6 +1122,7 @@
#define RENCLK_GATE_D2 0x6208
#define RAMCLK_GATE_D 0x6210 /* CRL only */
+#define DEUC 0x6214 /* CRL only */
/*
* This is a PCI config space register to manipulate backlight brightness
@@ -1220,6 +1222,10 @@
#define SDVO_CLOCK_OUTPUT_INVERT (1 << 18)
#define SDVOC_GANG_MODE (1 << 16)
#define SDVO_BORDER_ENABLE (1 << 7)
+/** new with 965, default is to be set */
+#define SDVO_VSYNC_ACTIVE_HIGH (1 << 4)
+#define SDVO_HSYNC_ACTIVE_HIGH (1 << 3)
+/** 915/945 only, read-only bit */
#define SDVOB_PCIE_CONCURRENCY (1 << 3)
#define SDVO_DETECTED (1 << 2)
/* Bits to be preserved when writing */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.3.1/src/i830_accel.c new/xf86-video-intel-2.3.2/src/i830_accel.c
--- old/xf86-video-intel-2.3.1/src/i830_accel.c 2008-04-21 02:43:28.000000000 +0200
+++ new/xf86-video-intel-2.3.2/src/i830_accel.c 2008-06-13 03:46:03.000000000 +0200
@@ -201,7 +201,7 @@
ADVANCE_BATCH();
}
- I830WaitLpRing(pScrn, pI830->LpRing->mem->size - 8, 0);
+ i830_wait_ring_idle(pScrn);
pI830->LpRing->space = pI830->LpRing->mem->size - 8;
pI830->nextColorExpandBuf = 0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.3.1/src/i830_debug.c new/xf86-video-intel-2.3.2/src/i830_debug.c
--- old/xf86-video-intel-2.3.1/src/i830_debug.c 2008-05-12 03:00:12.000000000 +0200
+++ new/xf86-video-intel-2.3.2/src/i830_debug.c 2008-06-17 03:49:16.000000000 +0200
@@ -546,10 +546,6 @@
DEFINEREG(FBC_FENCE_OFF),
DEFINEREG(FBC_MOD_NUM),
- DEFINEREG(FWATER_BLC),
- DEFINEREG(FWATER_BLC2),
- DEFINEREG(FWATER_BLC_SELF),
-
DEFINEREG2(FPA0, i830_debug_fp),
DEFINEREG2(FPA1, i830_debug_fp),
DEFINEREG2(DPLL_A, i830_debug_dpll),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.3.1/src/i830_display.c new/xf86-video-intel-2.3.2/src/i830_display.c
--- old/xf86-video-intel-2.3.1/src/i830_display.c 2008-05-12 03:00:12.000000000 +0200
+++ new/xf86-video-intel-2.3.2/src/i830_display.c 2008-06-17 03:49:16.000000000 +0200
@@ -241,13 +241,15 @@
}
static void
-i830PrintPll(char *prefix, intel_clock_t *clock)
+i830PrintPll(ScrnInfoPtr pScrn, char *prefix, intel_clock_t *clock)
{
- ErrorF("%s: dotclock %d vco %d ((m %d, m1 %d, m2 %d), n %d, (p %d, p1 %d, p2 %d))\n",
- prefix, clock->dot, clock->vco,
- clock->m, clock->m1, clock->m2,
- clock->n,
- clock->p, clock->p1, clock->p2);
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "%s: dotclock %d vco %d ((m %d, m1 %d, m2 %d), n %d, "
+ "(p %d, p1 %d, p2 %d))\n",
+ prefix, clock->dot, clock->vco,
+ clock->m, clock->m1, clock->m2,
+ clock->n,
+ clock->p, clock->p1, clock->p2);
}
/**
@@ -1262,7 +1264,7 @@
"Adjusted mode for pipe %c:\n", pipe == 0 ? 'A' : 'B');
xf86PrintModeline(pScrn->scrnIndex, adjusted_mode);
}
- i830PrintPll("chosen", &clock);
+ i830PrintPll(pScrn, "chosen", &clock);
}
if (dpll & DPLL_VCO_ENABLE)
@@ -1755,7 +1757,7 @@
* configuration being accurate, which it isn't necessarily.
*/
if (0)
- i830PrintPll("probed", &clock);
+ i830PrintPll(pScrn, "probed", &clock);
return clock.dot;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.3.1/src/i830_driver.c new/xf86-video-intel-2.3.2/src/i830_driver.c
--- old/xf86-video-intel-2.3.1/src/i830_driver.c 2008-05-12 03:00:12.000000000 +0200
+++ new/xf86-video-intel-2.3.2/src/i830_driver.c 2008-06-17 03:49:17.000000000 +0200
@@ -692,11 +692,6 @@
(void **) &pI830->FbBase);
if (err)
return FALSE;
- /* KLUDGE ALERT -- rewrite the PTEs to turn off the CD and WT bits */
-#if HAVE_MPROTECT
- mprotect (pI830->FbBase, pI830->FbMapSize, PROT_NONE);
- mprotect (pI830->FbBase, pI830->FbMapSize, PROT_READ|PROT_WRITE);
-#endif
#else
pI830->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
pI830->PciTag,
@@ -934,6 +929,53 @@
}
}
+static void
+i830_init_clock_gating(ScrnInfoPtr pScrn)
+{
+ I830Ptr pI830 = I830PTR(pScrn);
+
+ /* Disable clock gating reported to work incorrectly according to the specs.
+ */
+ if (IS_IGD_GM(pI830)) {
+ OUTREG(RENCLK_GATE_D1, 0);
+ OUTREG(RENCLK_GATE_D2, 0);
+ OUTREG(RAMCLK_GATE_D, 0);
+ OUTREG(DSPCLK_GATE_D, VRHUNIT_CLOCK_GATE_DISABLE |
+ OVRUNIT_CLOCK_GATE_DISABLE |
+ OVCUNIT_CLOCK_GATE_DISABLE);
+ } else if (IS_I965GM(pI830)) {
+ OUTREG(RENCLK_GATE_D1, I965_RCC_CLOCK_GATE_DISABLE);
+ OUTREG(RENCLK_GATE_D2, 0);
+ OUTREG(DSPCLK_GATE_D, 0);
+ OUTREG(RAMCLK_GATE_D, 0);
+ OUTREG16(DEUC, 0);
+ } else if (IS_I965G(pI830)) {
+ OUTREG(RENCLK_GATE_D1, I965_RCZ_CLOCK_GATE_DISABLE |
+ I965_RCC_CLOCK_GATE_DISABLE |
+ I965_RCPB_CLOCK_GATE_DISABLE |
+ I965_ISC_CLOCK_GATE_DISABLE |
+ I965_FBC_CLOCK_GATE_DISABLE);
+ OUTREG(RENCLK_GATE_D2, 0);
+ } else if (IS_I855(pI830) || IS_I865G(pI830)) {
+ OUTREG(RENCLK_GATE_D1, SV_CLOCK_GATE_DISABLE);
+ } else if (IS_I830(pI830)) {
+ OUTREG(DSPCLK_GATE_D, OVRUNIT_CLOCK_GATE_DISABLE);
+ }
+}
+
+static void
+i830_init_bios_control(ScrnInfoPtr pScrn)
+{
+ I830Ptr pI830 = I830PTR(pScrn);
+
+ /* Set "extended desktop" */
+ OUTREG(SWF0, INREG(SWF0) | (1 << 21));
+
+ /* Set "driver loaded", "OS unknown", "APM 1.2" */
+ OUTREG(SWF4, (INREG(SWF4) & ~((3 << 19) | (7 << 16))) |
+ (1 << 23) | (2 << 16));
+}
+
static int
I830LVDSPresent(ScrnInfoPtr pScrn)
{
@@ -992,10 +1034,6 @@
if (pI830->entityPrivate)
pI830->entityPrivate->pScrn_2 = NULL;
}
- if (pI830->swfSaved) {
- OUTREG(SWF0, pI830->saveSWF0);
- OUTREG(SWF4, pI830->saveSWF4);
- }
if (pI830->MMIOBase)
I830UnmapMMIO(pScrn);
I830FreeRec(pScrn);
@@ -1461,19 +1499,6 @@
i830TakeRegSnapshot(pScrn);
-#if 1
- pI830->saveSWF0 = INREG(SWF0);
- pI830->saveSWF4 = INREG(SWF4);
- pI830->swfSaved = TRUE;
-
- /* Set "extended desktop" */
- OUTREG(SWF0, pI830->saveSWF0 | (1 << 21));
-
- /* Set "driver loaded", "OS unknown", "APM 1.2" */
- OUTREG(SWF4, (pI830->saveSWF4 & ~((3 << 19) | (7 << 16))) |
- (1 << 23) | (2 << 16));
-#endif
-
if (DEVICE_ID(pI830->PciInfo) == PCI_CHIP_E7221_G)
num_pipe = 1;
else
@@ -1708,12 +1733,6 @@
pI830->noAccel = TRUE;
}
- /* Don't need MMIO access anymore. */
- if (pI830->swfSaved) {
- OUTREG(SWF0, pI830->saveSWF0);
- OUTREG(SWF4, pI830->saveSWF4);
- }
-
/* Set display resolution */
xf86SetDpi(pScrn, 0, 0);
@@ -1820,7 +1839,6 @@
if (temp & RING_VALID) {
i830_refresh_ring(pScrn);
I830Sync(pScrn);
- DO_RING_IDLE();
}
OUTREG(LP_RING + RING_LEN, 0);
@@ -1901,19 +1919,6 @@
DPRINTF(PFX, "SetHWOperatingState\n");
- /* Disable clock gating reported to work incorrectly according to the specs.
- */
- if (IS_I965GM(pI830)) {
- OUTREG(RENCLK_GATE_D1, I965_RCC_CLOCK_GATE_DISABLE);
- } else if (IS_I965G(pI830)) {
- OUTREG(RENCLK_GATE_D1,
- I965_RCC_CLOCK_GATE_DISABLE | I965_ISC_CLOCK_GATE_DISABLE);
- } else if (IS_I855(pI830) || IS_I865G(pI830)) {
- OUTREG(RENCLK_GATE_D1, SV_CLOCK_GATE_DISABLE);
- } else if (IS_I830(pI830)) {
- OUTREG(DSPCLK_GATE_D, OVRUNIT_CLOCK_GATE_DISABLE);
- }
-
i830_start_ring(pScrn);
if (!pI830->SWCursor)
I830InitHWCursor(pScrn);
@@ -2056,6 +2061,17 @@
pI830->saveSWF[15] = INREG(SWF31);
pI830->saveSWF[16] = INREG(SWF32);
+ pI830->saveDSPCLK_GATE_D = INREG(DSPCLK_GATE_D);
+ pI830->saveRENCLK_GATE_D1 = INREG(RENCLK_GATE_D1);
+
+ if (IS_I965G(pI830)) {
+ pI830->saveRENCLK_GATE_D2 = INREG(RENCLK_GATE_D2);
+ pI830->saveRAMCLK_GATE_D = INREG(RAMCLK_GATE_D);
+ }
+
+ if (IS_I965GM(pI830) || IS_IGD_GM(pI830))
+ pI830->savePWRCTXA = INREG(PWRCTXA);
+
if (IS_MOBILE(pI830) && !IS_I830(pI830))
pI830->saveLVDS = INREG(LVDS);
pI830->savePFIT_CONTROL = INREG(PFIT_CONTROL);
@@ -2113,6 +2129,17 @@
if (!IS_I830(pI830) && !IS_845G(pI830))
OUTREG(PFIT_CONTROL, pI830->savePFIT_CONTROL);
+ OUTREG(DSPCLK_GATE_D, pI830->saveDSPCLK_GATE_D);
+ OUTREG(RENCLK_GATE_D1, pI830->saveRENCLK_GATE_D1);
+
+ if (IS_I965G(pI830)) {
+ OUTREG(RENCLK_GATE_D2, pI830->saveRENCLK_GATE_D2);
+ OUTREG(RAMCLK_GATE_D, pI830->saveRAMCLK_GATE_D);
+ }
+
+ if (IS_I965GM(pI830) || IS_IGD_GM(pI830))
+ OUTREG(PWRCTXA, pI830->savePWRCTXA);
+
/*
* Pipe regs
* To restore the saved state, we first need to program the PLL regs,
@@ -2500,6 +2527,10 @@
if (!i830_allocate_2d_memory(pScrn))
goto failed;
+ if (IS_I965GM(pI830) || IS_IGD_GM(pI830))
+ if (!i830_allocate_pwrctx(pScrn))
+ goto failed;
+
if (dri && !i830_allocate_3d_memory(pScrn))
goto failed;
@@ -3098,20 +3129,6 @@
if (serverGeneration == 1)
xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
- if (IS_I965G(pI830)) {
- /* turn off clock gating */
-#if 0
- OUTREG(0x6204, 0x70804000);
- OUTREG(0x6208, 0x00000001);
-#else
- OUTREG(0x6204, 0x70000000);
-#endif
- /* Enable DAP stateless accesses.
- * Required for all i965 steppings.
- */
- OUTREG(SVG_WORK_CTL, 0x00000010);
- }
-
pI830->starting = FALSE;
pI830->closing = FALSE;
pI830->suspended = FALSE;
@@ -3285,6 +3302,14 @@
i830_stop_ring(pScrn, FALSE);
SetHWOperatingState(pScrn);
+ /* Tell the BIOS that we're in control of mode setting now. */
+ i830_init_bios_control(pScrn);
+
+ i830_init_clock_gating(pScrn);
+
+ if (pI830->power_context)
+ OUTREG(PWRCTXA, pI830->power_context->offset | PWRCTX_EN);
+
/* Clear the framebuffer */
memset(pI830->FbBase + pScrn->fbOffset, 0,
pScrn->virtualY * pScrn->displayWidth * pI830->cpp);
@@ -3298,9 +3323,6 @@
}
i830DescribeOutputConfiguration(pScrn);
- i830_stop_ring(pScrn, TRUE);
- SetHWOperatingState(pScrn);
-
#ifdef XF86DRI
if (pI830->directRenderingEnabled) {
/* HW status is fixed, we need to set it up before any drm
@@ -3333,10 +3355,9 @@
int i;
I830DRIResume(screenInfo.screens[scrnIndex]);
-
+
i830_refresh_ring(pScrn);
I830Sync(pScrn);
- DO_RING_IDLE();
sarea->texAge++;
for(i = 0; i < I830_NR_TEX_REGIONS+1 ; i++)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.3.1/src/i830.h new/xf86-video-intel-2.3.2/src/i830.h
--- old/xf86-video-intel-2.3.1/src/i830.h 2008-05-12 03:00:12.000000000 +0200
+++ new/xf86-video-intel-2.3.2/src/i830.h 2008-06-17 03:49:16.000000000 +0200
@@ -426,6 +426,8 @@
i830_memory *logical_context;
+ i830_memory *power_context;
+
#ifdef XF86DRI
i830_memory *back_buffer;
i830_memory *third_buffer;
@@ -552,10 +554,6 @@
Bool StolenOnly;
- Bool swfSaved;
- uint32_t saveSWF0;
- uint32_t saveSWF4;
-
Bool checkDevices;
/* Driver phase/state information */
@@ -647,6 +645,11 @@
uint32_t saveFBC_CONTROL2;
uint32_t saveFBC_CONTROL;
uint32_t saveFBC_FENCE_OFF;
+ uint32_t saveRENCLK_GATE_D1;
+ uint32_t saveRENCLK_GATE_D2;
+ uint32_t saveDSPCLK_GATE_D;
+ uint32_t saveRAMCLK_GATE_D;
+ uint32_t savePWRCTXA;
enum last_3d *last_3d;
@@ -658,6 +661,8 @@
#define I830PTR(p) ((I830Ptr)((p)->driverPrivate))
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
+
#define I830_SELECT_FRONT 0
#define I830_SELECT_BACK 1
#define I830_SELECT_DEPTH 2
@@ -768,6 +773,7 @@
extern long I830CheckAvailableMemory(ScrnInfoPtr pScrn);
Bool i830_allocate_2d_memory(ScrnInfoPtr pScrn);
Bool i830_allocate_texture_memory(ScrnInfoPtr pScrn);
+Bool i830_allocate_pwrctx(ScrnInfoPtr pScrn);
Bool i830_allocate_3d_memory(ScrnInfoPtr pScrn);
#ifdef INTEL_XVMC
Bool i830_allocate_xvmc_buffer(ScrnInfoPtr pScrn, const char *name,
@@ -848,6 +854,14 @@
void i830_enter_render(ScrnInfoPtr);
+static inline void
+i830_wait_ring_idle(ScrnInfoPtr pScrn)
+{
+ I830Ptr pI830 = I830PTR(pScrn);
+
+ I830WaitLpRing(pScrn, pI830->LpRing->mem->size - 8, 0);
+}
+
static inline int i830_fb_compression_supported(I830Ptr pI830)
{
if (!IS_MOBILE(pI830))
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.3.1/src/i830_lvds.c new/xf86-video-intel-2.3.2/src/i830_lvds.c
--- old/xf86-video-intel-2.3.1/src/i830_lvds.c 2008-05-09 05:12:01.000000000 +0200
+++ new/xf86-video-intel-2.3.2/src/i830_lvds.c 2008-06-17 03:49:32.000000000 +0200
@@ -63,6 +63,9 @@
/* The panel needs dithering enabled */
Bool panel_wants_dither;
+ /* The panel is in DPMS off */
+ Bool dpmsoff;
+
/* restore backlight to this value */
int backlight_duty_cycle;
@@ -334,6 +337,7 @@
return 0;
}
+ memset(val, 0, sizeof(val));
if (read(fd, val, BACKLIGHT_VALUE_LEN) == -1)
goto out_err;
@@ -388,6 +392,10 @@
uint32_t pp_status;
if (on) {
+ /* if we're going from on->on, be aware to current level. */
+ if ((INREG(PP_CONTROL) & POWER_TARGET_ON) && !dev_priv->dpmsoff)
+ dev_priv->backlight_duty_cycle = dev_priv->get_backlight(output);
+
/*
* If we're going from off->on we may need to turn on the backlight.
* We should use the saved value whenever possible, but on some
@@ -405,12 +413,13 @@
} while ((pp_status & PP_ON) == 0);
dev_priv->set_backlight(output, dev_priv->backlight_duty_cycle);
+ dev_priv->dpmsoff = FALSE;
} else {
/*
* Only save the current backlight value if we're going from
* on to off.
*/
- if (INREG(PP_CONTROL) & POWER_TARGET_ON)
+ if ((INREG(PP_CONTROL) & POWER_TARGET_ON) && !dev_priv->dpmsoff)
dev_priv->backlight_duty_cycle = dev_priv->get_backlight(output);
dev_priv->set_backlight(output, 0);
@@ -418,6 +427,8 @@
do {
pp_status = INREG(PP_STATUS);
} while (pp_status & PP_ON);
+
+ dev_priv->dpmsoff = TRUE;
}
}
@@ -447,7 +458,8 @@
pI830->savePP_CONTROL = INREG(PP_CONTROL);
pI830->savePP_CYCLE = INREG(PP_CYCLE);
pI830->saveBLC_PWM_CTL = INREG(BLC_PWM_CTL);
- dev_priv->backlight_duty_cycle = dev_priv->get_backlight(output);
+ if ((INREG(PP_CONTROL) & POWER_TARGET_ON) && !dev_priv->dpmsoff)
+ dev_priv->backlight_duty_cycle = dev_priv->get_backlight(output);
}
static void
@@ -671,7 +683,7 @@
/* Letterbox will have top/bottom borders */
top_border = (dev_priv->panel_fixed_mode->VDisplay -
- mode->VDisplay) / 2;
+ scaled_height) / 2;
bottom_border = top_border;
if (mode->VDisplay & 1)
bottom_border++;
@@ -1081,7 +1093,10 @@
"RRConfigureOutputProperty error, %d\n", ret);
}
/* Set the current value of the backlight property */
- data = dev_priv->get_backlight(output);
+ if ((INREG(PP_CONTROL) & POWER_TARGET_ON) && !dev_priv->dpmsoff)
+ data = dev_priv->get_backlight(output);
+ else
+ data = dev_priv->backlight_duty_cycle;
ret = RRChangeOutputProperty(output->randr_output, backlight_atom,
XA_INTEGER, 32, PropModeReplace, 1, &data,
FALSE, TRUE);
@@ -1130,6 +1145,8 @@
static Bool
i830_lvds_get_property(xf86OutputPtr output, Atom property)
{
+ ScrnInfoPtr pScrn = output->scrn;
+ I830Ptr pI830 = I830PTR(pScrn);
I830OutputPrivatePtr intel_output = output->driver_private;
struct i830_lvds_priv *dev_priv = intel_output->dev_priv;
int ret;
@@ -1140,8 +1157,11 @@
*/
if (property == backlight_atom) {
int val;
- val = dev_priv->get_backlight(output);
- dev_priv->backlight_duty_cycle = val;
+ if ((INREG(PP_CONTROL) & POWER_TARGET_ON) && !dev_priv->dpmsoff) {
+ val = dev_priv->get_backlight(output);
+ dev_priv->backlight_duty_cycle = val;
+ } else
+ val = dev_priv->backlight_duty_cycle;
ret = RRChangeOutputProperty(output->randr_output, backlight_atom,
XA_INTEGER, 32, PropModeReplace, 1, &val,
FALSE, TRUE);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.3.1/src/i830_memory.c new/xf86-video-intel-2.3.2/src/i830_memory.c
--- old/xf86-video-intel-2.3.1/src/i830_memory.c 2008-05-12 03:00:12.000000000 +0200
+++ new/xf86-video-intel-2.3.2/src/i830_memory.c 2008-06-17 03:49:17.000000000 +0200
@@ -112,6 +112,7 @@
/* Our hardware status area is just a single page */
#define HWSTATUS_PAGE_SIZE GTT_PAGE_SIZE
+#define PWRCTX_SIZE GTT_PAGE_SIZE
static i830_memory *
i830_allocate_aperture(ScrnInfoPtr pScrn, const char *name,
@@ -337,6 +338,7 @@
pI830->exa_965_state = NULL;
pI830->overlay_regs = NULL;
pI830->logical_context = NULL;
+ pI830->power_context = NULL;
#ifdef XF86DRI
pI830->back_buffer = NULL;
pI830->third_buffer = NULL;
@@ -1654,6 +1656,22 @@
}
Bool
+i830_allocate_pwrctx(ScrnInfoPtr pScrn)
+{
+ I830Ptr pI830 = I830PTR(pScrn);
+
+ pI830->power_context = i830_allocate_memory(pScrn, "power context",
+ PWRCTX_SIZE, GTT_PAGE_SIZE,
+ NEED_LIFETIME_FIXED);
+ if (!pI830->power_context) {
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ "Failed to allocate power context.\n");
+ return FALSE;
+ }
+ return TRUE;
+}
+
+Bool
i830_allocate_3d_memory(ScrnInfoPtr pScrn)
{
I830Ptr pI830 = I830PTR(pScrn);
@@ -2002,6 +2020,7 @@
return maxPages * 4;
}
+#ifdef INTEL_XVMC
/*
* Allocate memory for MC compensation
*/
@@ -2023,3 +2042,4 @@
return TRUE;
}
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.3.1/src/i830_quirks.c new/xf86-video-intel-2.3.2/src/i830_quirks.c
--- old/xf86-video-intel-2.3.1/src/i830_quirks.c 2008-05-12 03:01:01.000000000 +0200
+++ new/xf86-video-intel-2.3.2/src/i830_quirks.c 2008-06-13 03:46:03.000000000 +0200
@@ -237,6 +237,8 @@
{ PCI_CHIP_I965_GM, 0x1028, 0x0256, quirk_ignore_tv },
/* Dell Inspiron 1318 */
{ PCI_CHIP_I965_GM, 0x1028, 0x0286, quirk_ignore_tv },
+ /* Dell Vostro A840 (LP: #235155) */
+ { PCI_CHIP_I965_GM, 0x1028, 0x0298, quirk_ignore_tv },
/* Lenovo Napa TV (use dmi)*/
{ PCI_CHIP_I945_GM, 0x17aa, SUBSYS_ANY, quirk_lenovo_tv_dmi },
@@ -272,6 +274,8 @@
{ PCI_CHIP_I855_GM, 0x1028, 0x0139, quirk_pipea_force },
/* Dell Latitude D500 needs pipe A force quirk */
{ PCI_CHIP_I855_GM, 0x1028, 0x0152, quirk_pipea_force },
+ /* Dell Latitude D505 needs pipe A force quirk (LP: #235643) */
+ { PCI_CHIP_I855_GM, 0x1028, 0x0163, quirk_pipea_force },
/* Dell Latitude X300 needs pipe A force quirk */
{ PCI_CHIP_I855_GM, 0x1028, 0x014f, quirk_pipea_force },
/* Dell Inspiron 510m needs pipe A force quirk */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.3.1/src/i830_ring.h new/xf86-video-intel-2.3.2/src/i830_ring.h
--- old/xf86-video-intel-2.3.1/src/i830_ring.h 2008-03-26 02:15:45.000000000 +0100
+++ new/xf86-video-intel-2.3.2/src/i830_ring.h 2008-06-13 03:46:03.000000000 +0200
@@ -75,28 +75,13 @@
pI830->ring_emitting = 0; \
} while (0)
-/*
- * XXX Note: the head/tail masks are different for 810 and i830.
- * If the i810 always sets the higher bits to 0, then this shouldn't be
- * a problem. Check this!
- */
-#define DO_RING_IDLE() do { \
- int _head; \
- int _tail; \
- do { \
- _head = INREG(LP_RING + RING_HEAD) & I830_HEAD_MASK; \
- _tail = INREG(LP_RING + RING_TAIL) & I830_TAIL_MASK; \
- DELAY(10); \
- } while (_head != _tail); \
-} while (0)
-
#define BEGIN_LP_RING(n) \
do { \
if (pI830->ring_emitting != 0) \
FatalError("%s: BEGIN_LP_RING called without closing " \
"ADVANCE_LP_RING\n", __FUNCTION__); \
if ((n) > 2 && (I810_DEBUG&DEBUG_ALWAYS_SYNC)) \
- DO_RING_IDLE(); \
+ i830_wait_ring_idle(pScrn); \
pI830->ring_emitting = (n) * 4; \
if ((n) & 1) \
pI830->ring_emitting += 4; \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.3.1/src/i830_sdvo.c new/xf86-video-intel-2.3.2/src/i830_sdvo.c
--- old/xf86-video-intel-2.3.1/src/i830_sdvo.c 2008-05-12 03:00:12.000000000 +0200
+++ new/xf86-video-intel-2.3.2/src/i830_sdvo.c 2008-06-17 03:49:17.000000000 +0200
@@ -730,7 +730,9 @@
/* Set the SDVO control regs. */
if (IS_I965G(pI830)) {
- sdvox = SDVO_BORDER_ENABLE;
+ sdvox = SDVO_BORDER_ENABLE |
+ SDVO_VSYNC_ACTIVE_HIGH |
+ SDVO_HSYNC_ACTIVE_HIGH;
} else {
sdvox = INREG(dev_priv->output_device);
switch (dev_priv->output_device) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.3.1/src/i830_tv.c new/xf86-video-intel-2.3.2/src/i830_tv.c
--- old/xf86-video-intel-2.3.1/src/i830_tv.c 2008-03-26 03:15:53.000000000 +0100
+++ new/xf86-video-intel-2.3.2/src/i830_tv.c 2008-06-13 03:46:03.000000000 +0200
@@ -788,6 +788,7 @@
OUTREG(TV_CTL, INREG(TV_CTL) & ~TV_ENC_ENABLE);
break;
}
+ i830WaitForVblank(pScrn);
}
static void
@@ -920,6 +921,7 @@
OUTREG(TV_DAC, dev_priv->save_TV_DAC);
OUTREG(TV_CTL, dev_priv->save_TV_CTL);
+ i830WaitForVblank(pScrn);
}
static const tv_mode_t *
@@ -1237,6 +1239,7 @@
OUTREG(TV_V_CHROMA_0 + (i<<2), tv_mode->filter_table[j++]);
OUTREG(TV_DAC, 0);
OUTREG(TV_CTL, tv_ctl);
+ i830WaitForVblank(pScrn);
}
static const DisplayModeRec reported_modes[] = {
@@ -1303,6 +1306,7 @@
tv_dac = INREG(TV_DAC);
OUTREG(TV_DAC, save_tv_dac);
OUTREG(TV_CTL, save_tv_ctl);
+ i830WaitForVblank(pScrn);
}
/*
* A B C
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.3.1/src/i830_video.c new/xf86-video-intel-2.3.2/src/i830_video.c
--- old/xf86-video-intel-2.3.1/src/i830_video.c 2008-05-12 03:00:12.000000000 +0200
+++ new/xf86-video-intel-2.3.2/src/i830_video.c 2008-06-17 03:49:17.000000000 +0200
@@ -2119,6 +2119,9 @@
switch (id) {
case FOURCC_YV12:
case FOURCC_I420:
+#ifdef INTEL_XVMC
+ case FOURCC_XVMC:
+#endif
OVERLAY_DEBUG("YUV420\n");
#if 0
/* set UV vertical phase to -0.25 */
@@ -2133,7 +2136,6 @@
break;
case FOURCC_UYVY:
case FOURCC_YUY2:
- default:
OVERLAY_DEBUG("YUV422\n");
overlay->OSTRIDE = dstPitch;
OCMD &= ~SOURCE_FORMAT;
@@ -2376,6 +2378,9 @@
switch (destId) {
case FOURCC_YV12:
case FOURCC_I420:
+#ifdef INTEL_XVMC
+ case FOURCC_XVMC:
+#endif
if (pPriv->rotation & (RR_Rotate_90 | RR_Rotate_270)) {
dstPitch = ((height / 2) + pitchAlignMask) & ~pitchAlignMask;
size = dstPitch * width * 3;
@@ -2386,7 +2391,7 @@
break;
case FOURCC_UYVY:
case FOURCC_YUY2:
- default:
+
if (pPriv->rotation & (RR_Rotate_90 | RR_Rotate_270)) {
dstPitch = ((height << 1) + pitchAlignMask) & ~pitchAlignMask;
size = dstPitch * width;
@@ -2395,6 +2400,10 @@
size = dstPitch * height;
}
break;
+ default:
+ dstPitch = 0;
+ size = 0;
+ break;
}
#if 0
ErrorF("srcPitch: %d, dstPitch: %d, size: %d\n", srcPitch, dstPitch, size);
@@ -2480,11 +2489,16 @@
break;
case FOURCC_UYVY:
case FOURCC_YUY2:
- default:
nlines = ((y2 + 0xffff) >> 16) - top;
I830CopyPackedData(pScrn, pPriv, buf, srcPitch, dstPitch, top, left,
nlines, npixels);
break;
+#ifdef INTEL_XVMC
+ case FOURCC_XVMC:
+ break;
+#endif
+ default:
+ break;
}
if (pDraw->type == DRAWABLE_WINDOW) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.3.1/src/i915_hwmc.c new/xf86-video-intel-2.3.2/src/i915_hwmc.c
--- old/xf86-video-intel-2.3.1/src/i915_hwmc.c 2008-03-26 03:15:53.000000000 +0100
+++ new/xf86-video-intel-2.3.2/src/i915_hwmc.c 2008-06-13 03:46:03.000000000 +0200
@@ -95,8 +95,6 @@
PutImageFuncPtr savePutImage;
} I915XvMC, *I915XvMCPtr;
-#define ARRARY_SIZE(a) (sizeof(a) / sizeof(a[0]))
-
/*
static int yv12_subpicture_index_list[2] =
{
@@ -161,6 +159,22 @@
};
#endif
+/* Check context size not exceed surface type max */
+static void
+i915_check_context_size(XvMCContextPtr ctx)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(ppSI); i++) {
+ if (ctx->surface_type_id == ppSI[i]->surface_type_id) {
+ if (ctx->width > ppSI[i]->max_width)
+ ctx->width = ppSI[i]->max_width;
+ if (ctx->height > ppSI[i]->max_height)
+ ctx->height = ppSI[i]->max_height;
+ }
+ }
+}
+
/*
* Init and clean up the screen private parts of XvMC.
*/
@@ -430,6 +444,8 @@
return BadAlloc;
}
+ i915_check_context_size(pContext);
+
*priv = xcalloc(1, sizeof(I915XvMCCreateContextRec));
contextRec = (I915XvMCCreateContextRec *)*priv;
@@ -776,10 +792,9 @@
struct intel_xvmc_command *xvmc_cmd = (struct intel_xvmc_command *)buf;
int ret;
- if (pI830->XvMCEnabled) {
- if (FOURCC_XVMC == id) {
- switch (xvmc_cmd->command) {
- case INTEL_XVMC_COMMAND_DISPLAY:
+ if (FOURCC_XVMC == id) {
+ switch (xvmc_cmd->command) {
+ case INTEL_XVMC_COMMAND_DISPLAY:
if ((xvmc_cmd->srfNo >= I915_XVMC_MAX_SURFACES) ||
!pXvMC->surfaces[xvmc_cmd->srfNo] ||
!pXvMC->sfprivs[xvmc_cmd->srfNo]) {
@@ -793,10 +808,9 @@
id = xvmc_cmd->real_id;
pI830->IsXvMCSurface = 1;
break;
- default:
- return 0;
- }
- }
+ default:
+ return 0;
+ }
}
ret = pXvMC->savePutImage(pScrn, src_x, src_y, drw_x, drw_y, src_w, src_h,
@@ -850,7 +864,7 @@
static XF86MCAdaptorRec pAdapt =
{
.name = "Intel(R) Textured Video",
- .num_surfaces = ARRARY_SIZE(ppSI),
+ .num_surfaces = ARRAY_SIZE(ppSI),
.surfaces = ppSI,
#if 0
.num_subpictures = ARRARY_SIZE(i915_subpicture_list),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.3.1/src/i915_hwmc.h new/xf86-video-intel-2.3.2/src/i915_hwmc.h
--- old/xf86-video-intel-2.3.1/src/i915_hwmc.h 2008-03-26 02:15:45.000000000 +0100
+++ new/xf86-video-intel-2.3.2/src/i915_hwmc.h 2008-06-13 03:46:03.000000000 +0200
@@ -32,7 +32,7 @@
#define STRIDE(w) (((w) + 0x3ff) & ~0x3ff)
#define SIZE_Y420(w, h) (h * STRIDE(w))
#define SIZE_UV420(w, h) ((h >> 1) * STRIDE(w >> 1))
-#define SIZE_YUV420(w, h) (h * (STRIDE(w) + STRIDE(w >> 1)))
+#define SIZE_YUV420(w, h) (SIZE_Y420(w,h) + SIZE_UV420(w,h) * 2)
#define SIZE_XX44(w, h) (h * STRIDE(w))
#define I915_NUM_XVMC_ATTRIBUTES 0x02
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.3.1/src/modes/xf86Cursors.c new/xf86-video-intel-2.3.2/src/modes/xf86Cursors.c
--- old/xf86-video-intel-2.3.1/src/modes/xf86Cursors.c 2008-04-14 03:57:30.000000000 +0200
+++ new/xf86-video-intel-2.3.2/src/modes/xf86Cursors.c 2008-06-18 04:40:58.000000000 +0200
@@ -137,7 +137,8 @@
mask = !mask;
if (flags & HARDWARE_CURSOR_NIBBLE_SWAPPED)
x = (x & ~3) | (3 - (x & 3));
- if (flags & HARDWARE_CURSOR_BIT_ORDER_MSBFIRST)
+ if (((flags & HARDWARE_CURSOR_BIT_ORDER_MSBFIRST) == 0) ==
+ (X_BYTE_ORDER == X_BIG_ENDIAN))
x = (x & ~7) | (7 - (x & 7));
if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1)
x = (x << 1) + mask;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.3.1/src/xvmc/driDrawable.c new/xf86-video-intel-2.3.2/src/xvmc/driDrawable.c
--- old/xf86-video-intel-2.3.1/src/xvmc/driDrawable.c 2008-03-26 02:15:45.000000000 +0100
+++ new/xf86-video-intel-2.3.2/src/xvmc/driDrawable.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,174 +0,0 @@
-/*****************************************************************************
- * driDrawable.c: Lean Version of DRI utilities.
- *
- * Copyright (c) 2005 Thomas Hellstrom. All rights reserved.
- *
- * 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) OR 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.
- */
-
-
-#include
-#include
-#include "xf86drm.h"
-#include "drm.h"
-#include "xf86dri.h"
-#include "drm_sarea.h"
-#include "driDrawable.h"
-
-static unsigned
-drawStamp(volatile drm_sarea_t * pSarea, int index)
-{
- return pSarea->drawableTable[index].stamp;
-}
-
-int
-getDRIDrawableInfoLocked(void *drawHash, Display * display, int screen,
- Drawable draw, unsigned lockFlags, int drmFD, drm_context_t drmContext,
- drmAddress sarea, Bool updateInfo, drawableInfo ** info,
- unsigned long infoSize)
-{
- drawableInfo *drawInfo;
- void *res;
- drm_drawable_t drmDraw = 0;
- volatile drm_sarea_t *pSarea = (drm_sarea_t *) sarea;
- drm_clip_rect_t *clipFront, *clipBack;
-
- int ret;
-
- if (drmHashLookup(drawHash, (unsigned long)draw, &res)) {
-
- /*
- * The drawable is unknown to us. Create it and put it in the
- * hash table.
- */
-
- DRM_UNLOCK(drmFD, &pSarea->lock, drmContext);
- if (!uniDRICreateDrawable(display, screen, draw, &drmDraw)) {
- DRM_LOCK(drmFD, &pSarea->lock, drmContext, lockFlags);
- return 1;
- }
- DRM_LOCK(drmFD, &pSarea->lock, drmContext, lockFlags);
-
- drawInfo = (drawableInfo *) malloc(infoSize);
- if (!drawInfo)
- return 1;
-
- drawInfo->drmDraw = drmDraw;
- drawInfo->stamp = 0;
- drawInfo->clipFront = 0;
- drawInfo->clipBack = 0;
-
- drmHashInsert(drawHash, (unsigned long)draw, drawInfo);
-
- } else {
- drawInfo = res;
- }
-
- drawInfo->touched = FALSE;
- while (!drawInfo->clipFront
- || drawInfo->stamp != drawStamp(pSarea, drawInfo->index)) {
-
- /*
- * The drawable has been touched since we last got info about it.
- * obtain new info from the X server.
- */
-
- drawInfo->touched = TRUE;
-
- if (updateInfo || !drawInfo->clipFront) {
- DRM_UNLOCK(drmFD, &pSarea->lock, drmContext);
-
- ret = uniDRIGetDrawableInfo(display, screen, draw,
- &drawInfo->index, &drawInfo->stamp, &drawInfo->x,
- &drawInfo->y, &drawInfo->w, &drawInfo->h,
- &drawInfo->numClipFront, &clipFront,
- &drawInfo->backX, &drawInfo->backY,
- &drawInfo->numClipBack, &clipBack);
-
- DRM_LIGHT_LOCK(drmFD, &pSarea->lock, drmContext);
-
- /*
- * Error. Probably the drawable is destroyed. Return error and old values.
- */
-
- if (!ret) {
- free(drawInfo);
- drawInfo = NULL;
- drmHashDelete(drawHash, (unsigned long)draw);
-
- DRM_UNLOCK(drmFD, &pSarea->lock, drmContext);
- uniDRIDestroyDrawable(display, screen, draw);
- DRM_LOCK(drmFD, &pSarea->lock, drmContext, lockFlags);
-
- return 1;
- }
-
- if (drawInfo->stamp != drawStamp(pSarea, drawInfo->index)) {
-
- /*
- * The info is already outdated. Sigh. Have another go.
- */
-
- XFree(clipFront);
- XFree(clipBack);
- continue;
- }
-
- if (drawInfo->clipFront)
- XFree(drawInfo->clipFront);
- drawInfo->clipFront = clipFront;
- if (drawInfo->clipBack)
- XFree(drawInfo->clipBack);
- drawInfo->clipBack = clipBack;
- } else {
- if (!drawInfo->clipFront)
- drawInfo->clipFront = (drm_clip_rect_t *) ~ 0UL;
- drawInfo->stamp = drawStamp(pSarea, drawInfo->index);
- }
- }
- *info = drawInfo;
- return 0;
-}
-
-void
-driDestroyHashContents(void *drawHash)
-{
- unsigned long key;
- void *content;
- drawableInfo *drawInfo;
-
- if (drmHashFirst(drawHash, &key, &content) < 1)
- return;
- drawInfo = (drawableInfo *) content;
- if (drawInfo->clipBack)
- XFree(drawInfo->clipBack);
- if (drawInfo->clipFront)
- XFree(drawInfo->clipFront);
- free(drawInfo);
- while (drmHashNext(drawHash, &key, &content) == 1) {
- drawInfo = (drawableInfo *) content;
- if (drawInfo->clipBack)
- XFree(drawInfo->clipBack);
- if (drawInfo->clipFront)
- XFree(drawInfo->clipFront);
- free(drawInfo);
- }
-
- return;
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.3.1/src/xvmc/driDrawable.h new/xf86-video-intel-2.3.2/src/xvmc/driDrawable.h
--- old/xf86-video-intel-2.3.1/src/xvmc/driDrawable.h 2008-03-26 02:15:45.000000000 +0100
+++ new/xf86-video-intel-2.3.2/src/xvmc/driDrawable.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,64 +0,0 @@
-/*****************************************************************************
- * driDrawable.h: Lean Version of DRI utilities.
- *
- * Copyright (c) 2005 Thomas Hellstrom. All rights reserved.
- *
- * 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) OR 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.
- */
-
-#ifndef _DRIDRAWABLE_H
-#define _DRIDRAWABLE_H
-
-typedef struct _drawableInfo
-{
- drm_drawable_t drmDraw;
- unsigned stamp;
- unsigned index;
- drm_clip_rect_t *clipFront;
- drm_clip_rect_t *clipBack;
- int x;
- int y;
- int w;
- int h;
- int backX;
- int backY;
- int numClipFront;
- int numClipBack;
- Bool touched;
-} drawableInfo;
-
-/*
- * Get updated info about the drawable "draw". The drawableInfo record returned is malloced
- * and administrated internally. Never free it unless you know exactly what you are doing.
- * The drm hash table "drawHash" needs to be initialized externally.
- */
-
-extern int
-getDRIDrawableInfoLocked(void *drawHash, Display * display, int screen,
- Drawable draw, unsigned lockFlags, int drmFD, drm_context_t drmContext,
- drmAddress sarea, Bool updateInfo, drawableInfo ** info,
- unsigned long infoSize);
-
-/*
- * Free all resources created by the above function. Typically done on exit.
- */
-
-extern void driDestroyHashContents(void *drawHash);
-
-#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.3.1/src/xvmc/i915_xvmc.c new/xf86-video-intel-2.3.2/src/xvmc/i915_xvmc.c
--- old/xf86-video-intel-2.3.1/src/xvmc/i915_xvmc.c 2008-03-26 03:15:53.000000000 +0100
+++ new/xf86-video-intel-2.3.2/src/xvmc/i915_xvmc.c 2008-06-17 03:49:17.000000000 +0200
@@ -1608,9 +1608,6 @@
pI915XvMC->ref--;
i915_xvmc_unmap_buffers(pI915XvMC);
- driDestroyHashContents(pI915XvMC->drawHash);
- drmHashDestroy(pI915XvMC->drawHash);
-
free(pI915XvMC);
context->privData = NULL;
}
@@ -1683,13 +1680,6 @@
pSAREA = (drm_sarea_t *)xvmc_driver->sarea_address;
pI915XvMC->sarea = (drmI830Sarea*)((char*)pSAREA + pI915XvMC->sarea_priv_offset);
- if (NULL == (pI915XvMC->drawHash = drmHashCreate())) {
- XVMC_ERR("Could not allocate drawable hash table.");
- free(pI915XvMC);
- context->privData = NULL;
- return BadAlloc;
- }
-
if (i915_xvmc_map_buffers(pI915XvMC)) {
i915_xvmc_unmap_buffers(pI915XvMC);
free(pI915XvMC);
@@ -1997,7 +1987,7 @@
XVMC_ERR("Invalid Macroblock Parameters found.");
break;
}
- } else { /* Frame Picture */
+ } else { /* Field Picture */
switch (mb->motion_type & 3) {
case XVMC_PREDICTION_FIELD: /* Field Based */
i915_mc_mpeg_macroblock_1fbmv(context, mb);
@@ -2015,7 +2005,7 @@
XVMC_ERR("Invalid Macroblock Parameters found.");
break;
}
- } /* Field Picture */
+ }
}
intelFlushBatch(TRUE);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.3.1/src/xvmc/intel_xvmc.c new/xf86-video-intel-2.3.2/src/xvmc/intel_xvmc.c
--- old/xf86-video-intel-2.3.1/src/xvmc/intel_xvmc.c 2008-03-26 03:15:53.000000000 +0100
+++ new/xf86-video-intel-2.3.2/src/xvmc/intel_xvmc.c 2008-06-17 03:49:17.000000000 +0200
@@ -513,7 +513,7 @@
*/
Status XvMCDestroyBlocks(Display *display, XvMCBlockArray *block)
{
- if (!display || block)
+ if (!display || !block)
return BadValue;
if (block->blocks)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.3.1/src/xvmc/intel_xvmc.h new/xf86-video-intel-2.3.2/src/xvmc/intel_xvmc.h
--- old/xf86-video-intel-2.3.1/src/xvmc/intel_xvmc.h 2008-03-26 03:15:53.000000000 +0100
+++ new/xf86-video-intel-2.3.2/src/xvmc/intel_xvmc.h 2008-06-17 03:49:17.000000000 +0200
@@ -53,7 +53,6 @@
#include
#include "xf86dri.h"
-#include "driDrawable.h"
#include "intel_batchbuffer.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.3.1/src/xvmc/Makefile.am new/xf86-video-intel-2.3.2/src/xvmc/Makefile.am
--- old/xf86-video-intel-2.3.1/src/xvmc/Makefile.am 2008-05-07 05:11:16.000000000 +0200
+++ new/xf86-video-intel-2.3.2/src/xvmc/Makefile.am 2008-06-17 03:49:17.000000000 +0200
@@ -19,9 +19,8 @@
intel_batchbuffer.h \
xf86dri.c \
xf86dri.h \
- xf86dristr.h \
- driDrawable.c \
- driDrawable.h
+ xf86dristr.h
+
libIntelXvMC_la_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XVMCLIB_CFLAGS@ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
libIntelXvMC_la_LDFLAGS = -version-number 1:0:0
libIntelXvMC_la_LIBADD = @DRI_LIBS@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-intel-2.3.1/src/xvmc/Makefile.in new/xf86-video-intel-2.3.2/src/xvmc/Makefile.in
--- old/xf86-video-intel-2.3.1/src/xvmc/Makefile.in 2008-05-12 03:02:01.000000000 +0200
+++ new/xf86-video-intel-2.3.2/src/xvmc/Makefile.in 2008-06-18 04:36:13.000000000 +0200
@@ -62,12 +62,11 @@
am__libIntelXvMC_la_SOURCES_DIST = intel_xvmc.c intel_xvmc.h \
i915_structs.h i915_program.h i915_xvmc.c i915_xvmc.h \
intel_batchbuffer.c intel_batchbuffer.h xf86dri.c xf86dri.h \
- xf86dristr.h driDrawable.c driDrawable.h
+ xf86dristr.h
@XVMC_TRUE@am_libIntelXvMC_la_OBJECTS = libIntelXvMC_la-intel_xvmc.lo \
@XVMC_TRUE@ libIntelXvMC_la-i915_xvmc.lo \
@XVMC_TRUE@ libIntelXvMC_la-intel_batchbuffer.lo \
-@XVMC_TRUE@ libIntelXvMC_la-xf86dri.lo \
-@XVMC_TRUE@ libIntelXvMC_la-driDrawable.lo
+@XVMC_TRUE@ libIntelXvMC_la-xf86dri.lo
libIntelXvMC_la_OBJECTS = $(am_libIntelXvMC_la_OBJECTS)
libIntelXvMC_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libIntelXvMC_la_CFLAGS) \
@@ -253,9 +252,7 @@
@XVMC_TRUE@ intel_batchbuffer.h \
@XVMC_TRUE@ xf86dri.c \
@XVMC_TRUE@ xf86dri.h \
-@XVMC_TRUE@ xf86dristr.h \
-@XVMC_TRUE@ driDrawable.c \
-@XVMC_TRUE@ driDrawable.h
+@XVMC_TRUE@ xf86dristr.h
@XVMC_TRUE@libIntelXvMC_la_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XVMCLIB_CFLAGS@ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
@XVMC_TRUE@libIntelXvMC_la_LDFLAGS = -version-number 1:0:0
@@ -332,7 +329,6 @@
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libI810XvMC_la-I810XvMC.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libIntelXvMC_la-driDrawable.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libIntelXvMC_la-i915_xvmc.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libIntelXvMC_la-intel_batchbuffer.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libIntelXvMC_la-intel_xvmc.Plo@am__quote@
@@ -394,13 +390,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libIntelXvMC_la_CFLAGS) $(CFLAGS) -c -o libIntelXvMC_la-xf86dri.lo `test -f 'xf86dri.c' || echo '$(srcdir)/'`xf86dri.c
-libIntelXvMC_la-driDrawable.lo: driDrawable.c
-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libIntelXvMC_la_CFLAGS) $(CFLAGS) -MT libIntelXvMC_la-driDrawable.lo -MD -MP -MF $(DEPDIR)/libIntelXvMC_la-driDrawable.Tpo -c -o libIntelXvMC_la-driDrawable.lo `test -f 'driDrawable.c' || echo '$(srcdir)/'`driDrawable.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libIntelXvMC_la-driDrawable.Tpo $(DEPDIR)/libIntelXvMC_la-driDrawable.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='driDrawable.c' object='libIntelXvMC_la-driDrawable.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libIntelXvMC_la_CFLAGS) $(CFLAGS) -c -o libIntelXvMC_la-driDrawable.lo `test -f 'driDrawable.c' || echo '$(srcdir)/'`driDrawable.c
-
mostlyclean-libtool:
-rm -f *.lo
++++++ xf86-video-nv-commit-745a1d2.diff ++++++
commit 2df11aafe4eae33aab06d902ddeed6bd996b1575
Author: Aaron Plattner
Date: Mon Jun 16 10:07:07 2008 -0700
GeForce GTX 280 and 260 chip names.
Note: These GPUs already worked with this driver, this change just adds their
names to the table.
diff --git a/src/nv_driver.c b/src/nv_driver.c
index a6202ce..d710d06 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -113,7 +113,7 @@ _X_EXPORT DriverRec NV = {
#endif
};
-/* Known cards as of 2008/06/05 */
+/* Known cards as of 2008/06/16 */
static SymTabRec NVKnownChipsets[] =
{
@@ -389,6 +389,8 @@ static SymTabRec NVKnownChipsets[] =
{ 0x10DE042D, "Quadro FX 360M" },
{ 0x10DE042E, "GeForce 9300M G" },
{ 0x10DE042F, "Quadro NVS 290" },
+ { 0x10DE05E1, "GeForce GTX 280" },
+ { 0x10DE05E2, "GeForce GTX 260" },
{ 0x10DE0600, "GeForce 8800 GTS 512" },
{ 0x10DE0602, "GeForce 8800 GT" },
{ 0x10DE0604, "GeForce 9800 GX2" },
++++++ xf86-video-vmware-10.16.0.tar.bz2 -> xf86-video-vmware-10.16.2.tar.bz2 ++++++
++++ 5239 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-vmware-10.16.0/config.h.in new/xf86-video-vmware-10.16.2/config.h.in
--- old/xf86-video-vmware-10.16.0/config.h.in 2008-03-19 22:01:26.000000000 +0100
+++ new/xf86-video-vmware-10.16.2/config.h.in 2008-06-12 23:30:06.000000000 +0200
@@ -32,6 +32,12 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Has version 1.0.99.901 or greater of the Xserver */
+#undef HAVE_XORG_SERVER_1_0_99_901
+
+/* Has version 1.1.0 or greater of the Xserver */
+#undef HAVE_XORG_SERVER_1_1_0
+
/* Name of package */
#undef PACKAGE
@@ -50,15 +56,6 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-/* Major version of this package */
-#undef PACKAGE_VERSION_MAJOR
-
-/* Minor version of this package */
-#undef PACKAGE_VERSION_MINOR
-
-/* Patch version of this package */
-#undef PACKAGE_VERSION_PATCHLEVEL
-
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
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-vmware-10.16.0/configure.ac new/xf86-video-vmware-10.16.2/configure.ac
--- old/xf86-video-vmware-10.16.0/configure.ac 2008-03-19 22:00:58.000000000 +0100
+++ new/xf86-video-vmware-10.16.2/configure.ac 2008-06-12 23:28:19.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-vmware],
- 10.16.0,
+ 10.16.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-vmware)
@@ -55,9 +55,17 @@
XORG_DRIVER_CHECK_EXT(XV, videoproto)
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.1 xproto fontsproto $REQUIRED_MODULES])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+PKG_CHECK_EXISTS([xorg-server >= 1.1.0],
+ [AC_DEFINE([HAVE_XORG_SERVER_1_1_0], 1,
+ [Has version 1.1.0 or greater of the Xserver])])
+
+PKG_CHECK_EXISTS([xorg-server >= 1.0.99.901],
+ [AC_DEFINE([HAVE_XORG_SERVER_1_0_99_901], 1,
+ [Has version 1.0.99.901 or greater of the Xserver])])
+
# Checks for libraries.
# Checks for header files.
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-vmware-10.16.0/src/svga_overlay.h new/xf86-video-vmware-10.16.2/src/svga_overlay.h
--- old/xf86-video-vmware-10.16.0/src/svga_overlay.h 2008-03-19 15:31:32.000000000 +0100
+++ new/xf86-video-vmware-10.16.2/src/svga_overlay.h 2008-04-19 00:02:27.000000000 +0200
@@ -15,8 +15,8 @@
* Video formats we support
*/
-#define VMWARE_FOURCC_YV12 0x32315659 // 'Y' 'V' '1' '2'
-#define VMWARE_FOURCC_YUY2 0x32595559 // 'Y' 'U' 'Y' '2'
+#define VMWARE_FOURCC_YV12 0x32315659 /* 'Y' 'V' '1' '2' */
+#define VMWARE_FOURCC_YUY2 0x32595559 /* 'Y' 'U' 'Y' '2' */
#define SVGA_ESCAPE_VMWARE_VIDEO 0x00020000
@@ -34,7 +34,7 @@
uint32 streamId;
} header;
- // May include zero or more items.
+ /* May include zero or more items. */
struct {
uint32 registerId;
uint32 value;
@@ -46,4 +46,4 @@
uint32 streamId;
} SVGAEscapeVideoFlush;
-#endif // _SVGA_OVERLAY_H_
+#endif /* _SVGA_OVERLAY_H_ */
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-vmware-10.16.0/src/svga_reg.h new/xf86-video-vmware-10.16.2/src/svga_reg.h
--- old/xf86-video-vmware-10.16.0/src/svga_reg.h 2008-03-19 15:31:32.000000000 +0100
+++ new/xf86-video-vmware-10.16.2/src/svga_reg.h 2008-04-19 00:02:27.000000000 +0200
@@ -138,12 +138,19 @@
SVGA_REG_NUM_DISPLAYS = 31, /* Number of guest displays */
SVGA_REG_PITCHLOCK = 32, /* Fixed pitch for all modes */
SVGA_REG_IRQMASK = 33, /* Interrupt mask */
- SVGA_REG_TOP = 34, /* Must be 1 more than the last register */
+ SVGA_REG_NUM_GUEST_DISPLAYS = 34,/* Number of guest displays in X/Y direction */
+ SVGA_REG_DISPLAY_ID = 35, /* The display ID for the following display attributes */
+ SVGA_REG_DISPLAY_IS_PRIMARY = 36,/* Whether this is a primary display */
+ SVGA_REG_DISPLAY_POSITION_X = 37,/* The display position x */
+ SVGA_REG_DISPLAY_POSITION_Y = 38,/* The display position y */
+ SVGA_REG_DISPLAY_WIDTH = 39, /* The display's width */
+ SVGA_REG_DISPLAY_HEIGHT = 40, /* The display's height */
+ SVGA_REG_TOP = 41, /* Must be 1 more than the last register */
- SVGA_PALETTE_BASE = 1024, /* Base of SVGA color map */
+ SVGA_PALETTE_BASE = 1024, /* Base of SVGA color map */
/* Next 768 (== 256*3) registers exist for colormap */
SVGA_SCRATCH_BASE = SVGA_PALETTE_BASE + SVGA_NUM_PALETTE_REGS
- /* Base of scratch registers */
+ /* Base of scratch registers */
/* Next reg[SVGA_REG_SCRATCH_SIZE] registers exist for scratch usage:
First 4 are reserved for VESA BIOS Extension; any remaining are for
the use of the current SVGA driver. */
@@ -154,26 +161,28 @@
* Capabilities
*/
-#define SVGA_CAP_NONE 0x00000
-#define SVGA_CAP_RECT_FILL 0x00001
-#define SVGA_CAP_RECT_COPY 0x00002
-#define SVGA_CAP_RECT_PAT_FILL 0x00004
-#define SVGA_CAP_LEGACY_OFFSCREEN 0x00008
-#define SVGA_CAP_RASTER_OP 0x00010
-#define SVGA_CAP_CURSOR 0x00020
-#define SVGA_CAP_CURSOR_BYPASS 0x00040
-#define SVGA_CAP_CURSOR_BYPASS_2 0x00080
-#define SVGA_CAP_8BIT_EMULATION 0x00100
-#define SVGA_CAP_ALPHA_CURSOR 0x00200
-#define SVGA_CAP_GLYPH 0x00400
-#define SVGA_CAP_GLYPH_CLIPPING 0x00800
-#define SVGA_CAP_OFFSCREEN_1 0x01000
-#define SVGA_CAP_ALPHA_BLEND 0x02000
-#define SVGA_CAP_3D 0x04000
-#define SVGA_CAP_EXTENDED_FIFO 0x08000
-#define SVGA_CAP_MULTIMON 0x10000
-#define SVGA_CAP_PITCHLOCK 0x20000
-#define SVGA_CAP_IRQMASK 0x40000
+#define SVGA_CAP_NONE 0x00000000
+#define SVGA_CAP_RECT_FILL 0x00000001
+#define SVGA_CAP_RECT_COPY 0x00000002
+#define SVGA_CAP_RECT_PAT_FILL 0x00000004
+#define SVGA_CAP_LEGACY_OFFSCREEN 0x00000008
+#define SVGA_CAP_RASTER_OP 0x00000010
+#define SVGA_CAP_CURSOR 0x00000020
+#define SVGA_CAP_CURSOR_BYPASS 0x00000040
+#define SVGA_CAP_CURSOR_BYPASS_2 0x00000080
+#define SVGA_CAP_8BIT_EMULATION 0x00000100
+#define SVGA_CAP_ALPHA_CURSOR 0x00000200
+#define SVGA_CAP_GLYPH 0x00000400
+#define SVGA_CAP_GLYPH_CLIPPING 0x00000800
+#define SVGA_CAP_OFFSCREEN_1 0x00001000
+#define SVGA_CAP_ALPHA_BLEND 0x00002000
+#define SVGA_CAP_3D 0x00004000
+#define SVGA_CAP_EXTENDED_FIFO 0x00008000
+#define SVGA_CAP_MULTIMON 0x00010000
+#define SVGA_CAP_PITCHLOCK 0x00020000
+#define SVGA_CAP_IRQMASK 0x00040000
+#define SVGA_CAP_DISPLAY_TOPOLOGY 0x00080000
+
/*
* Raster op codes (same encoding as X) used by FIFO drivers.
@@ -201,6 +210,8 @@
#define SVGA_ROP_ALL (MASK(SVGA_NUM_SUPPORTED_ROPS))
#define SVGA_IS_VALID_ROP(rop) (rop < SVGA_NUM_SUPPORTED_ROPS)
+#define SVGA_INVALID_DISPLAY_ID ((uint32)-1)
+
/*
* Ops
* For each pixel, the four channels of the image are computed with:
@@ -309,7 +320,7 @@
SVGA_FIFO_CAPABILITIES = 4,
SVGA_FIFO_FLAGS,
- // Valid with SVGA_FIFO_CAP_FENCE:
+ /* Valid with SVGA_FIFO_CAP_FENCE: */
SVGA_FIFO_FENCE,
/*
@@ -322,17 +333,17 @@
* extended FIFO.
*/
- // Valid if exists (i.e. if extended FIFO enabled):
+ /* Valid if exists (i.e. if extended FIFO enabled): */
SVGA_FIFO_3D_HWVERSION, /* See SVGA3dHardwareVersion in svga3d_reg.h */
- // Valid with SVGA_FIFO_CAP_PITCHLOCK:
+ /* Valid with SVGA_FIFO_CAP_PITCHLOCK: */
SVGA_FIFO_PITCHLOCK,
- // Valid with SVGA_FIFO_CAP_CURSOR_BYPASS_3:
+ /* Valid with SVGA_FIFO_CAP_CURSOR_BYPASS_3: */
SVGA_FIFO_CURSOR_ON, /* Cursor bypass 3 show/hide register */
SVGA_FIFO_CURSOR_X, /* Cursor bypass 3 x register */
SVGA_FIFO_CURSOR_Y, /* Cursor bypass 3 y register */
SVGA_FIFO_CURSOR_COUNT, /* Incremented when any of the other 3 change */
SVGA_FIFO_CURSOR_LAST_UPDATED,/* Last time the host updated the cursor */
- // Valid with SVGA_FIFO_CAP_RESERVE:
+ /* Valid with SVGA_FIFO_CAP_RESERVE: */
SVGA_FIFO_RESERVED, /* Bytes past NEXT_CMD with real contents */
/*
* XXX: The gap here, up until SVGA_FIFO_3D_CAPS, can be used for new
@@ -371,7 +382,7 @@
* sets SVGA_FIFO_MIN high enough to leave room for them.
*/
- // Valid if register exists:
+ /* Valid if register exists: */
SVGA_FIFO_GUEST_3D_HWVERSION, /* Guest driver's 3D version */
SVGA_FIFO_FENCE_GOAL, /* Matching target for SVGA_IRQFLAG_FENCE_GOAL */
SVGA_FIFO_BUSY, /* See "FIFO Synchronization Registers" */
@@ -542,7 +553,7 @@
#define SVGA_FIFO_FLAG_NONE 0
#define SVGA_FIFO_FLAG_ACCELFRONT (1<<0)
-#define SVGA_FIFO_FLAG_RESERVED (1<<31) // Internal use only
+#define SVGA_FIFO_FLAG_RESERVED (1<<31) /* Internal use only */
/*
* FIFO reservation sentinel value
@@ -806,13 +817,13 @@
/*
* Location and size of SVGA frame buffer and the FIFO.
*/
-#define SVGA_VRAM_MIN_SIZE (4 * 640 * 480) // bytes
+#define SVGA_VRAM_MIN_SIZE (4 * 640 * 480) /* bytes */
#define SVGA_VRAM_MAX_SIZE (128 * 1024 * 1024)
-#define SVGA_VRAM_SIZE_WS (16 * 1024 * 1024) // 16 MB
-#define SVGA_MEM_SIZE_WS (2 * 1024 * 1024) // 2 MB
-#define SVGA_VRAM_SIZE_SERVER (4 * 1024 * 1024) // 4 MB
-#define SVGA_MEM_SIZE_SERVER (256 * 1024) // 256 KB
+#define SVGA_VRAM_SIZE_WS (16 * 1024 * 1024) /* 16 MB */
+#define SVGA_MEM_SIZE_WS (2 * 1024 * 1024) /* 2 MB */
+#define SVGA_VRAM_SIZE_SERVER (4 * 1024 * 1024) /* 4 MB */
+#define SVGA_MEM_SIZE_SERVER (256 * 1024) /* 256 KB */
#if /* defined(VMX86_WGS) || */ defined(VMX86_SERVER)
#define SVGA_VRAM_SIZE SVGA_VRAM_SIZE_SERVER
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-vmware-10.16.0/src/vmware.c new/xf86-video-vmware-10.16.2/src/vmware.c
--- old/xf86-video-vmware-10.16.0/src/vmware.c 2008-03-19 21:57:15.000000000 +0100
+++ new/xf86-video-vmware-10.16.2/src/vmware.c 2008-06-12 23:28:56.000000000 +0200
@@ -82,7 +82,7 @@
#define VMWARE_NAME "VMWARE"
#define VMWARE_DRIVER_NAME "vmware"
#define VMWARE_MAJOR_VERSION 10
-#define VMWARE_MINOR_VERSION 15
+#define VMWARE_MINOR_VERSION 16
#define VMWARE_PATCHLEVEL 2
#define VMWARE_DRIVER_VERSION \
(VMWARE_MAJOR_VERSION * 65536 + VMWARE_MINOR_VERSION * 256 + VMWARE_PATCHLEVEL)
@@ -386,7 +386,7 @@
return SVGA_ID_INVALID;
}
-
+#ifndef XSERVER_LIBPCIACCESS
/*
*----------------------------------------------------------------------
*
@@ -432,6 +432,7 @@
*op++ = chr;
} while (chr);
}
+#endif
static void
VMWAREIdentify(int flags)
@@ -579,7 +580,6 @@
int i;
ClockRange* clockRanges;
IOADDRESS domainIOBase = 0;
- Bool useXinerama = TRUE;
#ifndef BUILD_FOR_420
domainIOBase = pScrn->domainIOBase;
@@ -894,30 +894,6 @@
pScrn->videoRam = pVMWARE->videoRam / 1024;
pScrn->memPhysBase = pVMWARE->memPhysBase;
- /*
- * Init xinerama preferences.
- */
- useXinerama = xf86ReturnOptValBool(options, OPTION_XINERAMA,
- pVMWARE->vmwareCapability & SVGA_CAP_MULTIMON);
- if (useXinerama && !(pVMWARE->vmwareCapability & SVGA_CAP_MULTIMON)) {
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- "Xinerama is not safely supported by the current virtual hardware. "
- "Do not request resolutions that require > 16MB of framebuffer.\n");
- }
-
-
- if (useXinerama && xf86IsOptionSet(options, OPTION_STATIC_XINERAMA)) {
- char *topology = xf86GetOptValString(options, OPTION_STATIC_XINERAMA);
- if (topology) {
- pVMWARE->xineramaState =
- VMWAREParseTopologyString(pScrn, topology, &pVMWARE->xineramaNumOutputs);
-
- pVMWARE->xineramaStatic = pVMWARE->xineramaState != NULL;
-
- xfree(topology);
- }
- }
-
xfree(options);
{
@@ -982,20 +958,6 @@
xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
- /* Initialise VMWARE_CTRL extension. */
- VMwareCtrl_ExtInit(pScrn);
-
- /* Initialise Xinerama extension. */
- if (useXinerama) {
- VMwareXinerama_ExtInit(pScrn);
- }
-
- if (pVMWARE->xinerama && pVMWARE->xineramaStatic) {
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, pVMWARE->xineramaState ?
- "Using static Xinerama.\n" :
- "Failed to configure static Xinerama.\n");
- }
-
return TRUE;
}
@@ -1226,6 +1188,42 @@
}
}
+ /*
+ * Update host's view of guest topology.
+ */
+ if (pVMWARE->vmwareCapability & SVGA_CAP_DISPLAY_TOPOLOGY) {
+ if (pVMWARE->xinerama) {
+ int i = 0;
+ VMWAREXineramaPtr xineramaState = pVMWARE->xineramaState;
+ vmwareWriteReg(pVMWARE, SVGA_REG_NUM_GUEST_DISPLAYS,
+ pVMWARE->xineramaNumOutputs);
+
+ for (i = 0; i < pVMWARE->xineramaNumOutputs; i++) {
+ vmwareWriteReg(pVMWARE, SVGA_REG_DISPLAY_ID, i);
+ vmwareWriteReg(pVMWARE, SVGA_REG_DISPLAY_IS_PRIMARY, TRUE);
+ vmwareWriteReg(pVMWARE, SVGA_REG_DISPLAY_POSITION_X,
+ xineramaState[i].x_org);
+ vmwareWriteReg(pVMWARE, SVGA_REG_DISPLAY_POSITION_Y,
+ xineramaState[i].y_org);
+ vmwareWriteReg(pVMWARE, SVGA_REG_DISPLAY_WIDTH,
+ xineramaState[i].width);
+ vmwareWriteReg(pVMWARE, SVGA_REG_DISPLAY_HEIGHT,
+ xineramaState[i].height);
+ }
+ } else {
+ vmwareWriteReg(pVMWARE, SVGA_REG_NUM_GUEST_DISPLAYS, 1);
+
+ vmwareWriteReg(pVMWARE, SVGA_REG_DISPLAY_ID, 0);
+ vmwareWriteReg(pVMWARE, SVGA_REG_DISPLAY_IS_PRIMARY, TRUE);
+ vmwareWriteReg(pVMWARE, SVGA_REG_DISPLAY_POSITION_X, 0);
+ vmwareWriteReg(pVMWARE, SVGA_REG_DISPLAY_POSITION_Y, 0);
+ vmwareWriteReg(pVMWARE, SVGA_REG_DISPLAY_WIDTH, mode->HDisplay);
+ vmwareWriteReg(pVMWARE, SVGA_REG_DISPLAY_HEIGHT, mode->VDisplay);
+ }
+
+ vmwareWriteReg(pVMWARE, SVGA_REG_DISPLAY_ID, SVGA_INVALID_DISPLAY_ID);
+ }
+
return TRUE;
}
@@ -1493,16 +1491,64 @@
ScrnInfoPtr pScrn;
vgaHWPtr hwp;
VMWAREPtr pVMWARE;
+ OptionInfoPtr options;
+ Bool useXinerama = TRUE;
/* Get the ScrnInfoRec */
pScrn = xf86Screens[pScreen->myNum];
pVMWARE = VMWAREPTR(pScrn);
+
+ xf86CollectOptions(pScrn, NULL);
+ if (!(options = xalloc(sizeof(VMWAREOptions))))
+ return FALSE;
+ memcpy(options, VMWAREOptions, sizeof(VMWAREOptions));
+ xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options);
+
+ /*
+ * Init xinerama preferences.
+ */
+ useXinerama = xf86ReturnOptValBool(options, OPTION_XINERAMA,
+ pVMWARE->vmwareCapability & SVGA_CAP_MULTIMON);
+ if (useXinerama && !(pVMWARE->vmwareCapability & SVGA_CAP_MULTIMON)) {
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ "Xinerama is not safely supported by the current virtual hardware. "
+ "Do not request resolutions that require > 16MB of framebuffer.\n");
+ }
+
+
+ if (useXinerama && xf86IsOptionSet(options, OPTION_STATIC_XINERAMA)) {
+ char *topology = xf86GetOptValString(options, OPTION_STATIC_XINERAMA);
+ if (topology) {
+ pVMWARE->xineramaState =
+ VMWAREParseTopologyString(pScrn, topology, &pVMWARE->xineramaNumOutputs);
+
+ pVMWARE->xineramaStatic = pVMWARE->xineramaState != NULL;
+
+ xfree(topology);
+ }
+ }
+
+ xfree(options);
+
+ /* Initialise VMWARE_CTRL extension. */
+ VMwareCtrl_ExtInit(pScrn);
+
+ /* Initialise Xinerama extension. */
+ if (useXinerama) {
+ VMwareXinerama_ExtInit(pScrn);
+ }
+
+ if (pVMWARE->xinerama && pVMWARE->xineramaStatic) {
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, pVMWARE->xineramaState ?
+ "Using static Xinerama.\n" :
+ "Failed to configure static Xinerama.\n");
+ }
+
/*
* If using the vgahw module, its data structures and related
* things are typically initialised/mapped here.
*/
-
hwp = VGAHWPTR(pScrn);
vgaHWGetIOBase(hwp);
@@ -1535,7 +1581,6 @@
* acceptable. To deal with this, call miSetVisualTypes with
* the appropriate visual mask.
*/
-
if (pScrn->bitsPerPixel > 8) {
if (!miSetVisualTypes(pScrn->depth, TrueColorMask,
pScrn->rgbBits, pScrn->defaultVisual)) {
@@ -1644,7 +1689,6 @@
* Install colourmap functions. If using the vgahw module,
* vgaHandleColormaps would usually be called here.
*/
-
if (!fbCreateDefColormap(pScreen))
return FALSE;
@@ -1730,8 +1774,6 @@
VMWARELeaveVT(int scrnIndex, int flags)
{
ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
- VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
-
VMWARERestore(pScrn);
}
@@ -1760,8 +1802,6 @@
{
ScrnInfoPtr scrn = NULL;
EntityInfoPtr entity;
- /*I830EntPtr i830_ent = NULL;*/
- DevUnion *private;
scrn = xf86ConfigPciEntity(scrn, 0, entity_num, VMWAREPciChipsets,
NULL, NULL, NULL, NULL, NULL);
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-vmware-10.16.0/src/vmwarectrl.c new/xf86-video-vmware-10.16.2/src/vmwarectrl.c
--- old/xf86-video-vmware-10.16.0/src/vmwarectrl.c 2008-03-19 15:31:32.000000000 +0100
+++ new/xf86-video-vmware-10.16.2/src/vmwarectrl.c 2008-04-18 05:15:43.000000000 +0200
@@ -311,7 +311,6 @@
ExtensionEntry *ext;
register int n;
xXineramaScreenInfo *extents;
- size_t i;
REQUEST_AT_LEAST_SIZE(xVMwareCtrlSetTopologyReq);
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-vmware-10.16.0/src/vmware.h new/xf86-video-vmware-10.16.2/src/vmware.h
--- old/xf86-video-vmware-10.16.0/src/vmware.h 2008-03-19 21:57:15.000000000 +0100
+++ new/xf86-video-vmware-10.16.2/src/vmware.h 2008-04-22 21:05:18.000000000 +0200
@@ -8,7 +8,14 @@
#ifndef VMWARE_H
#define VMWARE_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_XORG_SERVER_1_1_0
#include
+#endif
#include "xf86.h"
#include "xf86_OSproc.h"
@@ -16,7 +23,6 @@
#include
-#include "xorg-server.h"
#ifdef XSERVER_LIBPCIACCESS
#include
#endif
@@ -269,7 +275,7 @@
void VMwareXinerama_ExtInit(ScrnInfoPtr pScrn);
/* vmwarevideo.c */
-Bool vmwareInitVideo(
+Bool vmwareVideoInit(
ScreenPtr pScreen
);
void vmwareVideoEnd(
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-vmware-10.16.0/src/vmwarevideo.c new/xf86-video-vmware-10.16.2/src/vmwarevideo.c
--- old/xf86-video-vmware-10.16.0/src/vmwarevideo.c 2008-03-19 15:31:32.000000000 +0100
+++ new/xf86-video-vmware-10.16.2/src/vmwarevideo.c 2008-04-22 21:05:18.000000000 +0200
@@ -45,10 +45,6 @@
#include "svga_overlay.h"
#include
-/*
- * Need this to figure out which prototype to use for XvPutImage
- */
-#include "xorgVersion.h"
#define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE)
@@ -170,7 +166,7 @@
/*
* Callback functions
*/
-#if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(7, 0, 0, 0, 0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(4, 0, 0, 0, 0)
+#ifdef HAVE_XORG_SERVER_1_0_99_901
static int vmwareXvPutImage(ScrnInfoPtr pScrn, short src_x, short src_y,
short drw_x, short drw_y, short src_w, short src_h,
short drw_w, short drw_h, int image,
@@ -224,7 +220,7 @@
/*
* Offscreen memory manager functions
*/
-static void vmwareOffscreenInit();
+static void vmwareOffscreenInit(void);
static VMWAREOffscreenPtr vmwareOffscreenAllocate(VMWAREPtr pVMWARE,
uint32 size);
static void vmwareOffscreenFree(VMWAREOffscreenPtr memptr);
@@ -282,7 +278,7 @@
*/
static void
-vmwareOffscreenInit()
+vmwareOffscreenInit(void)
{
offscreenMgr.size = 0;
offscreenMgr.offset = 0;
@@ -415,7 +411,6 @@
Bool vmwareVideoInit(ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = infoFromScreen(pScreen);
- VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
XF86VideoAdaptorPtr *overlayAdaptors, *newAdaptors = NULL;
XF86VideoAdaptorPtr newAdaptor = NULL;
int numAdaptors;
@@ -615,7 +610,6 @@
unsigned char *buf, short width, short height)
{
VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
- ScreenPtr pScreen = pScrn->pScreen;
int i;
TRACEPOINT
@@ -970,7 +964,7 @@
*-----------------------------------------------------------------------------
*/
-#if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(7, 0, 0, 0, 0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(4, 0, 0, 0, 0)
+#ifdef HAVE_XORG_SERVER_1_0_99_901
static int vmwareXvPutImage(ScrnInfoPtr pScrn, short src_x, short src_y,
short drw_x, short drw_y, short src_w, short src_h,
short drw_w, short drw_h, int format,
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org