Author: kwizart Update of /cvs/nonfree/rpms/nvidia-kmod/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv17576/devel Modified Files: .cvsignore nvidia-kmod.spec sources Added Files: nvidia-kmod-no-vgaarb.patch Log Message: - Update to 190.53 - Add patch for VGA_ARB nvidia-kmod-no-vgaarb.patch: nv-linux.h | 3 +++ nv.c.orig | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) --- NEW FILE nvidia-kmod-no-vgaarb.patch --- *** 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: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 31 Oct 2009 12:01:56 -0000 1.15 +++ .cvsignore 30 Dec 2009 13:11:53 -0000 1.16 @@ -1 +1 @@ -nvidia-kmod-data-190.42.tar.bz2 +nvidia-kmod-data-190.53.tar.bz2 Index: nvidia-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- nvidia-kmod.spec 22 Nov 2009 13:16:38 -0000 1.57 +++ nvidia-kmod.spec 30 Dec 2009 13:11:53 -0000 1.58 @@ -6,9 +6,9 @@ #define buildforkernels newest Name: nvidia-kmod -Version: 190.42 +Version: 190.53 # Taken over by kmodtool -Release: 1%{?dist}.5 +Release: 1%{?dist} 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) @@ -46,12 +48,12 @@ %setup -q -c -T -a 0 # patch loop -#for arch in x86 x64 -#do -# pushd nvidiapkg-${arch} -# empty -# popd -#done +for arch in x86 x64 +do + pushd nvidiapkg-${arch} +%patch0 -p0 -b .vgaarb + popd +done for kernel_version in %{?kernel_versions} ; do @@ -93,6 +95,10 @@ %changelog +* Wed Dec 30 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org&gt; - 190.53-1 +- Update to 190.53 +- Add patch for VGA_ARB + * Sun Nov 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 190.42-1.5 - rebuild for new kernel, disable i586 builds Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 31 Oct 2009 12:01:56 -0000 1.15 +++ sources 30 Dec 2009 13:11:53 -0000 1.16 @@ -1 +1 @@ -0109cd36131cd7118f20ab412a45ef5c nvidia-kmod-data-190.42.tar.bz2 +9ba74aacc99d41283aff95d119050ec2 nvidia-kmod-data-190.53.tar.bz2