Hello community,
here is the log from the commit of package xorg-x11-driver-video
checked in at Thu Jul 5 00:20:36 CEST 2007.
--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-06-19 05:57:49.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-07-04 22:43:11.000000000 +0200
@@ -1,0 +2,25 @@
+Wed Jul 4 22:42:30 CEST 2007 - sndirsch@suse.de
+
+- xf86-video-nv.diff:
+ * Put the GPU into don't corrupt the framebuffer mode to work
+ around MacBook wackiness.
+
+-------------------------------------------------------------------
+Tue Jul 3 11:50:19 CEST 2007 - sndirsch@suse.de
+
+- updated to intel driver release 2.1.0
+
+-------------------------------------------------------------------
+Tue Jul 3 05:50:02 CEST 2007 - sndirsch@suse.de
+
+- updated nv driver to release 2.1.1
+- obsoletes xf86-video-nv.diff
+
+-------------------------------------------------------------------
+Mon Jul 2 22:15:07 CEST 2007 - sndirsch@suse.de
+
+- xf86-video-nv.diff:
+ * support for GeForce 8400M G
+ * Support configs with BAR1 < total RAM < 256 MB
+
+-------------------------------------------------------------------
Old:
----
xf86-video-intel-20070605.tar.bz2
xf86-video-nv-2.1.0.tar.bz2
New:
----
xf86-video-intel-2.1.0.tar.bz2
xf86-video-nv-2.1.1.tar.bz2
xf86-video-nv.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.u29599/_old 2007-07-05 00:19:20.000000000 +0200
+++ /var/tmp/diff_new_pack.u29599/_new 2007-07-05 00:19:20.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.2
-Release: 124
+Release: 126
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -40,7 +40,7 @@
Source15: xf86-video-neomagic-X11R7.1-1.1.1.tar.bz2
Source16: xf86-video-newport-0.2.1.tar.bz2
Source17: xf86-video-nsc-2.8.2.tar.bz2
-Source18: xf86-video-nv-2.1.0.tar.bz2
+Source18: xf86-video-nv-2.1.1.tar.bz2
Source19: xf86-video-rendition-4.1.3.tar.bz2
Source20: xf86-video-s3-0.5.0.tar.bz2
Source21: xf86-video-s3virge-X11R7.1-1.9.1.tar.bz2
@@ -67,13 +67,14 @@
Source42: xf86-video-voodoo-1.1.1.tar.bz2
Source43: xf86-video-impact-0.2.0.tar.bz2
Source44: HALlib-4.1.tar.gz
-Source45: xf86-video-intel-20070605.tar.bz2
+Source45: xf86-video-intel-2.1.0.tar.bz2
Source46: xf86-video-ati.randr12-20070603.tar.bz2
Source48: xf86-video-mga.randr12-20070417.tar.bz2
Patch: xf86-video-intel.diff
Patch1: radeon-xrandr-dotclock.diff
Patch2: radeon_dell.diff
Patch3: ps_nv.diff
+Patch4: xf86-video-nv.diff
Patch5: mga-g200se_pci-fix.diff
Patch9: xf86-video-sunffb.diff
Patch10: xf86-video-tdfx.diff
@@ -103,7 +104,7 @@
ln -snf mga.man xf86-video-mga.randr12/man/mgarandr12.man
%patch28
%patch30
-pushd xf86-video-intel
+pushd xf86-video-intel-*
%patch -p0
popd
pushd xf86-video-ati-*/src
@@ -120,6 +121,7 @@
popd
pushd xf86-video-nv-*/src
%patch3 -p6
+%patch4 -p2
popd
pushd xf86-video-mga-*/src
tar xzf %{SOURCE44}
@@ -155,7 +157,7 @@
pushd $dir
case $dir in
xf86-video-mga-* | \
- xf86-video-intel | \
+ xf86-video-intel-* | \
*.randr12 | \
xf86-video-nsc-*) autoreconf -fi ;;
*) ;;
@@ -264,6 +266,19 @@
%{_mandir}/man4/*
%changelog
+* Wed Jul 04 2007 - sndirsch@suse.de
+- xf86-video-nv.diff:
+ * Put the GPU into don't corrupt the framebuffer mode to work
+ around MacBook wackiness.
+* Tue Jul 03 2007 - sndirsch@suse.de
+- updated to intel driver release 2.1.0
+* Tue Jul 03 2007 - sndirsch@suse.de
+- updated nv driver to release 2.1.1
+- obsoletes xf86-video-nv.diff
+* Mon Jul 02 2007 - sndirsch@suse.de
+- xf86-video-nv.diff:
+ * support for GeForce 8400M G
+ * Support configs with BAR1 < total RAM < 256 MB
* Tue Jun 19 2007 - sndirsch@suse.de
- updated nv driver to release 2.1.0
* Fix some random colormap corruption on DFPs with certain
++++++ xf86-video-intel-20070605.tar.bz2 -> xf86-video-intel-2.1.0.tar.bz2 ++++++
++++ 59585 lines of diff (skipped)
++++++ xf86-video-nv-2.1.0.tar.bz2 -> xf86-video-nv-2.1.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-nv-2.1.0/ChangeLog new/xf86-video-nv-2.1.1/ChangeLog
--- old/xf86-video-nv-2.1.0/ChangeLog 2007-06-18 22:10:27.000000000 +0200
+++ new/xf86-video-nv-2.1.1/ChangeLog 2007-07-02 21:55:52.000000000 +0200
@@ -1,3 +1,21 @@
+commit 0f93ad0e2af26b4e2381f337b58d3a5e50302664
+Author: Aaron Plattner
+Date: Mon Jul 2 09:01:12 2007 -0700
+
+ Bump to 2.1.1.
+
+commit 4ff01787a6640bf76cc34a51c99227845dc4678e
+Author: Aaron Plattner
+Date: Sat Jun 30 21:52:08 2007 -0700
+
+ GeForce 8400M G.
+
+commit 63eb1a4aa402ac3bf117634c3c9270261c6a4258
+Author: Aaron Plattner
+Date: Sat Jun 30 21:51:15 2007 -0700
+
+ Support configs with BAR1 < total RAM < 256 MB.
+
commit 209c84e788faf3c4d0ce053e5f29ff5f5b798628
Author: Aaron Plattner
Date: Mon Jun 18 13:08:31 2007 -0700
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-nv-2.1.0/compat/modes/xf86RandR12.c new/xf86-video-nv-2.1.1/compat/modes/xf86RandR12.c
--- old/xf86-video-nv-2.1.0/compat/modes/xf86RandR12.c 2007-06-11 22:39:38.000000000 +0200
+++ new/xf86-video-nv-2.1.1/compat/modes/xf86RandR12.c 2007-06-27 19:06:16.000000000 +0200
@@ -96,9 +96,12 @@
}
/* Re-probe the outputs for new monitors or modes */
- xf86ProbeOutputModes (scrp, 0, 0);
- xf86SetScrnInfoModes (scrp);
- xf86DiDGAReInit (pScreen);
+ if (scrp->vtSema)
+ {
+ xf86ProbeOutputModes (scrp, 0, 0);
+ xf86SetScrnInfoModes (scrp);
+ xf86DiDGAReInit (pScreen);
+ }
for (mode = scrp->modes; ; mode = mode->next)
{
@@ -794,6 +797,9 @@
if (crtc->funcs->gamma_set == NULL)
return FALSE;
+ if (!crtc->scrn->vtSema)
+ return TRUE;
+
crtc->funcs->gamma_set(crtc, randr_crtc->gammaRed, randr_crtc->gammaGreen,
randr_crtc->gammaBlue, randr_crtc->gammaSize);
@@ -814,6 +820,11 @@
if (output->funcs->set_property == NULL)
return TRUE;
+ /*
+ * This function gets called even when vtSema is FALSE, as
+ * drivers will need to remember the correct value to apply
+ * when the VT switch occurs
+ */
return output->funcs->set_property(output, property, value);
}
@@ -827,6 +838,11 @@
DisplayModeRec mode;
xf86RandRModeConvert (pScrn, randr_mode, &mode);
+ /*
+ * This function may be called when vtSema is FALSE, so
+ * the underlying function must either avoid touching the hardware
+ * or return FALSE when vtSema is FALSE
+ */
if (output->funcs->mode_valid (output, &mode) != MODE_OK)
return FALSE;
return TRUE;
@@ -988,6 +1004,8 @@
{
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ if (!pScrn->vtSema)
+ return TRUE;
xf86ProbeOutputModes (pScrn, 0, 0);
xf86SetScrnInfoModes (pScrn);
xf86DiDGAReInit (pScreen);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-nv-2.1.0/configure new/xf86-video-nv-2.1.1/configure
--- old/xf86-video-nv-2.1.0/configure 2007-06-18 21:37:48.000000000 +0200
+++ new/xf86-video-nv-2.1.1/configure 2007-07-02 18:00:23.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-nv 2.1.0.
+# Generated by GNU Autoconf 2.61 for xf86-video-nv 2.1.1.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='xf86-video-nv'
PACKAGE_TARNAME='xf86-video-nv'
-PACKAGE_VERSION='2.1.0'
-PACKAGE_STRING='xf86-video-nv 2.1.0'
+PACKAGE_VERSION='2.1.1'
+PACKAGE_STRING='xf86-video-nv 2.1.1'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1418,7 +1418,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-nv 2.1.0 to adapt to many kinds of systems.
+\`configure' configures xf86-video-nv 2.1.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1488,7 +1488,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-nv 2.1.0:";;
+ short | recursive ) echo "Configuration of xf86-video-nv 2.1.1:";;
esac
cat <<\_ACEOF
@@ -1602,7 +1602,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-nv configure 2.1.0
+xf86-video-nv configure 2.1.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1616,7 +1616,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-nv $as_me 2.1.0, which was
+It was created by xf86-video-nv $as_me 2.1.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2311,7 +2311,7 @@
# Define the identity of the package.
PACKAGE='xf86-video-nv'
- VERSION='2.1.0'
+ VERSION='2.1.1'
cat >>confdefs.h <<_ACEOF
@@ -21554,7 +21554,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-nv $as_me 2.1.0, which was
+This file was extended by xf86-video-nv $as_me 2.1.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21607,7 +21607,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-video-nv config.status 2.1.0
+xf86-video-nv config.status 2.1.1
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-nv-2.1.0/configure.ac new/xf86-video-nv-2.1.1/configure.ac
--- old/xf86-video-nv-2.1.0/configure.ac 2007-06-18 21:37:37.000000000 +0200
+++ new/xf86-video-nv-2.1.1/configure.ac 2007-07-02 18:00:14.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-nv],
- 2.1.0,
+ 2.1.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-nv)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-nv-2.1.0/src/g80_driver.c new/xf86-video-nv-2.1.1/src/g80_driver.c
--- old/xf86-video-nv-2.1.0/src/g80_driver.c 2007-05-16 23:37:10.000000000 +0200
+++ new/xf86-video-nv-2.1.1/src/g80_driver.c 2007-07-02 18:00:05.000000000 +0200
@@ -194,6 +194,7 @@
const Gamma gzeros = {0.0, 0.0, 0.0};
char *s;
CARD32 tmp;
+ memType BAR1sizeKB;
if(flags & PROBE_DETECT) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -341,18 +342,35 @@
pNv->architecture = pNv->reg[0] >> 20 & 0x1ff;
pNv->RamAmountKBytes = pNv->RamAmountKBytes = (pNv->reg[0x0010020C/4] & 0xFFF00000) >> 10;
pNv->videoRam = pNv->RamAmountKBytes;
- /* Limit videoRam to the max BAR1 size of 256MB */
- if(pNv->videoRam <= 1024) {
+
+ /* Determine the size of BAR1 */
+ /* Some configs have BAR1 < total RAM < 256 MB */
+ BAR1sizeKB = 1UL << (pPci->size[1] - 10);
+ if(BAR1sizeKB > 256 * 1024) {
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "BAR1 is > 256 MB, which is "
+ "probably wrong. Clamping to 256 MB.\n");
+ BAR1sizeKB = 256 * 1024;
+ }
+
+ /* Limit videoRam to the size of BAR1 */
+ if(pNv->videoRam <= 1024 || BAR1sizeKB == 0) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to determine the amount of "
"available video memory\n");
goto fail;
}
pNv->videoRam -= 1024;
- if(pNv->videoRam > 256 * 1024)
- pNv->videoRam = 256 * 1024;
+ if(pNv->videoRam > BAR1sizeKB)
+ pNv->videoRam = BAR1sizeKB;
+
pScrn->videoRam = pNv->videoRam;
- xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Mapping %.1f of %.1f MB of video RAM\n",
- pScrn->videoRam / 1024.0, pNv->RamAmountKBytes / 1024.0);
+
+ xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Total video RAM: %.1f MB\n",
+ pNv->RamAmountKBytes / 1024.0);
+ xf86DrvMsg(pScrn->scrnIndex, X_PROBED, " BAR1 size: %.1f MB\n",
+ BAR1sizeKB / 1024.0);
+ xf86DrvMsg(pScrn->scrnIndex, X_PROBED, " Mapped memory: %.1f MB\n",
+ pScrn->videoRam / 1024.0);
+
pNv->mem = xf86MapPciMem(pScrn->scrnIndex,
VIDMEM_MMIO | VIDMEM_READSIDEEFFECT,
pcitag, pPci->memBase[1], pScrn->videoRam * 1024);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-nv-2.1.0/src/nv_driver.c new/xf86-video-nv-2.1.1/src/nv_driver.c
--- old/xf86-video-nv-2.1.0/src/nv_driver.c 2007-06-06 02:01:45.000000000 +0200
+++ new/xf86-video-nv-2.1.1/src/nv_driver.c 2007-07-02 18:00:05.000000000 +0200
@@ -347,6 +347,7 @@
{ 0x10DE0421, "GeForce 8500 GT" },
{ 0x10DE0422, "GeForce 8400 GS" },
{ 0x10DE0423, "GeForce 8300 GS" },
+ { 0x10DE0428, "GeForce 8400M G" },
{-1, NULL}
};
++++++ xf86-video-nv.diff ++++++
src/g80_driver.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletion(-)
New commits:
diff-tree bc439899f323410b0549068cd88348e7fb62866b (from 0f93ad0e2af26b4e2381f337b58d3a5e50302664)
Author: Aaron Plattner
Date: Tue Jul 3 14:03:59 2007 -0700
Put the GPU into don't corrupt the framebuffer mode to work around MacBook wackiness.
diff --git a/src/g80_driver.c b/src/g80_driver.c
index e703ea8..0f97a2d 100644
--- a/src/g80_driver.c
+++ b/src/g80_driver.c
@@ -769,7 +769,7 @@ G80ScreenInit(int scrnIndex, ScreenPtr p
ScrnInfoPtr pScrn;
G80Ptr pNv;
CARD32 pitch;
- int visualMask;
+ int visualMask, i;
BoxRec AvailFBArea;
/* First get the ScrnInfoRec */
@@ -829,6 +829,9 @@ G80ScreenInit(int scrnIndex, ScreenPtr p
AvailFBArea.y2 = pNv->offscreenHeight;
xf86InitFBManager(pScreen, &AvailFBArea);
+ for(i = 0; i < 8; i++)
+ pNv->reg[0x00001900/4 + i] = 0;
+
if(!pNv->NoAccel) {
G80InitHW(pScrn);
switch(pNv->AccelMethod) {
_______________________________________________
xorg-commit mailing list
xorg-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/xorg-commit
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org