rpms/xorg-x11-drv-nv/devel nv-1.1.1-nv34-tweaks.patch, NONE, 1.1 xorg-x11-drv-nv.spec, 1.16, 1.17

[fedora-cvs-commits at redhat.com]

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-nv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8948

Modified Files:
	xorg-x11-drv-nv.spec 
Added Files:
	nv-1.1.1-nv34-tweaks.patch 
Log Message:
- Fix the panel tweak for a Toshiba laptop.


nv-1.1.1-nv34-tweaks.patch:
 nv_dac.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE nv-1.1.1-nv34-tweaks.patch ---
--- xf86-video-nv-1.1.1/src/nv_dac.c.nv34-tweak	2006-06-14 14:26:46.000000000 -0400
+++ xf86-video-nv-1.1.1/src/nv_dac.c	2006-06-14 14:38:20.000000000 -0400
@@ -60,8 +60,14 @@
           we can do is experiment and apply hacks. */
 
        if(((pNv->Chipset & 0xffff) == 0x0328) && (state->bpp == 32)) {
-          /* At least one NV34 laptop needs this workaround. */
-          tweak = -1;
+          if (((pNv->PciInfo->subsysVendor & 0xffff) == 0x1179) &&
+              ((pNv->PciInfo->subsysCard & 0xffff) == 0x0020)) {
+             /* Toshiba Tecra M2 */
+             tweak = 1;
+          } else {
+             /* At least one NV34 laptop needs this workaround. */
+             tweak = -1;
+          }
        }
 
        if((pNv->Chipset & 0xfff0) == 0x0310) {


Index: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/devel/xorg-x11-drv-nv.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-drv-nv.spec	10 Jun 2006 08:01:50 -0000	1.16
+++ xorg-x11-drv-nv.spec	14 Jun 2006 23:03:31 -0000	1.17
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   1.1.1
-Release:   4
+Release:   5
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   nv.xinf
@@ -22,12 +22,16 @@
 
 Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
+Patch0:    nv-1.1.1-nv34-tweaks.patch
+
 %description 
 X.Org X11 nv video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
 
+%patch0 -p1 -b .nv34-tweak
+
 %build
 %configure --disable-static
 make
@@ -58,6 +62,9 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Wed Jun 14 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-5
+- Fix the panel tweak for a Toshiba laptop.
+
 * Sat Jun 10 2006 Mike A. Harris <mharris at redhat.com> 1.1.1-4
 - Added 10DE:0184 to nv.xinf, although the driver is not currently aware of
   this specific chip ID, the fallback code appears to work in bug #(186343)