Hello community,
here is the log from the commit of package xorg-x11-driver-video
checked in at Tue Jul 10 23:53:05 CEST 2007.
--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-07-09 21:33:02.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-07-10 21:39:30.878001000 +0200
@@ -1,0 +2,19 @@
+Tue Jul 10 21:38:36 CEST 2007 - sndirsch@suse.de
+
+- xf86-video-nv.diff:
+ * Bug #4686: Fix a minor GeForceFX + flatpanel + video overlay
+ corruption issue. This change was originally in XFree86 CVS,
+ nv_dac.c version 1.36 but got reverted accidentally.
+
+-------------------------------------------------------------------
+Tue Jul 10 20:51:36 CEST 2007 - sndirsch@suse.de
+
+- updated nv driver to release 2.1.2
+ * This release fixes the LVDS display on certain MacBooks and
+ laptops with certain native flat panel modes (typically
+ 1440x900). It also adds a "dither" RandR 1.2 output property
+ and a corresponding "FPDither" xorg.conf option for 6-bit flat
+ panels.
+- obsoletes xf86-video-nv.diff
+
+-------------------------------------------------------------------
Old:
----
xf86-video-nv-2.1.1.tar.bz2
New:
----
xf86-video-nv-2.1.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.E29229/_old 2007-07-10 23:52:02.000000000 +0200
+++ /var/tmp/diff_new_pack.E29229/_new 2007-07-10 23:52:02.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: 128
+Release: 129
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.1.tar.bz2
+Source18: xf86-video-nv-2.1.2.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
@@ -266,6 +266,19 @@
%{_mandir}/man4/*
%changelog
+* Tue Jul 10 2007 - sndirsch@suse.de
+- xf86-video-nv.diff:
+ * Bug #4686: Fix a minor GeForceFX + flatpanel + video overlay
+ corruption issue. This change was originally in XFree86 CVS,
+ nv_dac.c version 1.36 but got reverted accidentally.
+* Tue Jul 10 2007 - sndirsch@suse.de
+- updated nv driver to release 2.1.2
+ * This release fixes the LVDS display on certain MacBooks and
+ laptops with certain native flat panel modes (typically
+ 1440x900). It also adds a "dither" RandR 1.2 output property
+ and a corresponding "FPDither" xorg.conf option for 6-bit flat
+ panels.
+- obsoletes xf86-video-nv.diff
* Mon Jul 09 2007 - sndirsch@suse.de
- xf86-video-nv.diff
* support for GeForce 8600M GT
++++++ xf86-video-nv-2.1.1.tar.bz2 -> xf86-video-nv-2.1.2.tar.bz2 ++++++
++++ 4468 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-nv-2.1.1/ChangeLog new/xf86-video-nv-2.1.2/ChangeLog
--- old/xf86-video-nv-2.1.1/ChangeLog 2007-07-02 21:55:52.000000000 +0200
+++ new/xf86-video-nv-2.1.2/ChangeLog 2007-07-10 19:00:37.000000000 +0200
@@ -1,3 +1,42 @@
+commit 493822998184a1d79d6774686983cbd41930f253
+Author: Aaron Plattner
+Date: Tue Jul 10 09:58:46 2007 -0700
+
+ Bump to 2.1.2.
+
+commit d0d4e37accc697108e03c2ee7fdc0edf1f309620
+Author: Aaron Plattner
+Date: Tue Jul 10 09:48:19 2007 -0700
+
+ More GeForce 8 series mobile chips.
+
+commit e77a2d9b62bc65062e7e2167642be5ab75ac4864
+Author: Aaron Plattner
+Date: Tue Jul 10 00:41:21 2007 -0700
+
+ G80: Add a dithering property and corresponding config file option.
+
+commit c1503c864d495f8a3e5380fed5cb8ca5e21a3750
+Author: Aaron Plattner
+Date: Sun Jul 8 01:28:42 2007 -0700
+
+ GeForce 8600M GT.
+
+commit 42dffde988176a3f85b0586ecb8d672b74050760
+Author: Aaron Plattner
+Date: Sun Jul 8 00:53:00 2007 -0700
+
+ Work around more MacBook wackiness.
+
+ Turn off more corrupt the framebuffer mode. Don't mess with the pixel clock for
+ LVDS as long as we're trusting the VBIOS-programmed timings.
+
+commit bc439899f323410b0549068cd88348e7fb62866b
+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.
+
commit 0f93ad0e2af26b4e2381f337b58d3a5e50302664
Author: Aaron Plattner
Date: Mon Jul 2 09:01:12 2007 -0700
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-nv-2.1.1/compat/modes/xf86EdidModes.c new/xf86-video-nv-2.1.2/compat/modes/xf86EdidModes.c
--- old/xf86-video-nv-2.1.1/compat/modes/xf86EdidModes.c 2007-06-12 21:37:52.000000000 +0200
+++ new/xf86-video-nv-2.1.2/compat/modes/xf86EdidModes.c 2007-07-06 00:38:47.000000000 +0200
@@ -22,8 +22,9 @@
*/
/**
- * @file This is a copy of edid_modes.c from the X Server, for compatibility
- * with old X Servers.
+ * @file This file covers code to convert a xf86MonPtr containing EDID-probed
+ * information into a list of modes, including applying monitor-specific
+ * quirks to fix broken EDID data.
*/
#ifdef HAVE_XORG_CONFIG_H
#include
@@ -91,11 +92,16 @@
DDC->vendor.prod_id == 44358)
return TRUE;
- /* Samsung SyncMaster 226BW */
+ /* Bug #10814: Samsung SyncMaster 225BW */
+ if (memcmp (DDC->vendor.name, "SAM", 4) == 0 &&
+ DDC->vendor.prod_id == 596)
+ return TRUE;
+
+ /* Bug #10545: Samsung SyncMaster 226BW */
if (memcmp (DDC->vendor.name, "SAM", 4) == 0 &&
DDC->vendor.prod_id == 638)
return TRUE;
-
+
return FALSE;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-nv-2.1.1/compat/modes/xf86Modes.c new/xf86-video-nv-2.1.2/compat/modes/xf86Modes.c
--- old/xf86-video-nv-2.1.1/compat/modes/xf86Modes.c 2007-05-16 23:37:59.000000000 +0200
+++ new/xf86-video-nv-2.1.2/compat/modes/xf86Modes.c 2007-07-06 00:38:47.000000000 +0200
@@ -1,6 +1,3 @@
-/* -*- c-basic-offset: 4 -*- */
-/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Mode.c,v 1.10 2006/03/07 16:00:57 libv Exp $ */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.69 2003/10/08 14:58:28 dawes Exp $ */
/*
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
*
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-nv-2.1.1/compat/modes/xf86RandR12.c new/xf86-video-nv-2.1.2/compat/modes/xf86RandR12.c
--- old/xf86-video-nv-2.1.1/compat/modes/xf86RandR12.c 2007-06-27 19:06:16.000000000 +0200
+++ new/xf86-video-nv-2.1.2/compat/modes/xf86RandR12.c 2007-07-06 00:38:47.000000000 +0200
@@ -1,7 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.3 2004/07/30 21:53:09 eich Exp $ */
/*
- * $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.7tsi Exp $
- *
* Copyright � 2002 Keith Packard, member of The XFree86 Project, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
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-nv-2.1.1/configure.ac new/xf86-video-nv-2.1.2/configure.ac
--- old/xf86-video-nv-2.1.1/configure.ac 2007-07-02 18:00:14.000000000 +0200
+++ new/xf86-video-nv-2.1.2/configure.ac 2007-07-10 18:58:42.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-nv],
- 2.1.1,
+ 2.1.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-nv)
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-nv-2.1.1/man/nv.man new/xf86-video-nv-2.1.2/man/nv.man
--- old/xf86-video-nv-2.1.1/man/nv.man 2007-05-16 23:37:10.000000000 +0200
+++ new/xf86-video-nv-2.1.2/man/nv.man 2007-07-10 10:51:38.000000000 +0200
@@ -157,6 +157,11 @@
.B Option \*qMigrationHeuristic\*q \*qgreedy\*q
to improve performance.
Default: XAA.
+.TP
+.BI "Option \*qFPDither\*q \*q" boolean \*q
+Enable or disable flat panel dithering by default.
+Dithering can also be enabled or disabled using the RandR 1.2 \*qdither\*q output property.
+Default: off.
.\" ******************** end G80 section ********************
.
.SH "SEE ALSO"
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-nv-2.1.1/src/g80_display.c new/xf86-video-nv-2.1.2/src/g80_display.c
--- old/xf86-video-nv-2.1.1/src/g80_display.c 2007-06-20 08:23:02.000000000 +0200
+++ new/xf86-video-nv-2.1.2/src/g80_display.c 2007-07-10 10:51:38.000000000 +0200
@@ -41,6 +41,7 @@
int pclk; /* Target pixel clock in kHz */
Bool cursorVisible;
Bool skipModeFixup;
+ Bool dither;
} G80CrtcPrivRec, *G80CrtcPrivPtr;
static void G80CrtcShowHideCursor(xf86CrtcPtr crtc, Bool show, Bool update);
@@ -362,6 +363,7 @@
case 16: C(0x00000870 + headOff, 0xE800); break;
case 24: C(0x00000870 + headOff, 0xCF00); break;
}
+ G80CrtcSetDither(crtc, pPriv->dither, FALSE);
if((adjusted_mode->Flags & V_DBLSCAN) || (adjusted_mode->Flags & V_INTERLACE) ||
adjusted_mode->CrtcHDisplay != HDisplay || adjusted_mode->CrtcVDisplay != VDisplay) {
C(0x000008A4 + headOff, 9);
@@ -478,6 +480,19 @@
pPriv->skipModeFixup = TRUE;
}
+void
+G80CrtcSetDither(xf86CrtcPtr crtc, Bool dither, Bool update)
+{
+ ScrnInfoPtr pScrn = crtc->scrn;
+ G80CrtcPrivPtr pPriv = crtc->driver_private;
+ const int headOff = 0x400 * G80CrtcGetHead(crtc);
+
+ pPriv->dither = dither;
+
+ C(0x000008A0 + headOff, dither ? 0x11 : 0);
+ if(update) C(0x00000080, 0);
+}
+
static void
G80CrtcCommit(xf86CrtcPtr crtc)
{
@@ -524,6 +539,7 @@
void
G80DispCreateCrtcs(ScrnInfoPtr pScrn)
{
+ G80Ptr pNv = G80PTR(pScrn);
Head head;
xf86CrtcPtr crtc;
G80CrtcPrivPtr g80_crtc;
@@ -535,6 +551,7 @@
g80_crtc = xnfcalloc(sizeof(*g80_crtc), 1);
g80_crtc->head = head;
+ g80_crtc->dither = pNv->Dither;
crtc->driver_private = g80_crtc;
}
}
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-nv-2.1.1/src/g80_display.h new/xf86-video-nv-2.1.2/src/g80_display.h
--- old/xf86-video-nv-2.1.1/src/g80_display.h 2007-06-06 02:01:46.000000000 +0200
+++ new/xf86-video-nv-2.1.2/src/g80_display.h 2007-07-10 10:51:38.000000000 +0200
@@ -12,5 +12,6 @@
void G80CrtcDisableCursor(xf86CrtcPtr, Bool update);
void G80CrtcSetCursorPosition(xf86CrtcPtr, int x, int y);
void G80CrtcSkipModeFixup(xf86CrtcPtr);
+void G80CrtcSetDither(xf86CrtcPtr, Bool dither, Bool update);
void G80DispCreateCrtcs(ScrnInfoPtr pScrn);
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-nv-2.1.1/src/g80_driver.c new/xf86-video-nv-2.1.2/src/g80_driver.c
--- old/xf86-video-nv-2.1.1/src/g80_driver.c 2007-07-02 18:00:05.000000000 +0200
+++ new/xf86-video-nv-2.1.2/src/g80_driver.c 2007-07-10 10:51:38.000000000 +0200
@@ -105,12 +105,14 @@
OPTION_HW_CURSOR,
OPTION_NOACCEL,
OPTION_ACCEL_METHOD,
+ OPTION_FP_DITHER,
} G80Opts;
static const OptionInfoRec G80Options[] = {
{ OPTION_HW_CURSOR, "HWCursor", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_NOACCEL, "NoAccel", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_ACCEL_METHOD, "AccelMethod", OPTV_STRING, {0}, FALSE },
+ { OPTION_FP_DITHER, "FPDither", OPTV_BOOLEAN, {0}, FALSE },
{ -1, NULL, OPTV_NONE, {0}, FALSE }
};
@@ -313,6 +315,8 @@
goto fail;
}
+ pNv->Dither = xf86ReturnOptValBool(pNv->Options, OPTION_FP_DITHER, FALSE);
+
/* Set the bits per RGB for 8bpp mode */
if(pScrn->depth == 8)
pScrn->rgbBits = 8;
@@ -769,7 +773,7 @@
ScrnInfoPtr pScrn;
G80Ptr pNv;
CARD32 pitch;
- int visualMask;
+ int visualMask, i;
BoxRec AvailFBArea;
/* First get the ScrnInfoRec */
@@ -829,6 +833,10 @@
AvailFBArea.y2 = pNv->offscreenHeight;
xf86InitFBManager(pScreen, &AvailFBArea);
+ pNv->reg[0x00001708/4] = 0;
+ for(i = 0; i < 8; i++)
+ pNv->reg[0x00001900/4 + i] = 0;
+
if(!pNv->NoAccel) {
G80InitHW(pScrn);
switch(pNv->AccelMethod) {
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-nv-2.1.1/src/g80_output.c new/xf86-video-nv-2.1.2/src/g80_output.c
--- old/xf86-video-nv-2.1.1/src/g80_output.c 2007-06-08 03:24:42.000000000 +0200
+++ new/xf86-video-nv-2.1.2/src/g80_output.c 2007-07-08 10:49:28.000000000 +0200
@@ -158,7 +158,8 @@
G80OutputSetPClk(xf86OutputPtr output, int pclk)
{
G80OutputPrivPtr pPriv = output->driver_private;
- pPriv->set_pclk(output, pclk);
+ if(pPriv->set_pclk)
+ pPriv->set_pclk(output, pclk);
}
int
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-nv-2.1.1/src/g80_sor.c new/xf86-video-nv-2.1.2/src/g80_sor.c
--- old/xf86-video-nv-2.1.1/src/g80_sor.c 2007-06-08 03:24:20.000000000 +0200
+++ new/xf86-video-nv-2.1.2/src/g80_sor.c 2007-07-10 10:51:38.000000000 +0200
@@ -27,6 +27,7 @@
#define DPMS_SERVER
#include
+#include
#include "g80_type.h"
#include "g80_display.h"
@@ -38,7 +39,7 @@
G80Ptr pNv = G80PTR(output->scrn);
G80OutputPrivPtr pPriv = output->driver_private;
const int orOff = 0x800 * pPriv->or;
- const int limit = pPriv->panelType == LVDS ? 112000 : 165000;
+ const int limit = 165000;
pNv->reg[(0x00614300+orOff)/4] = (pclk > limit) ? 0x101 : 0;
}
@@ -200,6 +201,67 @@
return xf86DuplicateMode(pPriv->nativeMode);
}
+#ifdef RANDR_12_INTERFACE
+#define MAKE_ATOM(a) MakeAtom((a), sizeof(a) - 1, TRUE);
+
+struct property {
+ Atom atom;
+ INT32 range[2];
+};
+
+static struct {
+ struct property dither;
+} properties;
+
+static void
+G80SorCreateResources(xf86OutputPtr output)
+{
+ ScrnInfoPtr pScrn = output->scrn;
+ G80Ptr pNv = G80PTR(pScrn);
+ int data, err;
+
+ properties.dither.atom = MAKE_ATOM("dither");
+ properties.dither.range[0] = 0;
+ properties.dither.range[1] = 1;
+ err = RRConfigureOutputProperty(output->randr_output,
+ properties.dither.atom, FALSE, TRUE, FALSE,
+ 2, properties.dither.range);
+ if(err)
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ "Failed to configure dithering property for %s: error %d\n",
+ output->name, err);
+
+ // Set the default value
+ data = pNv->Dither;
+ err = RRChangeOutputProperty(output->randr_output, properties.dither.atom,
+ XA_INTEGER, 32, PropModeReplace, 1, &data,
+ FALSE, FALSE);
+ if(err)
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ "Failed to set dithering property for %s: error %d\n",
+ output->name, err);
+}
+
+static Bool
+G80SorSetProperty(xf86OutputPtr output, Atom prop, RRPropertyValuePtr val)
+{
+ if(prop == properties.dither.atom) {
+ INT32 i;
+
+ if(val->type != XA_INTEGER || val->format != 32 || val->size != 1)
+ return FALSE;
+
+ i = *(INT32*)val->data;
+ if(i < properties.dither.range[0] || i > properties.dither.range[1])
+ return FALSE;
+
+ G80CrtcSetDither(output->crtc, i, TRUE);
+ }
+
+ return TRUE;
+}
+#endif // RANDR_12_INTERFACE
+
static const xf86OutputFuncsRec G80SorTMDSOutputFuncs = {
.dpms = G80SorDPMSSet,
.save = NULL,
@@ -211,6 +273,10 @@
.mode_set = G80SorModeSet,
.detect = G80SorDetect,
.get_modes = G80OutputGetDDCModes,
+#ifdef RANDR_12_INTERFACE
+ .create_resources = G80SorCreateResources,
+ .set_property = G80SorSetProperty,
+#endif
.destroy = G80SorDestroy,
};
@@ -225,6 +291,10 @@
.mode_set = G80SorModeSet,
.detect = G80SorLVDSDetect,
.get_modes = G80SorGetLVDSModes,
+#ifdef RANDR_12_INTERFACE
+ .create_resources = G80SorCreateResources,
+ .set_property = G80SorSetProperty,
+#endif
.destroy = G80SorDestroy,
};
@@ -284,7 +354,8 @@
pPriv->or = or;
pPriv->panelType = panelType;
pPriv->cached_status = XF86OutputStatusUnknown;
- pPriv->set_pclk = G80SorSetPClk;
+ if(panelType == TMDS)
+ pPriv->set_pclk = G80SorSetPClk;
output->driver_private = pPriv;
output->interlaceAllowed = TRUE;
output->doubleScanAllowed = 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-nv-2.1.1/src/g80_type.h new/xf86-video-nv-2.1.2/src/g80_type.h
--- old/xf86-video-nv-2.1.1/src/g80_type.h 2007-06-06 02:01:46.000000000 +0200
+++ new/xf86-video-nv-2.1.2/src/g80_type.h 2007-07-10 10:51:38.000000000 +0200
@@ -59,6 +59,7 @@
Bool HWCursor;
Bool NoAccel;
AccelMethod AccelMethod;
+ Bool Dither;
/* XAA */
XAAInfoRecPtr xaa;
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-nv-2.1.1/src/nv_driver.c new/xf86-video-nv-2.1.2/src/nv_driver.c
--- old/xf86-video-nv-2.1.1/src/nv_driver.c 2007-07-02 18:00:05.000000000 +0200
+++ new/xf86-video-nv-2.1.2/src/nv_driver.c 2007-07-10 18:56:33.000000000 +0200
@@ -344,10 +344,18 @@
{ 0x10DE019E, "Quadro FX 4600" },
{ 0x10DE0400, "GeForce 8600 GTS" },
{ 0x10DE0402, "GeForce 8600 GT" },
+ { 0x10DE0407, "GeForce 8600M GT" },
+ { 0x10DE040B, "Quadro NVS 320M" },
{ 0x10DE0421, "GeForce 8500 GT" },
{ 0x10DE0422, "GeForce 8400 GS" },
{ 0x10DE0423, "GeForce 8300 GS" },
+ { 0x10DE0425, "GeForce 8600M GS" },
+ { 0x10DE0426, "GeForce 8400M GT" },
+ { 0x10DE0427, "GeForce 8400M GS" },
{ 0x10DE0428, "GeForce 8400M G" },
+ { 0x10DE0429, "Quadro NVS 140M" },
+ { 0x10DE042A, "Quadro NVS 130M" },
+ { 0x10DE042B, "Quadro NVS 135M" },
{-1, NULL}
};
++++++ xf86-video-nv.diff ++++++
--- /var/tmp/diff_new_pack.E29229/_old 2007-07-10 23:52:04.000000000 +0200
+++ /var/tmp/diff_new_pack.E29229/_new 2007-07-10 23:52:04.000000000 +0200
@@ -1,123 +1,31 @@
- src/g80_driver.c | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletion(-)
+ src/nv_dac.c | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletion(-)
New commits:
-diff-tree bc439899f323410b0549068cd88348e7fb62866b (from 0f93ad0e2af26b4e2381f337b58d3a5e50302664)
+diff-tree ec78618d685759a39d386e9929661037b167fe68 (from 493822998184a1d79d6774686983cbd41930f253)
Author: Aaron Plattner
-Date: Tue Jul 3 14:03:59 2007 -0700
+Date: Tue Jul 10 11:54:33 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
- src/g80_driver.c | 1 +
- src/g80_output.c | 3 ++-
- src/g80_sor.c | 5 +++--
- src/nv_driver.c | 1 +
- 4 files changed, 7 insertions(+), 3 deletions(-)
-
-New commits:
-diff-tree c1503c864d495f8a3e5380fed5cb8ca5e21a3750 (from 42dffde988176a3f85b0586ecb8d672b74050760)
-Author: Aaron Plattner
-Date: Sun Jul 8 01:28:42 2007 -0700
-
- GeForce 8600M GT.
-
-diff --git a/src/nv_driver.c b/src/nv_driver.c
-index f0f119f..28c46d1 100644
---- a/src/nv_driver.c
-+++ b/src/nv_driver.c
-@@ -344,6 +344,7 @@ static SymTabRec NVKnownChipsets[] =
- { 0x10DE019E, "Quadro FX 4600" },
- { 0x10DE0400, "GeForce 8600 GTS" },
- { 0x10DE0402, "GeForce 8600 GT" },
-+ { 0x10DE0407, "GeForce 8600M GT" },
- { 0x10DE0421, "GeForce 8500 GT" },
- { 0x10DE0422, "GeForce 8400 GS" },
- { 0x10DE0423, "GeForce 8300 GS" },
-diff-tree 42dffde988176a3f85b0586ecb8d672b74050760 (from bc439899f323410b0549068cd88348e7fb62866b)
-Author: Aaron Plattner
-Date: Sun Jul 8 00:53:00 2007 -0700
-
- Work around more MacBook wackiness.
+ Bug #4686: Fix a minor GeForceFX + flatpanel + video overlay corruption issue.
- Turn off more corrupt the framebuffer mode. Don't mess with the pixel clock for
- LVDS as long as we're trusting the VBIOS-programmed timings.
+ This change was originally in XFree86 CVS, nv_dac.c version 1.36 but got
+ reverted accidentally.
-diff --git a/src/g80_driver.c b/src/g80_driver.c
-index 0f97a2d..7801602 100644
---- a/src/g80_driver.c
-+++ b/src/g80_driver.c
-@@ -829,6 +829,7 @@ G80ScreenInit(int scrnIndex, ScreenPtr p
- AvailFBArea.y2 = pNv->offscreenHeight;
- xf86InitFBManager(pScreen, &AvailFBArea);
-
-+ pNv->reg[0x00001708/4] = 0;
- for(i = 0; i < 8; i++)
- pNv->reg[0x00001900/4 + i] = 0;
-
-diff --git a/src/g80_output.c b/src/g80_output.c
-index 11bdb25..448864f 100644
---- a/src/g80_output.c
-+++ b/src/g80_output.c
-@@ -158,7 +158,8 @@ void
- G80OutputSetPClk(xf86OutputPtr output, int pclk)
- {
- G80OutputPrivPtr pPriv = output->driver_private;
-- pPriv->set_pclk(output, pclk);
-+ if(pPriv->set_pclk)
-+ pPriv->set_pclk(output, pclk);
- }
-
- int
-diff --git a/src/g80_sor.c b/src/g80_sor.c
-index 2ab9f2e..5ff7318 100644
---- a/src/g80_sor.c
-+++ b/src/g80_sor.c
-@@ -38,7 +38,7 @@ G80SorSetPClk(xf86OutputPtr output, int
- G80Ptr pNv = G80PTR(output->scrn);
- G80OutputPrivPtr pPriv = output->driver_private;
- const int orOff = 0x800 * pPriv->or;
-- const int limit = pPriv->panelType == LVDS ? 112000 : 165000;
-+ const int limit = 165000;
+diff --git a/src/nv_dac.c b/src/nv_dac.c
+index e1f0740..7e8340d 100644
+--- a/src/nv_dac.c
++++ b/src/nv_dac.c
+@@ -118,7 +118,9 @@ NVDACInit(ScrnInfoPtr pScrn, DisplayMode
+ vertBlankStart = vertStart;
+ horizStart = horizTotal - 5;
+ horizEnd = horizTotal - 2;
+- horizBlankEnd = horizTotal + 4;
++ horizBlankEnd = horizTotal + 4;
++ if(pNv->Architecture == NV_ARCH_30)
++ horizTotal += 2;
+ }
- pNv->reg[(0x00614300+orOff)/4] = (pclk > limit) ? 0x101 : 0;
- }
-@@ -284,7 +284,8 @@ G80CreateSor(ScrnInfoPtr pScrn, ORNum or
- pPriv->or = or;
- pPriv->panelType = panelType;
- pPriv->cached_status = XF86OutputStatusUnknown;
-- pPriv->set_pclk = G80SorSetPClk;
-+ if(panelType == TMDS)
-+ pPriv->set_pclk = G80SorSetPClk;
- output->driver_private = pPriv;
- output->interlaceAllowed = TRUE;
- output->doubleScanAllowed = TRUE;
+ pVga->CRTC[0x0] = Set8Bits(horizTotal);
_______________________________________________
xorg-commit mailing list
xorg-commit@lists.freedesktop.org
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org