rpms/nvidia-kmod/F-12 nvidia-kmod-no-vgaarb.patch, 1.2, 1.3 nvidia-kmod.spec, 1.75, 1.76 .cvsignore, 1.17, 1.18 sources, 1.17, 1.18

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/nvidia-kmod/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13037

Modified Files:
	nvidia-kmod.spec .cvsignore sources 
Added Files:
	nvidia-kmod-no-vgaarb.patch 
Log Message:
Revert to 190.xx version because of report:
http://www.nvnews.net/vbulletin/announcement.php?f=14


nvidia-kmod-no-vgaarb.patch:
 nv-linux.h |    3 +++
 nv.c.orig  |    5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

Index: nvidia-kmod-no-vgaarb.patch
===================================================================
RCS file: nvidia-kmod-no-vgaarb.patch
diff -N nvidia-kmod-no-vgaarb.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ nvidia-kmod-no-vgaarb.patch	8 Mar 2010 22:39:10 -0000	1.3
@@ -0,0 +1,57 @@
+*** usr/src/nv/nv-linux.h.orig	2009-11-22 19:27:38.000000000 -0800
+--- usr/src/nv/nv-linux.h	2009-12-16 11:02:22.000000000 -0800
+***************
+*** 83,102 ****
+--- 83,105 ----
+  
+  #if !defined(KERNEL_2_4)
+  #include <linux/sched.h>            /* suser(), capable() replacement   */
+  #include <linux/moduleparam.h>      /* module_param()                   */
+  #include <linux/smp_lock.h>         /* kernel_locked                    */
+  #include <asm/tlbflush.h>           /* flush_tlb(), flush_tlb_all()     */
+  #include <asm/kmap_types.h>         /* page table entry lookup          */
+  #endif
+  
+  #include <linux/pci.h>              /* pci_find_class, etc              */
++ #if defined(CONFIG_VGA_ARB)
++ #include <linux/vgaarb.h>           /* vga_set_legacy_decoding          */
++ #endif
+  #include <linux/interrupt.h>        /* tasklets, interrupt helpers      */
+  #include <linux/timer.h>
+  
+  #include <asm/div64.h>              /* do_div()                         */
+  #include <asm/system.h>             /* cli, sli, save_flags             */
+  #include <asm/io.h>                 /* ioremap, virt_to_phys            */
+  #include <asm/uaccess.h>            /* access_ok                        */
+  #include <asm/page.h>               /* PAGE_OFFSET                      */
+  #include <asm/pgtable.h>            /* pte bit definitions              */
+  
+*** usr/src/nv/nv.c.orig	2009-11-22 19:27:36.000000000 -0800
+--- usr/src/nv/nv.c	2009-12-16 11:02:54.000000000 -0800
+***************
+*** 724,743 ****
+--- 724,747 ----
+                  goto failed;
+              }
+  
+              entry->data = nv;
+              entry->read_proc = nv_kern_read_agpinfo;
+  #if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
+              entry->owner = THIS_MODULE;
+  #endif
+          }
+  
++ #if defined(CONFIG_VGA_ARB)
++         vga_set_legacy_decoding(dev, VGA_RSRC_NONE);
++ #endif
++ 
+          NV_PCI_DEV_PUT(dev);
+      }
+  
+      entry = create_proc_entry("version", flags, proc_nvidia);
+      if (!entry)
+          goto failed;
+  
+      entry->read_proc = nv_kern_read_version;
+  #if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
+      entry->owner = THIS_MODULE;


Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-12/nvidia-kmod.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- nvidia-kmod.spec	5 Mar 2010 17:54:54 -0000	1.75
+++ nvidia-kmod.spec	8 Mar 2010 22:39:10 -0000	1.76
@@ -6,9 +6,9 @@
 %define buildforkernels newest
 
 Name:          nvidia-kmod
-Version:       195.36.08
+Version:       190.53
 # Taken over by kmodtool
-Release:       1%{?dist}.3
+Release:       1%{?dist}.6
 Summary:       NVIDIA display driver kernel module
 Group:         System Environment/Kernel
 License:       Redistributable, no modification permitted
@@ -23,6 +23,8 @@
 # </switch me>
 
 Source11:       nvidia-kmodtool-excludekernel-filterfile
+#http://www.nvnews.net/vbulletin/showthread.php?t=142656
+Patch0:         nvidia-kmod-no-vgaarb.patch
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -49,7 +51,7 @@
 for arch in x86 x64
 do
     pushd nvidiapkg-${arch}
-#disabled
+%patch0 -p0 -b .vgaarb
     popd
 done
 
@@ -93,18 +95,6 @@
 
 
 %changelog
-* Fri Mar 05 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 195.36.08-1.3
-- rebuild for new kernel
-
-* Mon Mar 01 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 195.36.08-1.2
-- rebuild for new kernel
-
-* Sun Feb 28 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 195.36.08-1.1
-- rebuild for new kernel
-
-* Sat Feb 27 2010 Nicolas Chauvet <kwizart at fedoraproject.org> - 195.36.08-1
-- Update to 195.36.08
-
 * Sat Feb 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 190.53-1.6
 - rebuild for new kernel
 


Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-12/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	27 Feb 2010 14:47:54 -0000	1.17
+++ .cvsignore	8 Mar 2010 22:39:10 -0000	1.18
@@ -1 +1 @@
-nvidia-kmod-data-195.36.08.tar.bz2
+nvidia-kmod-data-190.53.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-12/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	27 Feb 2010 14:47:54 -0000	1.17
+++ sources	8 Mar 2010 22:39:10 -0000	1.18
@@ -1 +1 @@
-de7f5feead0585ced4ad77f6611b6cf3  nvidia-kmod-data-195.36.08.tar.bz2
+9ba74aacc99d41283aff95d119050ec2  nvidia-kmod-data-190.53.tar.bz2