rpms/xorg-x11-drv-nv/devel nv-1.1.1-nv34-tweaks.patch, 1.1, 1.2 xorg-x11-drv-nv.spec, 1.76, 1.77

[Daniel Williams]

Author: dcbw

Update of /cvs/pkgs/rpms/xorg-x11-drv-nv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25264

Modified Files:
	nv-1.1.1-nv34-tweaks.patch xorg-x11-drv-nv.spec 
Log Message:
* Tue Sep 30 2008 Dan Williams <dcbw at redhat.com> 2.1.12-5
- Port Toshiba Tecra M2 NV34 panel tweak to pciaccess



nv-1.1.1-nv34-tweaks.patch:

Index: nv-1.1.1-nv34-tweaks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/nv-1.1.1-nv34-tweaks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nv-1.1.1-nv34-tweaks.patch	14 Jun 2006 23:03:31 -0000	1.1
+++ nv-1.1.1-nv34-tweaks.patch	30 Sep 2008 13:33:13 -0000	1.2
@@ -1,13 +1,21 @@
---- 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 @@
+diff -up xf86-video-nv-2.1.12/src/nv_dac.c.nv34-tweak xf86-video-nv-2.1.12/src/nv_dac.c
+--- xf86-video-nv-2.1.12/src/nv_dac.c.nv34-tweak	2008-07-24 20:48:51.000000000 -0400
++++ xf86-video-nv-2.1.12/src/nv_dac.c	2008-09-30 09:28:08.000000000 -0400
+@@ -42,8 +42,21 @@ NVDACPanelTweaks(NVPtr pNv, NVRegPtr sta
            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 XSERVER_LIBPCIACCESS
++          if (((pNv->PciInfo->subvendor_id & 0xffff) == 0x1179) &&
++              ((pNv->PciInfo->subdevice_id & 0xffff) == 0x0020))
++#else
 +          if (((pNv->PciInfo->subsysVendor & 0xffff) == 0x1179) &&
-+              ((pNv->PciInfo->subsysCard & 0xffff) == 0x0020)) {
++              ((pNv->PciInfo->subsysCard & 0xffff) == 0x0020))
++#endif
++          {
++
 +             /* Toshiba Tecra M2 */
 +             tweak = 1;
 +          } else {


Index: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/xorg-x11-drv-nv.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- xorg-x11-drv-nv.spec	11 Sep 2008 17:29:59 -0000	1.76
+++ xorg-x11-drv-nv.spec	30 Sep 2008 13:33:13 -0000	1.77
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   2.1.12
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -37,8 +37,7 @@
 %prep
 %setup -q -n %{tarball}-%{version}
 
-# disable for now, needs porting to pciaccess
-#patch0 -p1 -b .nv34-tweak
+%patch0 -p1 -b .nv34-tweak
 %patch4 -p1 -b .reserve-fbarea
 %patch5 -p1 -b .starve
 %patch6 -p1 -b .panel
@@ -69,6 +68,9 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Tue Sep 30 2008 Dan Williams <dcbw at redhat.com> 2.1.12-5
+- Port Toshiba Tecra M2 NV34 panel tweak to pciaccess
+
 * Thu Sep 11 2008 Soren Sandmann <sandmann at redhat.com> 2.1.12-4
 - Remove fb size hack since there is a fix in the server now.