Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 19060 Details for
Bug 30779
nvidia-1.0-4499 partial ebuild.
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Another possible patch that I worked on. Needs testing.
NVIDIA_kernel-1.0-4499-2.6-20031009.diff (text/plain), 67.85 KB, created by
Kris Kersey (RETIRED)
on 2003-10-10 11:07:43 UTC
(
hide
)
Description:
Another possible patch that I worked on. Needs testing.
Filename:
MIME Type:
Creator:
Kris Kersey (RETIRED)
Created:
2003-10-10 11:07:43 UTC
Size:
67.85 KB
patch
obsolete
>Only in NVIDIA_kernel-1.0-4499-2.6: .nv.o.cmd >Only in NVIDIA_kernel-1.0-4499-2.6: .nvidia.ko.cmd >Only in NVIDIA_kernel-1.0-4499-2.6: .nvidia.mod.o.cmd >Only in NVIDIA_kernel-1.0-4499-2.6: .nvidia.o.cmd >Only in NVIDIA_kernel-1.0-4499-2.6: .os-agp.o.cmd >Only in NVIDIA_kernel-1.0-4499-2.6: .os-interface.o.cmd >Only in NVIDIA_kernel-1.0-4499-2.6: .os-registry.o.cmd >diff -u NVIDIA_kernel-1.0-4499/Makefile NVIDIA_kernel-1.0-4499-2.6/Makefile >--- NVIDIA_kernel-1.0-4499/Makefile 2003-09-17 20:22:12.000000000 -0400 >+++ NVIDIA_kernel-1.0-4499-2.6/Makefile 2003-10-09 02:04:16.097025496 -0400 >@@ -1,14 +1,14 @@ > # This Makefile is automatically generated; do not edit >-# Generated on 'anji' on Wed Sep 17 17:03:05 PDT 2003 >+# Generated on 'builder3.nvidia.com' on Thu Jun 19 04:05:35 PDT 2003 > > LINUX_MODULE=nv-linux.o >-DEFINES=-D__KERNEL__ -DMODULE -D_LOOSE_KERNEL_NAMES -mcmodel=kernel -DNTRM -D_GNU_SOURCE -D_LOOSE_KERNEL_NAMES -D__KERNEL__ -DMODULE -DNV_MAJOR_VERSION=1 -DNV_MINOR_VERSION=0 -DNV_PATCHLEVEL=4499 -DNV_UNIX -DNV_LINUX -DNV_INT64_OK -DNV_64_BITS -DNVCPU_X86_64 >+DEFINES=-D__KERNEL__ -DMODULE -D_LOOSE_KERNEL_NAMES -DKBUILD_MODNAME="nvidia" -DNTRM -D_GNU_SOURCE -D_LOOSE_KERNEL_NAMES -D__KERNEL__ -DMODULE -DNV_MAJOR_VERSION=1 -DNV_MINOR_VERSION=0 -DNV_PATCHLEVEL=4499 -DNV_UNIX -DNV_LINUX -DNV_INT64_OK -DNVCPU_X86 > INCLUDES=-I. > > OBJECTS=nv.o os-agp.o os-interface.o os-registry.o > HEADERS=os-agp.h os-interface.h nv-linux.h nv-misc.h nv-memdbg.h nv.h rmretval.h nvtypes.h $(VERSION_HDR) > >-CFLAGS=-Wall -Wimplicit -Wreturn-type -Wswitch -Wformat -Wchar-subscripts -Wparentheses -Wpointer-arith -Wcast-qual -Wno-multichar -O -MD $(DEFINES) $(INCLUDES) -Wno-cast-qual >+CFLAGS=-Wall -Wimplicit -Wreturn-type -Wswitch -Wformat -Wchar-subscripts -Wparentheses -Wcast-qual -Wno-multichar -O -MD $(DEFINES) $(INCLUDES) -Wno-cast-qual -mcmodel=kernel > > RESMAN_KERNEL_MODULE=nv-kernel.o > >@@ -47,19 +47,13 @@ > > INSTALL=$(shell which install) > >-# determine gcc versions used (kernel, nvidia.o) >-module_cc:=$(shell $(CC) -v 2>&1 | tail -n 1) >-version="^Linux version [^(]* (.*@.*) (\(.*\)) .*" >-kernel_cc:=$(shell cat /proc/version | sed "s/"$(version)"/\1/") >- >-module_cc:=$(shell echo "$(module_cc)" | cut -d ' ' -f 3) >-kernel_cc:=$(shell echo "$(kernel_cc)" | cut -d ' ' -f 3) >- > # allow specification of alternate include file tree on command line and extra defines > ifdef SYSINCLUDE > INCLUDES += -I$(SYSINCLUDE) >+INCLUDES += -I$(SYSINCLUDE)/asm/mach-default > else > INCLUDES += -I$(KERNINC) >+INCLUDES += -I$(KERNINC)/asm/mach-default > endif > > ifeq ($(shell sh conftest.sh remap_page_range $(INCLUDES)), 5) >@@ -83,67 +77,63 @@ > > install: package-install > >-package-install: nvidia.o rmmod-check >- @if [ `id -ur` != 0 ]; then \ >- echo Please run \"make install\" as root.; \ >- else \ >- if [ -d $(BROKENDIR) ]; then \ >- rm -f $(BROKENDIR)/NVdriver; \ >- rmdir --ignore-fail-on-non-empty $(BROKENDIR); \ >- fi && \ >- mkdir -p $(INSTALLDIR) && \ >- rm -f $(INSTALLDIR)/NVdriver && \ >- $(INSTALL) -m 0664 -o root -g root nvidia.o $(INSTALLDIR)/nvidia.o$(O) && \ >- PATH="$(PATH):/bin:/sbin" depmod -a && \ >- PATH="$(PATH):/bin:/sbin" modprobe nvidia && \ >- sh makedevices.sh && \ >- echo "nvidia.o installed successfully."; \ >+suser-sanity-check: >+ @if ! sh conftest.sh suser_sanity_check; then \ >+ echo; \ >+ echo "You have insufficient privileges for this operation. Please "; \ >+ echo "run \"make install\" as root! "; \ >+ echo; \ >+ exit 1; \ > fi > >-RMMOD_ERROR=\ >- echo ""; \ >- echo "Unable to remove existing NVIDIA kernel module."; \ >- echo "Please be sure you have exited X before attempting"; \ >- echo "to install the NVIDIA kernel module."; \ >- echo ""; \ >- echo -en "\033[1;31m"; \ >- echo -e "*** Failed rmmod sanity check. Bailing out! ***"; \ >- echo -en "\033[0m"; \ >- exit 1; >- >-rmmod-check: >- @if PATH="$(PATH):/bin:/sbin" lsmod | grep -w nvidia > /dev/null; then \ >- if ! PATH="($PATH):/bin:/sbin" rmmod nvidia > /dev/null; then $(RMMOD_ERROR) fi \ >- fi; \ >- if PATH="$(PATH):/bin:/sbin" lsmod | grep -w NVdriver > /dev/null; then \ >- if ! PATH="$(PATH):/bin:/sbin" rmmod NVdriver > /dev/null; then $(RMMOD_ERROR) fi \ >+rmmod-sanity-check: >+ @if ! sh conftest.sh rmmod_sanity_check nvidia; then \ >+ echo; \ >+ echo "Unable to unload the currently loaded NVIDIA kernel module! "; \ >+ echo "Please be certain that you have exited X before attempting "; \ >+ echo "to install this version. "; \ >+ echo; \ >+ exit 1; \ > fi > >-gcc-check: >- @if [ -z $(IGNORE_CC_MISMATCH) ]; then \ >- if [ "$(kernel_cc)" != "$(module_cc)" ]; then \ >- echo " "; \ >- echo "You appear to be compiling the NVIDIA kernel module with "; \ >- echo "a compiler different from the one that was used to compile "; \ >- echo "the running kernel. This may be perfectly fine, but there "; \ >- echo "are cases where this can lead to unexpected behaviour and "; \ >- echo "system crashes. "; \ >- echo " "; \ >- echo "If you know what you are doing and want to override this "; \ >- echo "check, you can do so by setting IGNORE_CC_MISMATCH. "; \ >- echo " "; \ >- echo "In any other case, set the CC environment variable to the "; \ >- echo "name of the compiler that was used to compile the kernel. "; \ >- echo " "; \ >- echo -en "\033[1;31m"; \ >- echo -e "*** Failed cc sanity check. Bailing out! ***"; \ >- echo -en "\033[0m"; \ >- exit 1; \ >- fi \ >+cc-sanity-check: >+ @if ! sh conftest.sh cc_sanity_check $(CC); then \ >+ echo; \ >+ echo "You appear to be building the NVIDIA kernel module with a "; \ >+ echo "compiler different from the one that was used to build the "; \ >+ echo "running kernel. This may be perfectly fine, but there are "; \ >+ echo "cases where this can lead to unexpected behaviour and "; \ >+ echo "system crashes. "; \ >+ echo; \ >+ echo "If you know what you are doing and want to override this "; \ >+ echo "check, you can do so by setting IGNORE_CC_MISMATCH. "; \ >+ echo; \ >+ echo "In any other case, set the CC environment variable to the "; \ >+ echo "name of the compiler that was used to build the kernel. "; \ >+ echo; \ >+ exit 1; \ > fi > >-nvidia.o: gcc-check $(LINUX_MODULE) $(RESMAN_KERNEL_MODULE) >- ld -r -o $@ $(LINUX_MODULE) $(RESMAN_KERNEL_MODULE) >+package-install: suser-sanity-check nvidia.o rmmod-sanity-check >+ if [ -d $(BROKENDIR) ]; then \ >+ rm -f $(BROKENDIR)/NVdriver; \ >+ rmdir --ignore-fail-on-non-empty $(BROKENDIR); \ >+ fi && \ >+ mkdir -p $(INSTALLDIR) && \ >+ rm -f $(INSTALLDIR)/NVdriver && \ >+ $(INSTALL) -m 0664 -o root -g root nvidia.ko $(INSTALLDIR)/nvidia.ko$(O) && \ >+ /sbin/depmod -a && \ >+ /sbin/modprobe nvidia && \ >+ sh makedevices.sh && \ >+ echo "nvidia.ko installed successfully."; \ >+ >+nvidia.o: cc-sanity-check $(LINUX_MODULE) $(RESMAN_KERNEL_MODULE) >+ ld -d -r -o $@ $(LINUX_MODULE) $(RESMAN_KERNEL_MODULE) >+ if [ -x /usr/src/linux/scripts/modpost ]; then \ >+ /usr/src/linux/scripts/modpost $@; \ >+ $(CC) -c $(CFLAGS) nvidia.mod.c; \ >+ ld -m elf_x86_64 -r -o nvidia.ko $@ nvidia.mod.o; \ >+ fi > > $(VERSION_HDR): > echo \#define NV_COMPILER \"`$(CC) -v 2>&1 | tail -n 1`\" > $@ >@@ -163,7 +153,7 @@ > > > clean: >- $(RM) $(OBJECTS) $(LINUX_MODULE) $(VERSION_HDR) *.d NVdriver nvidia.o >+ $(RM) $(OBJECTS) $(LINUX_MODULE) $(VERSION_HDR) *.d NVdriver nvidia.o nvidia.ko nvidia.mod.c nvidia.mod.o > > > -include $(OBJECTS:%.o=%.d) >Only in NVIDIA_kernel-1.0-4499-2.6: Makefile.kbuild >diff -u NVIDIA_kernel-1.0-4499/conftest.sh NVIDIA_kernel-1.0-4499-2.6/conftest.sh >--- NVIDIA_kernel-1.0-4499/conftest.sh 2003-09-17 20:22:11.000000000 -0400 >+++ NVIDIA_kernel-1.0-4499-2.6/conftest.sh 2003-10-09 00:30:08.732555392 -0400 >@@ -37,5 +37,79 @@ > exit 1 > fi > ;; >+ >+ cc_sanity_check) >+ shift >+ # >+ # Verify that the same compiler is used for the kernel and kernel >+ # module. >+ # >+ if test -n "$IGNORE_CC_MISMATCH" -o -n "$KERNDIR"; then >+ # >+ # The user chose to disable the gcc sanity test or is building >+ # the module for a kernel not currently running, which renders >+ # our test meaningless. >+ # >+ exit 0 >+ fi >+ >+ VERSION="^Linux version.* (.*) (\(gcc.*\)).*" >+ KERNEL=$(cat /proc/version | sed "s/$VERSION/\1/") >+ MODULE=$($* -v 2>&1 | tail -n 1) >+ >+ if test "$KERNEL" != "$MODULE"; then >+ # >+ # The kernel seems to have been built with a different version >+ # of the C compiler, which may be a problem. >+ # >+ exit 1 >+ else >+ exit 0 >+ fi >+ ;; >+ >+ kernel_patch_level) >+ shift >+ # >+ # Determine the kernel's major patch level; this is only done if we >+ # aren't told by KBUILD. >+ # >+ echo $(cat "$1"/Makefile | grep "PATCHLEVEL =" | cut -d " " -f 3) >+ exit 0 >+ ;; >+ >+ suser_sanity_check) >+ shift >+ # >+ # Determine the caller's user id to determine if we have sufficient >+ # privileges for the requested operation. >+ # >+ if test $(id -ur) != 0; then >+ exit 1 >+ else >+ exit 0 >+ fi >+ ;; >+ >+ rmmod_sanity_check) >+ shift >+ # >+ # Make sure that any currently loaded NVIDIA kernel module can be >+ # unloaded. >+ # >+ if /sbin/lsmod | grep -q "$1"; then >+ /sbin/rmmod "$1" >& /dev/null >+ fi >+ >+ if /sbin/lsmod | grep -q "$1"; then >+ # >+ # The NVIDIA kernel module is still loaded, most likely because >+ # it is busy. >+ # >+ exit 1 >+ else >+ exit 0 >+ fi >+ ;; > esac > >diff -u NVIDIA_kernel-1.0-4499/makedevices.sh NVIDIA_kernel-1.0-4499-2.6/makedevices.sh >--- NVIDIA_kernel-1.0-4499/makedevices.sh 2003-09-17 20:22:11.000000000 -0400 >+++ NVIDIA_kernel-1.0-4499-2.6/makedevices.sh 2003-10-09 00:30:08.732555392 -0400 >@@ -8,39 +8,37 @@ > # create a temporary file > tmp=`(mktemp -q /tmp/nvidia.XXXXXX) 2> /dev/null` || tmp="/tmp/nvidia.$$" > >-paths=" /etc/modutils/aliases \ >- /etc/modules.conf \ >- /etc/conf.modules " >+modconfs=" /etc/modutils/aliases \ >+ /etc/modules.conf \ >+ /etc/modprobe.d/aliases \ >+ /etc/modprobe.conf \ >+ /etc/conf.modules " > >-modconf="" >-for path in $paths; do >- if [ -f "$path" ]; then >- modconf=$path >- break >+# >+# Pass the -p option to cp to preserve the permissions of $modconf and >+# /etc/rc.d/rc.modules across the update. Update all relevant files >+# including those eventually regenerated to avoid the need for awkward >+# logic here. >+# >+for modconf in $modconfs; do >+ if [ -f "$modconf" ]; then >+ cp -p $modconf $tmp >+ sed '/^alias.*\(NVdriver\|nvidia\)/d' < $modconf > $tmp >+ if [ -c /dev/.devfsd ]; then >+ echo "alias /dev/nvidia* nvidia" >> $tmp >+ else >+ echo "alias char-major-195 nvidia" >> $tmp >+ fi >+ mv -f $tmp $modconf >+ test -x /sbin/update-modules && /sbin/update-modules > fi > done > >-if [ ! -z $modconf ]; then >- # Initialize the permissions on $tmp so that we don't change the >- # permissions of $modconf when we mv it into place >- cp -p $modconf $tmp >- sed '/^alias.*\(NVdriver\|nvidia\)/d' < $modconf > $tmp >- if [ -c /dev/.devfsd ]; then >- echo "alias /dev/nvidia* nvidia" >> $tmp >- else >- echo "alias char-major-195 nvidia" >> $tmp >- fi >- mv -f $tmp $modconf >- test -x /sbin/update-modules && /sbin/update-modules >-else >- if [ -f /etc/rc.d/rc.modules ]; then >- # Initialize the permissions on $tmp so that we don't change the >- # permissions of /etc/rc.d/rc.modules when we mv it into place >- cp -p /etc/rc.d/rc.modules $tmp >- sed '/.*\(NVdriver\|nvidia\).*/d' < /etc/rc.d/rc.modules > $tmp >- echo -e "\n/sbin/modprobe nvidia" >> $tmp >- mv -f $tmp /etc/rc.d/rc.modules >- fi >+if [ -f /etc/rc.d/rc.modules ]; then >+ cp -p /etc/rc.d/rc.modules $tmp >+ sed '/.*\(NVdriver\|nvidia\).*/d' < /etc/rc.d/rc.modules > $tmp >+ echo -e "\n/sbin/modprobe nvidia" >> $tmp >+ mv -f $tmp /etc/rc.d/rc.modules > fi > > if [ ! -c /dev/.devfsd ]; then >diff -u NVIDIA_kernel-1.0-4499/nv-linux.h NVIDIA_kernel-1.0-4499-2.6/nv-linux.h >--- NVIDIA_kernel-1.0-4499/nv-linux.h 2003-09-17 20:22:11.000000000 -0400 >+++ NVIDIA_kernel-1.0-4499-2.6/nv-linux.h 2003-10-09 00:30:08.733555240 -0400 >@@ -20,35 +20,22 @@ > # define MODVERSIONS > #endif > >-#if defined (MODVERSIONS) >-#include <linux/modversions.h> >-#endif >- > #include <linux/kernel.h> > #include <linux/module.h> > #include <linux/version.h> > >-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 2, 12) >-# error This driver does not support 2.2.11 or earlier kernels! >-#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 3, 0) >-# define KERNEL_2_2 >-# warning NVIDIA is considering dropping support for linux-2.2 >-# warning kernels. While end users are free to maintain their >-# warning own patches, or stick with current drivers, our new >-# warning drivers will not work "out of the box." If you are >-# warning concerned about lack of support for 2.2 kernels, >-# warning please let us know at linux-bugs@nvidia.com; we would >-# warning like to know how many users would be seriously >-# warning impacted by this decision. >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 3, 0) >+# error This driver does not support 2.2.x kernels! > #elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 0) >-# error This driver does not support 2.3.x development kernels! >+# error This driver does not support 2.3.x kernels! > #elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0) > # define KERNEL_2_4 > #elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) >-# error This driver does not support 2.5.x development kernels! >-# define KERNEL_2_5 >+# error This driver does not support 2.5.x kernels! >+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 7, 0) >+# define KERNEL_2_6 > #else >-# error This driver does not support 2.6.x or newer kernels! >+# error This driver does not support development kernels! > #endif > > #if defined (__ia64) >@@ -61,12 +48,15 @@ > #define __SMP__ > #endif > >+#if defined (MODVERSIONS) && !defined (KERNEL_2_6) >+#include <linux/modversions.h> >+#endif >+ > #include <linux/types.h> /* pic_t, size_t, __u32, etc */ > #include <linux/errno.h> /* error codes */ > #include <linux/list.h> /* circular linked list */ > #include <linux/stddef.h> /* NULL, offsetof */ > #include <linux/wait.h> /* wait queues */ >-#include <linux/tqueue.h> /* struct tq_struct */ > > #include <linux/slab.h> /* kmalloc, kfree, etc */ > #include <linux/vmalloc.h> /* vmalloc, vfree, etc */ >@@ -74,9 +64,15 @@ > #include <linux/poll.h> /* poll_wait */ > #include <linux/delay.h> /* mdelay, udelay */ > >+#ifdef KERNEL_2_6 >+#include <linux/sched.h> /* suser(), capable() replacement */ >+#include <linux/moduleparam.h> /* module_param() */ >+#include <linux/smp_lock.h> /* kernel_locked */ >+#include <asm/kmap_types.h> /* page table entry lookup */ >+#endif >+ > #include <linux/pci.h> /* pci_find_class, etc */ >-#include <linux/wrapper.h> /* mem_map_reserve */ >-#include <linux/interrupt.h> /* mark_bh, init_bh, remove_bh */ >+#include <linux/interrupt.h> /* tasklets, interrupt helpers */ > #include <linux/timer.h> > > #include <asm/system.h> /* cli, sli, save_flags */ >@@ -85,14 +81,9 @@ > #include <asm/page.h> /* PAGE_OFFSET */ > #include <asm/pgtable.h> /* pte bit definitions */ > >-#if !defined (KERNEL_2_2) > #include <linux/spinlock.h> > #include <asm/semaphore.h> > #include <linux/highmem.h> >-#else >-#include <asm/spinlock.h> >-#include <asm/semaphore.h> >-#endif > > #ifdef CONFIG_PROC_FS > #include <linux/proc_fs.h> >@@ -359,78 +350,172 @@ > free_pages(ptr, order); \ > } > >+#define GET_MODULE_SYMBOL(mod,sym) (const void *) inter_module_get(sym) >+#define PUT_MODULE_SYMBOL(sym) (inter_module_put((char *) sym)) > >-#if !defined (KERNEL_2_2) >-# define LINUX_VMA_OFFS(vma) (((vma)->vm_pgoff) << PAGE_SHIFT) >-# define GET_MODULE_SYMBOL(mod,sym) (const void *) inter_module_get(sym) >-# define PUT_MODULE_SYMBOL(sym) inter_module_put((char *) sym) >-# define GET_MAP_NR(phys_page) virt_to_page(__va(phys_page)) >-# define MEM_MAP_READ_COUNT(map_nr) (atomic_read(&(map_nr)->count)) >-# define MEM_MAP_INC_COUNT(map_nr) (atomic_inc(&(map_nr)->count)) >-# define MEM_MAP_DEC_COUNT(map_nr) (atomic_dec(&(map_nr)->count)) >-# define EVENT_QUEUE(ptr) ((struct __wait_queue_head *)(ptr)) >-# define VMA_PRIVATE(vma) ((vma)->vm_private_data) >-# define INIT_EVENT_QUEUE(ptr) \ >- if (ptr == NULL) { \ >- NV_KMALLOC((ptr), sizeof(struct __wait_queue_head)); \ >- if (ptr) { \ >- memset((ptr), 0, sizeof(struct __wait_queue_head)); \ >- init_waitqueue_head((struct __wait_queue_head *)(ptr)); \ >- } \ >- } >-# define FREE_EVENT_QUEUE(ptr) NV_KFREE((ptr), sizeof(struct __wait_queue_head)); (ptr) = NULL; >-#else >-# define in_irq() (local_irq_count[smp_processor_id()]) >-# define LINUX_VMA_OFFS(vma) ((vma)->vm_offset) >-# define GET_MODULE_SYMBOL(mod, sym) (void*) get_module_symbol((mod), (sym)) >-# define PUT_MODULE_SYMBOL(sym) >-# define GET_MAP_NR(phys_page) MAP_NR(__va(phys_page)) >-# define MEM_MAP_READ_COUNT(map_nr) (atomic_read(&mem_map[map_nr].count)) >-# define MEM_MAP_INC_COUNT(map_nr) (atomic_inc(&mem_map[map_nr].count)) >-# define MEM_MAP_DEC_COUNT(map_nr) (atomic_dec(&mem_map[map_nr].count)) >-# define EVENT_QUEUE(ptr) ((struct wait_queue **) &(ptr)) >-# define VMA_PRIVATE(vma) ((void*)((vma)->vm_pte)) >-# define INIT_EVENT_QUEUE(ptr) if (ptr) { ((ptr) = NULL); } >-# define FREE_EVENT_QUEUE(ptr) >+#ifdef KERNEL_2_6 >+# define NV_IS_SUSER() capable(CAP_SYS_ADMIN) >+# define NV_PCI_DEVICE_NAME(x) ((x)->pretty_name) >+# define NV_CLI() local_irq_disable() >+# define NV_SAVE_FLAGS(x) local_save_flags(x) >+# define NV_RESTORE_FLAGS(x) local_irq_restore(x) >+# define NV_MAY_SLEEP() (!in_interrupt() && !in_atomic()) >+# define NV_SMP_NUM_CPUS num_online_cpus() >+# define NV_MODULE_PARAMETER(x) module_param(x, int, 0) >+#else >+# define NV_IS_SUSER() suser() >+# define NV_PCI_DEVICE_NAME(x) ((x)->name) >+# define NV_CLI() cli() >+# define NV_SAVE_FLAGS(x) save_flags(x) >+# define NV_RESTORE_FLAGS(x) restore_flags(x) >+# define NV_MAY_SLEEP() (!in_interrupt()) >+# define NV_SMP_NUM_CPUS smp_num_cpus >+# define NV_MODULE_PARAMETER(x) MODULE_PARM(x, "i") >+#endif >+ >+#define NV_DEVICE_NUMBER(x) minor((x)->i_rdev) >+#define NV_VMA_OFFSET(x) (((x)->vm_pgoff) << PAGE_SHIFT) >+#define NV_VMA_PRIVATE(x) ((x)->vm_private_data) >+#define NV_IS_CONTROL_DEVICE(x) (minor((x)->i_rdev) == 255) >+ >+#ifndef minor >+/* >+ * XXX Is this correct for all possible target kernels? We need this to >+ * support older 2.4 and some 2.6 kernels. >+ */ >+# define minor(x) MINOR(x) > #endif > >+#ifndef KERNEL_2_6 >+ typedef void irqreturn_t; >+# define IRQ_NONE >+# define IRQ_RETVAL(x) >+# define IRQ_HANDLED >+#else >+#ifdef AGPGART >+ typedef struct agp_kern_info agp_kern_info; >+ typedef struct agp_memory agp_memory; >+#endif >+ typedef void* devfs_handle_t; >+#endif >+ >+#ifdef KERNEL_2_6 >+#define NV_DEVFS_REGISTER(_name, _minor) \ >+({ \ >+ devfs_handle_t __handle = NULL; \ >+ devfs_mk_cdev(MKDEV(NV_MAJOR_DEVICE_NUMBER, _minor), \ >+ S_IFCHR | S_IRUGO | S_IWUGO, _name); \ >+ __handle; \ >+}) >+ >+#define NV_DEVFS_REMOVE_DEVICE(i) devfs_remove("nvidia%d", i) >+#define NV_DEVFS_REMOVE_CONTROL() devfs_remove("nvidiactl") >+#else >+#define NV_DEVFS_REGISTER(_name, _minor) \ >+({ \ >+ devfs_handle_t __handle = \ >+ devfs_register(NULL, _name, DEVFS_FL_DEFAULT, \ >+ NV_MAJOR_DEVICE_NUMBER, _minor, \ >+ S_IFCHR | S_IRUGO | S_IWUGO, &nv_fops, NULL); \ >+ __handle; \ >+ }) >+ >+#define NV_DEVFS_REMOVE_DEVICE(i) devfs_unregister(nv_devfs_handles[i+1]) >+#define NV_DEVFS_REMOVE_CONTROL() devfs_unregister(nv_devfs_handles[0]) >+#endif >+ >+/* >+ * Linux 2.5 introduced the five argument version of remap_page_range, all >+ * relevant releases to date use it. This version was backported to 2.4 by >+ * RedHat without means to identify the change, hence this hack. >+ */ >+#ifdef KERNEL_2_6 >+#define NV_REMAP_PAGE_RANGE(a, b...) remap_page_range(vma, a, ## b) >+#else > #if defined(REMAP_PAGE_RANGE_5) >-#define NV_REMAP_PAGE_RANGE(a, b...) remap_page_range(vma, a, ## b) >+#define NV_REMAP_PAGE_RANGE(a, b...) remap_page_range(vma, a, ## b) > #elif defined(REMAP_PAGE_RANGE_4) >-#define NV_REMAP_PAGE_RANGE(a, b...) remap_page_range(a, ## b) >+#define NV_REMAP_PAGE_RANGE(a, b...) remap_page_range(a, ## b) > #else >-#error "Couldn't determine number of arguments expected by remap_page_range!" >+#warning "conftest.sh failed, assuming old Linux 2.4 remap_page_range(4)!" >+ >+#define NV_REMAP_PAGE_RANGE(a, b...) remap_page_range(a, ## b) > #endif >+#endif /* KERNEL_2_6 */ > >-#if defined(pte_offset_atomic) >-#define NV_PTE_OFFSET(addres, pg_mid_dir, pte) \ >+#if defined(pmd_offset_map) >+#define NV_PMD_OFFSET(address, pgd, pmd) \ > { \ >- pte_t *pte__ = pte_offset_atomic(pg_mid_dir, address); \ >- pte = *pte__; \ >- pte_kunmap(pte__); \ >+ pmd = pmd_offset_map(pgd, address); \ >+ } >+#define NV_PMD_UNMAP(pmd) \ >+ { \ >+ pmd_unmap(pmd); \ > } >-#elif defined(pte_offset) >-#define NV_PTE_OFFSET(addres, pg_mid_dir, pte) \ >- pte = *pte_offset(pg_mid_dir, address) > #else >-#define NV_PTE_OFFSET(addres, pg_mid_dir, pte) \ >+#define NV_PMD_OFFSET(address, pgd, pmd) \ > { \ >- pte_t *pte__ = pte_offset_map(pg_mid_dir, address); \ >- pte = *pte__; \ >- pte_unmap(pte__); \ >+ pmd = pmd_offset(pgd, address); \ > } >+#define NV_PMD_UNMAP(pmd) > #endif > >-#define NV_PAGE_ALIGN(addr) ( ((addr) + PAGE_SIZE - 1) / PAGE_SIZE) >-#define NV_MASK_OFFSET(addr) ( (addr) & (PAGE_SIZE - 1) ) >+#define NV_PMD_PRESENT(pmd) \ >+ ({ \ >+ if (pmd) { \ >+ if (pmd_none(*pmd)) { \ >+ NV_PMD_UNMAP(pmd); pmd = NULL; \ >+ } \ >+ } pmd != NULL; \ >+ }) > >-#ifndef MAXMEM /* temporary define for 2.2 kernels */ >-#define MAXMEM (-PAGE_OFFSET - (64 * 1024 * 1024)) >+#if defined (pte_offset_atomic) >+#define NV_PTE_OFFSET(address, pmd, pte) \ >+ { \ >+ pte = pte_offset_atomic(pmd, address); \ >+ NV_PMD_UNMAP(pmd); \ >+ } >+#define NV_PTE_UNMAP(pte) \ >+ { \ >+ pte_kunmap(pte); \ >+ } >+#elif defined (pte_offset) >+#define NV_PTE_OFFSET(address, pmd, pte) \ >+ { \ >+ pte = pte_offset(pmd, address); \ >+ NV_PMD_UNMAP(pmd); \ >+ } >+#define NV_PTE_UNMAP(pte) >+#else >+#define NV_PTE_OFFSET(address, pmd, pte) \ >+ { \ >+ pte = pte_offset_map(pmd, address); \ >+ NV_PMD_UNMAP(pmd); \ >+ } >+#define NV_PTE_UNMAP(pte) \ >+ { \ >+ pte_unmap(pte); \ >+ } > #endif > >-#ifndef NV01_ROOT >-#define NV01_ROOT 0x00000000 >-#endif >+#define NV_PTE_PRESENT(pte) \ >+ ({ \ >+ if (pte) { \ >+ if (!pte_present(*pte)) { \ >+ NV_PTE_UNMAP(pte); pte = NULL; \ >+ } \ >+ } pte != NULL; \ >+ }) >+ >+#define NV_PTE_VALUE(pte) \ >+ ({ \ >+ unsigned long __pte_value = pte_val(*pte); \ >+ NV_PTE_UNMAP(pte); \ >+ __pte_value; \ >+ }) >+ >+#define NV_PAGE_ALIGN(addr) ( ((addr) + PAGE_SIZE - 1) / PAGE_SIZE) >+#define NV_MASK_OFFSET(addr) ( (addr) & (PAGE_SIZE - 1) ) > > #if defined(NVCPU_IA64) > #define NV_GFP_HW (GFP_KERNEL | __GFP_DMA) >@@ -487,7 +572,7 @@ > static inline int NV_IRQL_IS_RAISED() > { > unsigned long int eflags; >- __save_flags(eflags); >+ NV_SAVE_FLAGS(eflags); > return !(eflags & NV_CPU_INTERRUPT_FLAGS_BIT); > } > >@@ -545,9 +630,10 @@ > > nv_alloc_t *alloc_queue; > >- // bottom half interrupt handler info; per device >- /* keep track of any pending bottom-halves */ >- struct tq_struct *bh; >+ /* keep track of any pending bottom halfes */ >+ struct tasklet_struct tasklet; >+ >+ /* active bottom half counter */ > atomic_t bh_count; > > /* get a timer callback every second */ >@@ -583,7 +669,7 @@ > U032 num_events; > U032 put, get; > spinlock_t fp_lock; >- void *wqueue; // wait_queue for polling >+ wait_queue_head_t waitqueue; > nv_event_t *event_fifo; // fifo for storing events > } nv_file_private_t; > >diff -u NVIDIA_kernel-1.0-4499/nv.c NVIDIA_kernel-1.0-4499-2.6/nv.c >--- NVIDIA_kernel-1.0-4499/nv.c 2003-09-17 20:22:11.000000000 -0400 >+++ NVIDIA_kernel-1.0-4499-2.6/nv.c 2003-10-09 00:40:51.991765128 -0400 >@@ -15,6 +15,7 @@ > #include "nv_compiler.h" > #include "os-agp.h" > >+MODULE_LICENSE("NVIDIA"); > > /* > * our global state; one per device >@@ -33,32 +34,20 @@ > */ > > nv_linux_state_t nv_ctl_device = { { 0 } }; >-void *nv_ctl_wqueue = NULL; >+wait_queue_head_t nv_ctl_waitqueue; > > // keep track of opened clients and their process id so they > // can be free'd up on abnormal close > nv_client_t nv_clients[NV_MAX_CLIENTS]; >-struct tq_struct nv_bottom_halves[NV_MAX_CLIENTS]; > > #ifdef CONFIG_PROC_FS > struct proc_dir_entry *proc_nvidia; > #endif > > #ifdef CONFIG_DEVFS_FS >-devfs_handle_t nv_dev_handle[NV_MAX_DEVICES]; >-devfs_handle_t nv_ctl_handle; >+devfs_handle_t nv_devfs_handles[NV_MAX_DEVICES+1]; > #endif > >-/* >- * pick apart our minor device number >- * low 3 bits is NV device >- * if 255, then its the control device >- */ >- >-#define NV_DEVICE_NUMBER(_minor) ((_minor) & 0x0f) >-#define NV_DEVICE_IS_CONTROL_DEVICE(_minor) \ >- (((_minor) & 0xFF) == 0xFF) >- > // #define NV_DBG_MEM 1 > #undef NV_DBG_MEM > >@@ -118,10 +107,6 @@ > *** EXPORTS to Linux Kernel > ***/ > >-/* linux module interface functions (called by linux kernel) */ >-int init_module(void); >-void cleanup_module(void); >- > /* nv_kern_ functions, interfaces used by linux kernel */ > void nv_kern_vma_open(struct vm_area_struct *vma); > void nv_kern_vma_release(struct vm_area_struct *vma); >@@ -132,7 +117,7 @@ > unsigned int nv_kern_poll(struct file *, poll_table *); > int nv_kern_ioctl(struct inode *, struct file *, unsigned int, unsigned long); > void nv_kern_bh(void *); >-void nv_kern_isr(int, void *, struct pt_regs *); >+irqreturn_t nv_kern_isr(int, void *, struct pt_regs *); > void nv_kern_rc_timer(unsigned long); > #ifdef CONFIG_PM > int nv_kern_pm(struct pm_dev *dev, pm_request_t rqst, void *data); >@@ -155,6 +140,7 @@ > /* character driver entry points */ > > static struct file_operations nv_fops = { >+ owner: THIS_MODULE, > poll: nv_kern_poll, > ioctl: nv_kern_ioctl, > mmap: nv_kern_mmap, >@@ -325,8 +311,8 @@ > { > nv_printf(NV_DBG_MEMINFO, " 0x%x: count %d flags 0x%x\n", > *page_ptr, >- (GET_MAP_NR(*page_ptr))->count, >- (GET_MAP_NR(*page_ptr))->flags); >+ (virt_to_page(__va(*page_ptr)))->count, >+ (virt_to_page(__va(*page_ptr)))->flags); > num_pages--; > page_ptr++; > } >@@ -397,7 +383,7 @@ > phys_addr = virt_to_phys((void *) virt_addr); > > /* lock the page for dma purposes */ >- mem_map_reserve(GET_MAP_NR(phys_addr)); >+ SetPageReserved(virt_to_page(__va(phys_addr))); > > *page_ptr++ = phys_addr; > pages_needed--; >@@ -410,7 +396,7 @@ > while (page_ptr != (unsigned long *) page_list) > { > page_ptr--; >- mem_map_unreserve(GET_MAP_NR(*page_ptr)); >+ ClearPageReserved(virt_to_page(__va(*page_ptr))); > NV_FREE_PAGES((unsigned long) phys_to_virt(*page_ptr), 0); > } > >@@ -430,7 +416,7 @@ > > while (pages_left) > { >- mem_map_unreserve(GET_MAP_NR(*page_list)); >+ ClearPageReserved(virt_to_page(__va(*page_list))); > page_list++; > pages_left--; > } >@@ -596,11 +582,6 @@ > nv_linux_state_t *nvl; > nv_linux_state_t *nv_max_devices; > >-#if defined (KERNEL_2_2) >- struct proc_dir_entry *proc_root_driver; >- proc_root_driver = create_proc_entry("driver", flags, &proc_root); >-#endif >- > proc_nvidia = create_proc_entry("nvidia", flags, proc_root_driver); > proc_nvidia_cards = create_proc_entry("cards", flags, proc_nvidia); > proc_nvidia_agp = create_proc_entry("agp", flags, proc_nvidia); >@@ -662,9 +643,6 @@ > { > #ifdef CONFIG_PROC_FS > nvos_proc_remove_all(proc_nvidia); >-#if defined (KERNEL_2_2) >- remove_proc_entry("driver", &proc_root); >-#endif > #endif > } > >@@ -753,9 +731,8 @@ > *** EXPORTS to Linux Kernel > ***/ > >-int init_module(void) >+static int __init nvidia_init_module(void) > { >- nv_linux_state_t *nvl; > int rc, i; > > memset(nv_linux_devices, 0, sizeof(nv_linux_devices)); >@@ -768,7 +745,7 @@ > > nv_printf(NV_DBG_ERRORS, "nvidia: loading %s\n", pNVRM_ID); > >-#ifdef CONFIG_DEVFS_FS >+#if defined(CONFIG_DEVFS_FS) && !defined(KERNEL_2_6) > rc = devfs_register_chrdev(nv_major, "nvidia", &nv_fops); > #else > rc = register_chrdev(nv_major, "nvidia", &nv_fops); >@@ -780,34 +757,35 @@ > } > > #ifdef CONFIG_DEVFS_FS >- memset(nv_dev_handle, 0, sizeof(devfs_handle_t) * NV_MAX_DEVICES); > do { >+ /* >+ * XXX This code isn't pretty, but neither is dealing with the >+ * various Linux devfs implemenation(s). While Linux APIs are >+ * known to be anything but stable and oftentimes anything but >+ * well designed, the devfs interface has been more painful to >+ * deal with than most other APIs. >+ */ > char name[10]; > >- nv_ctl_handle = devfs_register(NULL, "nvidiactl", >- DEVFS_FL_DEFAULT, nv_major, 255, >- S_IFCHR | S_IRUGO | S_IWUGO, >- &nv_fops, NULL); >+ nv_devfs_handles[0] = NV_DEVFS_REGISTER("nvidiactl", 255); > > for (i = 0; i < num_nv_devices; i++) { > sprintf(name, "nvidia%d", i); >- nv_dev_handle[i] = devfs_register(NULL, name, >- DEVFS_FL_DEFAULT, nv_major, i, >- S_IFCHR | S_IRUGO | S_IWUGO, >- &nv_fops, NULL); >+ nv_devfs_handles[i+1] = NV_DEVFS_REGISTER(name, i); > } > } while(0); > #endif > >- nv_printf(NV_DBG_INFO, "init_module: major number %d\n", nv_major); >+ nv_printf(NV_DBG_INFO, "nvidia_init_module: major number %d\n", nv_major); > >- // init all the bottom half structures >- for (nvl = nv_linux_devices; nvl < nv_linux_devices + NV_MAX_DEVICES; nvl++) >- { >- nvl->bh = &nv_bottom_halves[nvl - nv_linux_devices]; >- nvl->bh->routine = nv_kern_bh; >- nvl->bh->data = (void *) nvl; >- nvl->bh->sync = 0; >+ /* instantiate tasklets */ >+ for (i = 0; i < NV_MAX_DEVICES; i++) { >+ /* >+ * We keep one tasklet per card to avoid latency issues with more >+ * than one device; no two instances of a single tasklet are ever >+ * executed concurrently. >+ */ >+ atomic_set(&nv_linux_devices[i].tasklet.count, 1); > } > > // init the nvidia control device >@@ -815,6 +793,7 @@ > nv_state_t *nv_ctl = NV_STATE_PTR(&nv_ctl_device); > nv_ctl->os_state = (void *) &nv_ctl_device; > nv_lock_init_locks(nv_ctl); >+ init_waitqueue_head(&nv_ctl_waitqueue); > } > > #ifdef CONFIG_PM >@@ -841,14 +820,14 @@ > /* create /proc/driver/nvidia */ > nvos_proc_create(); > >-#if defined(DEBUG) && !defined(KERNEL_2_2) >+#if defined(DEBUG) > inter_module_register("nv_linux_devices", THIS_MODULE, nv_linux_devices); > #endif > > return 0; > > failed: >-#ifdef CONFIG_DEVFS_FS >+#if defined(CONFIG_DEVFS_FS) && !defined(KERNEL_2_6) > devfs_unregister_chrdev(nv_major, "nvidia"); > #else > unregister_chrdev(nv_major, "nvidia"); >@@ -856,26 +835,27 @@ > return rc; > } > >-void cleanup_module(void) >+static void __exit nvidia_exit_module(void) > { >- int rc, i; >- nv_linux_state_t *nvl; >- nv_linux_state_t *max_devices; >+ int rc; >+ nv_linux_state_t *nvl, *max_devices; > > /* remove /proc/driver/nvidia */ > nvos_proc_remove(); > >- nv_printf(NV_DBG_INFO, "cleanup_module\n"); >+ nv_printf(NV_DBG_INFO, "nvidia_exit_module\n"); > >-#if defined(DEBUG) && !defined(KERNEL_2_2) >+#if defined(DEBUG) > inter_module_unregister("nv_linux_devices"); > #endif > > #ifdef CONFIG_PM >- for (i = 0; i < num_nv_devices; i++) >- { >- pm_unregister(pm_nv_dev[i]); >- } >+ do { >+ int i; >+ for (i = 0; i < num_nv_devices; i++) { >+ pm_unregister(pm_nv_dev[i]); >+ } >+ } while (0); > #endif > > // Shutdown the resource manager >@@ -894,30 +874,29 @@ > continue; > > nv_printf(NV_DBG_ERRORS, >- "still have vm que at cleanup_module(): 0x%x to 0x%x\n", >+ "still have vm que at nvidia_exit_module(): 0x%x to 0x%x\n", > nvl->alloc_queue->vma->vm_start, > nvl->alloc_queue->vma->vm_end); > } > } > >-#ifdef CONFIG_DEVFS_FS >+#if defined(CONFIG_DEVFS_FS) && !defined(KERNEL_2_6) > rc = devfs_unregister_chrdev(nv_major, "nvidia"); > #else > rc = unregister_chrdev(nv_major, "nvidia"); > #endif > > if (rc < 0) { >- nv_printf(NV_DBG_ERRORS, "cleanup_module: unregister nv failed\n"); >+ nv_printf(NV_DBG_ERRORS, "nvidia_exit_module: unregister nv failed\n"); > } > > #ifdef CONFIG_DEVFS_FS > do { > int i; >- for (i = 0; nv_dev_handle[i] != 0; i++) { >- devfs_unregister(nv_dev_handle[i]); >- } >- } while(0); >- devfs_unregister(nv_ctl_handle); >+ NV_DEVFS_REMOVE_CONTROL(); >+ for (i = 0; i < num_nv_devices; i++) >+ NV_DEVFS_REMOVE_DEVICE(i); >+ } while (0); > #endif > > #if NV_ENABLE_MEM_TRACKING >@@ -929,6 +908,8 @@ > #endif > } > >+module_init(nvidia_init_module); >+module_exit(nvidia_exit_module); > > /* this is only called when the vmas are duplicated. > * this appears to only happen when the process is cloned to create >@@ -942,11 +923,11 @@ > nv_kern_vma_open(struct vm_area_struct *vma) > { > nv_printf(NV_DBG_MEMINFO, "vma_open for 0x%x - 0x%x, offset 0x%x\n", >- vma->vm_start, vma->vm_end, LINUX_VMA_OFFS(vma)); >+ vma->vm_start, vma->vm_end, NV_VMA_OFFSET(vma)); > >- if (VMA_PRIVATE(vma)) >+ if (NV_VMA_PRIVATE(vma)) > { >- nv_alloc_t *at = (nv_alloc_t *) VMA_PRIVATE(vma); >+ nv_alloc_t *at = (nv_alloc_t *) NV_VMA_PRIVATE(vma); > at->usage_count++; > > nv_printf(NV_DBG_MEMINFO, " at 0x%x, usage count %d, page_table 0x%x\n", >@@ -954,8 +935,6 @@ > > nvos_list_page_count(at->page_table, at->num_pages); > } >- >- MOD_INC_USE_COUNT; > } > > >@@ -963,11 +942,11 @@ > nv_kern_vma_release(struct vm_area_struct *vma) > { > nv_printf(NV_DBG_MEMINFO, "vma_release for 0x%x - 0x%x, offset 0x%x\n", >- vma->vm_start, vma->vm_end, LINUX_VMA_OFFS(vma)); >+ vma->vm_start, vma->vm_end, NV_VMA_OFFSET(vma)); > >- if (VMA_PRIVATE(vma)) >+ if (NV_VMA_PRIVATE(vma)) > { >- nv_alloc_t *at = (nv_alloc_t *) VMA_PRIVATE(vma); >+ nv_alloc_t *at = (nv_alloc_t *) NV_VMA_PRIVATE(vma); > > at->usage_count--; > >@@ -985,22 +964,12 @@ > if (at->page_table) > nvos_unlock_pages(at->page_table, at->num_pages); > nvos_free_alloc(at); >- VMA_PRIVATE(vma) = NULL; >+ NV_VMA_PRIVATE(vma) = NULL; > } > } >- >- MOD_DEC_USE_COUNT; > } > >- >-/* at this point, this code just plain won't work with 2.2 kernels. >- * additionally, only ia64 & the 460GX need a nopage handler, and 2.2 doesn't >- * work on ia64 anyways. It's expected that at some point other agp chipsets >- * will work similar to the 460GX (AGP 3.0 spec), so pre-emptively make sure >- * this works on our standard ia32 driver. >- */ >-#if !defined(KERNEL_2_2) >- >+#if 0 > /* AGP allocations under the 460GX are not mapped to the aperture > * addresses by the CPU. This nopage handler will fault on CPU > * accesses to AGP memory and map the address to the correct page. >@@ -1013,7 +982,7 @@ > struct page *page_ptr; > int rm_status, index; > >- at = VMA_PRIVATE(vma); >+ at = NV_VMA_PRIVATE(vma); > if (at == NULL) > { > nv_printf(NV_DBG_ERRORS, "NVRM: nopage handler called without an at: " >@@ -1052,7 +1021,7 @@ > // far again > nv_printf(NV_DBG_ERRORS, "NVRM: nopage handler called on a freed" > "address: vm_start 0x%x, at 0x%x\n", vma->vm_start, at); >- VMA_PRIVATE(vma) = NULL; >+ NV_VMA_PRIVATE(vma) = NULL; > return NOPAGE_SIGBUS; > } > >@@ -1078,10 +1047,8 @@ > > struct vm_operations_struct nv_vm_ops = { > nv_kern_vma_open, >- nv_kern_vma_release, /* "close" */ >-#if !defined(KERNEL_2_2) >- nv_kern_vma_nopage, >-#endif >+ nv_kern_vma_release /* "close" */ >+ /* , nv_kern_vma_nopage */ > }; > > static nv_file_private_t * >@@ -1096,7 +1063,7 @@ > memset(nvfp, 0, sizeof(nv_file_private_t)); > > // initialize this file's event queue >- INIT_EVENT_QUEUE(nvfp->wqueue); >+ init_waitqueue_head(&nvfp->waitqueue); > > nv_init_lock(nvfp->fp_lock); > >@@ -1116,7 +1083,6 @@ > if (nvfp == NULL) > return; > >- FREE_EVENT_QUEUE(nvfp->wqueue); > NV_VFREE(nvfp->event_fifo, sizeof(nv_event_t) * NV_EVENT_FIFO_SIZE); > NV_VFREE(nvfp, sizeof(nv_file_private_t)); > } >@@ -1145,11 +1111,11 @@ > > /* for control device, just jump to its open routine */ > /* after setting up the private data */ >- if (NV_DEVICE_IS_CONTROL_DEVICE(inode->i_rdev)) >+ if (NV_IS_CONTROL_DEVICE(inode)) > return nv_kern_ctl_open(inode, file); > > /* what device are we talking about? */ >- devnum = NV_DEVICE_NUMBER(inode->i_rdev); >+ devnum = NV_DEVICE_NUMBER(inode); > if (devnum >= NV_MAX_DEVICES) > { > rc = -ENODEV; >@@ -1202,12 +1168,14 @@ > goto failed; > } > >+ nvl->tasklet.func = (void *) rm_isr_bh; >+ nvl->tasklet.data = (unsigned long) nv->pdev; >+ tasklet_enable(&nvl->tasklet); > > nv->flags |= NV_FLAG_OPEN; > } > > nv->usage_count++; >- MOD_INC_USE_COUNT; > > failed: > nv_unlock(nvl->ldata_lock); >@@ -1238,38 +1206,32 @@ > > /* for control device, just jump to its open routine */ > /* after setting up the private data */ >- if (NV_DEVICE_IS_CONTROL_DEVICE(inode->i_rdev)) >+ if (NV_IS_CONTROL_DEVICE(inode)) > return nv_kern_ctl_close(inode, file); > >- nv_printf(NV_DBG_INFO, "nv_kern_close on device %d\n", NV_DEVICE_NUMBER(inode->i_rdev)); >+ nv_printf(NV_DBG_INFO, "nv_kern_close on device %d\n", NV_DEVICE_NUMBER(inode)); > > rm_free_unused_clients(nv, current->pid, (void *) file); > > nv_lock(nvl->ldata_lock); > if (--nv->usage_count == 0) > { >- int counter = 0; >- >- /* turn off interrupts. >- ** be careful to make sure any pending bottom half gets run >- ** or disabled before calling rm_shutdown_adapter() since >- ** it will free up the pdev. This is hard to see on single >- ** cpu systems, but easy on dual cpu :-) >- */ >+ /* >+ * The usage count for this device has dropped to zero, it can be shut >+ * down safely; disable its interrupts. >+ */ > rm_disable_adapter(nv); > >- /* give it a moment to allow any bottom half to run */ >- >-#define MAX_BH_TASKS 10 >- while (NV_ATOMIC_READ(nvl->bh_count) && (counter < MAX_BH_TASKS)) >- { >- current->state = TASK_INTERRUPTIBLE; >- schedule_timeout(HZ/50); >- counter++; >- } >+ /* >+ * Disable this device's tasklet to make sure that no bottom half will >+ * run with undefined device state. >+ */ >+ tasklet_disable(&nvl->tasklet); > >- /* free the irq, which may block until any pending interrupts */ >- /* are done being processed. */ >+ /* >+ * Free the IRQ, which may block until all pending interrupt processing >+ * has completed. >+ */ > free_irq(nv->interrupt_line, (void *) nv); > > rm_shutdown_adapter(nv); >@@ -1300,8 +1262,6 @@ > FILE_PRIVATE(file) = NULL; > } > >- MOD_DEC_USE_COUNT; >- > return 0; > } > >@@ -1318,10 +1278,10 @@ > nv_printf(NV_DBG_INFO, "mmap([0x%p-0x%p] off=0x%lx)\n", > vma->vm_start, > vma->vm_end, >- LINUX_VMA_OFFS(vma)); >+ NV_VMA_OFFSET(vma)); > > // be a bit paranoid for now >- if ((NV_MASK_OFFSET(LINUX_VMA_OFFS(vma))) || >+ if ((NV_MASK_OFFSET(NV_VMA_OFFSET(vma))) || > (NV_MASK_OFFSET(vma->vm_start)) || > (NV_MASK_OFFSET(vma->vm_end))) > { >@@ -1339,7 +1299,7 @@ > > > /* NV reg space */ >- if (IS_REG_OFFSET(nv, LINUX_VMA_OFFS(vma), vma->vm_end - vma->vm_start)) >+ if (IS_REG_OFFSET(nv, NV_VMA_OFFSET(vma), vma->vm_end - vma->vm_start)) > { > /* truncate to size of registers */ > if (pages > nv->regs->size / PAGE_SIZE) >@@ -1347,7 +1307,7 @@ > > vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); > if (NV_REMAP_PAGE_RANGE(vma->vm_start, >- LINUX_VMA_OFFS(vma), >+ NV_VMA_OFFSET(vma), > vma->vm_end - vma->vm_start, > vma->vm_page_prot)) > return -EAGAIN; >@@ -1357,7 +1317,7 @@ > } > > /* NV fb space */ >- else if (IS_FB_OFFSET(nv, LINUX_VMA_OFFS(vma), vma->vm_end - vma->vm_start)) >+ else if (IS_FB_OFFSET(nv, NV_VMA_OFFSET(vma), vma->vm_end - vma->vm_start)) > { > > /* truncate to size of framebuffer */ >@@ -1366,7 +1326,7 @@ > > vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); > if (NV_REMAP_PAGE_RANGE(vma->vm_start, >- LINUX_VMA_OFFS(vma), >+ NV_VMA_OFFSET(vma), > vma->vm_end - vma->vm_start, > vma->vm_page_prot)) > return -EAGAIN; >@@ -1376,10 +1336,10 @@ > } > > /* AGP allocator */ >- else if (IS_AGP_OFFSET(nv, LINUX_VMA_OFFS(vma), vma->vm_end - vma->vm_start)) >+ else if (IS_AGP_OFFSET(nv, NV_VMA_OFFSET(vma), vma->vm_end - vma->vm_start)) > { > nv_lock(nvl->at_lock); >- at = nvl_find_alloc(nvl, LINUX_VMA_OFFS(vma), NV_ALLOC_TYPE_AGP); >+ at = nvl_find_alloc(nvl, NV_VMA_OFFSET(vma), NV_ALLOC_TYPE_AGP); > > if (at == NULL) > { >@@ -1397,7 +1357,7 @@ > } > > at->vma = vma; >- VMA_PRIVATE(vma) = at; >+ NV_VMA_PRIVATE(vma) = at; > at->usage_count++; > > if (NV_OSAGP_ENABLED(nv)) >@@ -1420,13 +1380,13 @@ > } > > /* Magic allocator */ >- else // if (LINUX_VMA_OFFS(vma) == NV_MMAP_ALLOCATION_OFFSET) >+ else // if (NV_VMA_OFFSET(vma) == NV_MMAP_ALLOCATION_OFFSET) > { > unsigned long page = 0, pos, start; > int i = 0; > > nv_lock(nvl->at_lock); >- at = nvl_find_alloc(nvl, LINUX_VMA_OFFS(vma), NV_ALLOC_TYPE_PCI); >+ at = nvl_find_alloc(nvl, NV_VMA_OFFSET(vma), NV_ALLOC_TYPE_PCI); > > if (at == NULL) > { >@@ -1444,7 +1404,7 @@ > } > > at->vma = vma; >- VMA_PRIVATE(vma) = at; >+ NV_VMA_PRIVATE(vma) = at; > at->usage_count++; > > nv_printf(NV_DBG_INFO, "remapping %d system pages for at 0x%x\n", pages, at); >@@ -1466,9 +1426,6 @@ > > vma->vm_file = file; > >- /* just increment usage count, rather than calling vma_open */ >- MOD_INC_USE_COUNT; >- > return 0; > } > >@@ -1494,7 +1451,7 @@ > { > nv_printf(NV_DBG_EVENTINFO, "calling poll_wait\n"); > // add us to the list >- poll_wait(file, EVENT_QUEUE(nvfp->wqueue), wait); >+ poll_wait(file, &nvfp->waitqueue, wait); > } > > nv_lock(nvfp->fp_lock); >@@ -1562,12 +1519,13 @@ > > switch (_IOC_NR(cmd)) > { >+#if !defined(KERNEL_2_6) > /* debug tool; zap the module use count so we can unload driver */ > /* even if it is confused */ > case NV_ESC_MODULE_RESET: > atomic_set(&__this_module.uc.usecount, 1); > break; >- >+#endif > /* pass out info about the card */ > case NV_ESC_CARD_INFO: > { >@@ -1694,7 +1652,7 @@ > * driver receives an interrupt > * if someone waiting, then hand it off. > */ >-void nv_kern_isr( >+irqreturn_t nv_kern_isr( > int irq, > void *arg, > struct pt_regs *regs >@@ -1708,9 +1666,10 @@ > if (need_to_run_bottom_half) > { > NV_ATOMIC_INC(nvl->bh_count); >- queue_task(nvl->bh, &tq_immediate); >- mark_bh(IMMEDIATE_BH); >+ tasklet_schedule(&nvl->tasklet); > } >+ >+ return IRQ_HANDLED; > } > > void nv_kern_bh( >@@ -1828,11 +1787,9 @@ > > if (nv->usage_count == 0) > { >- INIT_EVENT_QUEUE(nv_ctl_wqueue); >+ init_waitqueue_head(&nv_ctl_waitqueue); > } > >- MOD_INC_USE_COUNT; >- > nv->flags |= NV_FLAG_OPEN + NV_FLAG_CONTROL; > > /* turn off the hotkey occurred bit */ >@@ -1860,10 +1817,8 @@ > > nv_lock(nvl->ldata_lock); > if (--nv->usage_count == 0) >- { >- FREE_EVENT_QUEUE(nv_ctl_wqueue); > nv->flags = 0; >- } >+ > nv_unlock(nvl->ldata_lock); > > rm_free_unused_clients(nv, current->pid, (void *) file); >@@ -1874,8 +1829,6 @@ > FILE_PRIVATE(file) = NULL; > } > >- MOD_DEC_USE_COUNT; >- > return 0; > } > >@@ -1899,7 +1852,7 @@ > nv = NV_STATE_PTR(nvl); > > if ( !(file->f_flags & O_NONBLOCK) ) >- poll_wait(file, EVENT_QUEUE(nv_ctl_wqueue), wait); >+ poll_wait(file, &nv_ctl_waitqueue, wait); > > nv_lock(nvl->ldata_lock); > >@@ -1930,7 +1883,7 @@ > nv_ctl_device.nv_state.flags |= NV_FLAG_HOTKEY_OCCURRED; > nv_unlock(nv_ctl_device.ldata_lock); > >- wake_up_interruptible(EVENT_QUEUE(nv_ctl_wqueue)); >+ wake_up_interruptible(&nv_ctl_waitqueue); > } > > int nv_kern_read_cardinfo(char *page, char **start, off_t off, >@@ -2009,7 +1962,7 @@ > len += sprintf(page+len, "Host Bridge: \t "); > > #if defined(CONFIG_PCI_NAMES) >- len += sprintf(page+len, "%s\n", dev->name); >+ len += sprintf(page+len, "%s\n", NV_PCI_DEVICE_NAME(dev)); > #else > len += sprintf(page+len, "PCI device %04x:%04x\n", > dev->vendor, dev->device); >@@ -2137,18 +2090,15 @@ > { > unsigned long retaddr = (unsigned long) at->page_table[i]; > >- // if we've allocated via vmalloc on a highmem system, the >- // physical address may not be accessible via PAGE_OFFSET, >- // that's ok, we have a simple linear pointer already. > if (at->flags & NV_ALLOC_TYPE_VMALLOC) > { > return (void *)((unsigned char *) at->key_mapping + (i << PAGE_SHIFT) + offset); > } >- >- if (retaddr <= MAXMEM) >- { >- return __va((retaddr + offset)); >- } >+ else if (!(at->flags & NV_ALLOC_TYPE_CONTIG)) >+ { >+ return __va((retaddr + offset)); >+ } >+ > > // ?? this may be a contiguous allocation, fall through > // to below? or should I just check at->flag here? >@@ -2218,9 +2168,9 @@ > unsigned long > nv_get_phys_address(unsigned long address) > { >- pgd_t *pg_dir; >- pmd_t *pg_mid_dir; >- pte_t pte; >+ pgd_t *pgd; >+ pmd_t *pmd; >+ pte_t *pte; > unsigned long retval; > > #if defined(NVCPU_IA64) >@@ -2234,23 +2184,24 @@ > return __pa(address); > > if (address > VMALLOC_START) >- pg_dir = pgd_offset_k(address); >+ pgd = pgd_offset_k(address); > else >- pg_dir = pgd_offset(current->mm, address); >+ pgd = pgd_offset(current->mm, address); > >- if (pgd_none(*pg_dir)) >+ if (!pgd || pgd_none(*pgd)) > goto failed; > >- pg_mid_dir = pmd_offset(pg_dir, address); >- if (pmd_none(*pg_mid_dir)) >+ NV_PMD_OFFSET(address, pgd, pmd); >+ >+ if (!NV_PMD_PRESENT(pmd)) > goto failed; > >- NV_PTE_OFFSET(address, pg_mid_dir, pte); >+ NV_PTE_OFFSET(address, pmd, pte); > >- if (!pte_present(pte)) >+ if (!NV_PTE_PRESENT(pte)) > goto failed; > >- retval = ((pte_val(pte) & KERN_PAGE_MASK) | NV_MASK_OFFSET(address)); >+ retval = (NV_PTE_VALUE(pte) & KERN_PAGE_MASK) | NV_MASK_OFFSET(address); > > #if defined(NVCPU_X86_64) && defined(_PAGE_NX) > // mask out the non-executable page bit for the true physical address >@@ -2618,8 +2569,7 @@ > nvfp->put = 0; > > nv_unlock(nvfp->fp_lock); >- >- wake_up_interruptible(EVENT_QUEUE(nvfp->wqueue)); >+ wake_up_interruptible(&nvfp->waitqueue); > } > > int nv_get_event( >@@ -2704,12 +2654,8 @@ > if ( (NV_AGP_DISABLED(nv)) && (config & NVOS_AGP_CONFIG_NVAGP) ) > { > /* make sure the user does not have agpgart loaded */ >-#if !defined (KERNEL_2_2) > if (inter_module_get("drm_agp")) { > inter_module_put("drm_agp"); >-#else >- if (GET_MODULE_SYMBOL(0, __MODULE_STRING(agp_enable))) { >-#endif > nv_printf(NV_DBG_WARNINGS, "NVRM: not using NVAGP, AGPGART is loaded!!\n"); > } else > status = rm_init_agp(nv); >diff -u NVIDIA_kernel-1.0-4499/os-agp.c NVIDIA_kernel-1.0-4499-2.6/os-agp.c >--- NVIDIA_kernel-1.0-4499/os-agp.c 2003-09-17 20:22:11.000000000 -0400 >+++ NVIDIA_kernel-1.0-4499-2.6/os-agp.c 2003-10-09 00:30:08.737554632 -0400 >@@ -45,44 +45,9 @@ > int ready; > } agp_gart; > >-typedef struct { >- int (*backend_acquire)(void); >- void (*backend_release)(void); >- void (*copy_info)(agp_kern_info *); >- agp_memory * (*allocate_memory)(size_t, unsigned int); >- void (*free_memory)(agp_memory *); >- int (*bind_memory)(agp_memory *, off_t); >- int (*unbind_memory)(agp_memory *); >- void (*enable)(unsigned int); >-} agp_operations_struct; >- >-agp_operations_struct agp_ops; > agp_kern_info agpinfo; > agp_gart gart; >-#if !defined (KERNEL_2_2) > const drm_agp_t *drm_agp_p; >-#endif >- >-#if defined (KERNEL_2_2) >- #define GET_AGPGART_SYMBOL(sym, sym_string) \ >- sym = (void*) GET_MODULE_SYMBOL(0, sym_string); \ >- if (sym == NULL) \ >- { \ >- nv_printf(NV_DBG_ERRORS, \ >- "NVRM: AGPGART: unable to retrieve symbol %s\n", \ >- sym_string); \ >- return 1; \ >- } >- >- #define AGP_BACKEND_ACQUIRE_SYM __MODULE_STRING(agp_backend_acquire) >- #define AGP_BACKEND_RELEASE_SYM __MODULE_STRING(agp_backend_release) >- #define AGP_COPY_INFO_SYM __MODULE_STRING(agp_copy_info) >- #define AGP_ALLOCATE_MEMORY_SYM __MODULE_STRING(agp_allocate_memory) >- #define AGP_FREE_MEMORY_SYM __MODULE_STRING(agp_free_memory) >- #define AGP_BIND_MEMORY_SYM __MODULE_STRING(agp_bind_memory) >- #define AGP_UNBIND_MEMORY_SYM __MODULE_STRING(agp_unbind_memory) >- #define AGP_ENABLE_SYM __MODULE_STRING(agp_enable) >-#endif > > #if defined(CONFIG_MTRR) > #define MTRR_DEL(gart) if ((gart).mtrr > 0) mtrr_del((gart).mtrr, 0, 0); >@@ -105,13 +70,17 @@ > U032 agp_rate; > U032 agp_sba; > U032 agp_fw; >- char* chipset; > VOID *bitmap; > U032 bitmap_size; > > memset( (void *) &gart, 0, sizeof(agp_gart)); > >-#if !defined (KERNEL_2_2) >+ /* >+ * XXX The inter_module_* mechanism has been deprecated and replaced with >+ * a different mechanism in Linux 2.5; it will go away eventually. >+ * Also, the Linux 2.5 AGP GART driver is modularized, agpgart.o does not >+ * include backend drivers. >+ */ > if (!(drm_agp_p = inter_module_get_request("drm_agp", "agpgart"))) > { > nv_printf(NV_DBG_ERRORS, >@@ -119,48 +88,13 @@ > return 1; > } > >- agp_ops.backend_acquire = drm_agp_p->acquire; >- agp_ops.backend_release = drm_agp_p->release; >- agp_ops.allocate_memory = drm_agp_p->allocate_memory; >- agp_ops.free_memory = drm_agp_p->free_memory; >- agp_ops.bind_memory = drm_agp_p->bind_memory; >- agp_ops.unbind_memory = drm_agp_p->unbind_memory; >- agp_ops.enable = drm_agp_p->enable; >- >- // looks like some newer kernels (for example mandrake 9.0's 2.4.19-16mdk) >- // have updated copy_info to return an integer value, and of course didn't >- // bother bumping the agpgart revision up. The return value is pretty >- // harmless (backend_acquire would have already failed and caused us to >- // bail), so cast the function pointer to avoid compiler warnings. >- // we may need to revisit this in the future. >- agp_ops.copy_info = (void (*)(agp_kern_info *)) drm_agp_p->copy_info; >- >-#else >-#if defined(CONFIG_KMOD) >- if ( request_module("agpgart") ) >- { >- nv_printf(NV_DBG_ERRORS, "NVRM: AGPGART: not loading agpgart.o\n"); >- return 1; >- } >-#endif >- >- GET_AGPGART_SYMBOL(agp_ops.backend_acquire, AGP_BACKEND_ACQUIRE_SYM); >- GET_AGPGART_SYMBOL(agp_ops.backend_release, AGP_BACKEND_RELEASE_SYM); >- GET_AGPGART_SYMBOL(agp_ops.copy_info, AGP_COPY_INFO_SYM); >- GET_AGPGART_SYMBOL(agp_ops.allocate_memory, AGP_ALLOCATE_MEMORY_SYM); >- GET_AGPGART_SYMBOL(agp_ops.free_memory, AGP_FREE_MEMORY_SYM); >- GET_AGPGART_SYMBOL(agp_ops.bind_memory, AGP_BIND_MEMORY_SYM); >- GET_AGPGART_SYMBOL(agp_ops.unbind_memory, AGP_UNBIND_MEMORY_SYM); >- GET_AGPGART_SYMBOL(agp_ops.enable, AGP_ENABLE_SYM); >-#endif >- > /* NOTE: from here down, return an error code of '-1' > * that indicates that agpgart is loaded, but we failed to use it > * in some way. This is so we don't try to use nvagp and lock up > * the memory controller. > */ > >- if ( (*(agp_ops.backend_acquire))() ) >+ if (drm_agp_p->acquire()) > { > nv_printf(NV_DBG_ERRORS, "NVRM: AGPGART: backend in use\n"); > return -1; >@@ -178,44 +112,21 @@ > agp_fw = 1; > agp_fw &= 0x00000001; > >- (*(agp_ops.copy_info))(&agpinfo); >- >- switch ( agpinfo.chipset ) >- { >- case INTEL_GENERIC: chipset = "Intel"; break; >- case INTEL_LX: chipset = "Intel 440LX"; break; >- case INTEL_BX: chipset = "Intel 440BX"; break; >- case INTEL_GX: chipset = "Intel 440GX"; break; >- case INTEL_I810: chipset = "Intel i810"; break; >- case INTEL_I840: chipset = "Intel i840"; break; >-#if !defined (KERNEL_2_2) >- case INTEL_I815: chipset = "Intel i815"; break; >-#if !defined(__rh_config_h__) >- case INTEL_I850: chipset = "Intel i850"; break; >-#endif >-#endif >-#if defined(NVCPU_IA64) >- case INTEL_460GX: chipset = "Intel 460GX"; break; >-#endif >- case VIA_GENERIC: chipset = "VIA"; break; >- case VIA_VP3: chipset = "VIA VP3"; break; >- case VIA_MVP3: chipset = "VIA MVP3"; break; >- case VIA_MVP4: chipset = "VIA MVP4"; break; >-#if !defined (KERNEL_2_2) >- case VIA_APOLLO_KX133: chipset = "VIA Apollo KX133"; break; >- case VIA_APOLLO_KT133: chipset = "VIA Apollo KT133"; break; >-#endif >- case VIA_APOLLO_PRO: chipset = "VIA Apollo Pro"; break; >- case SIS_GENERIC: chipset = "SiS"; break; >- case AMD_GENERIC: chipset = "AMD"; break; >- case AMD_IRONGATE: chipset = "AMD Irongate"; break; >- case ALI_M1541: chipset = "ALi M1541"; break; >- case ALI_GENERIC: chipset = "ALi"; break; >- case NOT_SUPPORTED: chipset = "unsupported"; break; >- default: chipset = "unknown"; >+#if defined(KERNEL_2_4) >+ /* >+ * The original Linux 2.4 AGP GART driver interface declared copy_info to >+ * return nothing. This changed in Linux 2.5, which reports unsupported >+ * chipsets via this function. If this Linux 2.4 kernels behaves the same >+ * way, we have no way to know. >+ */ >+ drm_agp_p->copy_info(&agpinfo); >+#else >+ if (drm_agp_p->copy_info(&agpinfo)) { >+ drm_agp_p->release(); >+ inter_module_put("drm_agp"); >+ return -1; > } >- >- nv_printf(NV_DBG_SETUP, "NVRM: AGPGART: %s chipset\n", chipset); >+#endif > > #ifdef CONFIG_MTRR > if ((gart.mtrr = mtrr_add(agpinfo.aper_base, >@@ -229,7 +140,8 @@ > */ > nv_printf(NV_DBG_ERRORS, > "NVRM: AGPGART: unable to set MTRR write-combining\n"); >- (*(agp_ops.backend_release))(); >+ drm_agp_p->release(); >+ inter_module_put("drm_agp"); > return -1; > } > #endif >@@ -245,7 +157,8 @@ > { > nv_printf(NV_DBG_ERRORS, "NVRM: AGPGART: unable to remap aperture\n"); > MTRR_DEL(gart); >- (*(agp_ops.backend_release))(); >+ drm_agp_p->release(); >+ inter_module_put("drm_agp"); > return -1; > } > >@@ -256,7 +169,8 @@ > nv_printf(NV_DBG_ERRORS, "NVRM: AGPGART: unable to allocate bitmap\n"); > NV_IOUNMAP(gart.aperture, RM_PAGE_SIZE); > MTRR_DEL(gart); >- (*(agp_ops.backend_release))(); >+ drm_agp_p->release(); >+ inter_module_put("drm_agp"); > return -1; > } > >@@ -267,39 +181,19 @@ > os_free_mem(bitmap); > NV_IOUNMAP(gart.aperture, RM_PAGE_SIZE); > MTRR_DEL(gart); >- (*(agp_ops.backend_release))(); >+ drm_agp_p->release(); >+ inter_module_put("drm_agp"); > return -1; > } > >- nv_printf(NV_DBG_SETUP, >- "NVRM: AGPGART: aperture: %ldM @ 0x%08lx\n", >- (unsigned long)agpinfo.aper_size, >- (unsigned long)agpinfo.aper_base); >- >- nv_printf(NV_DBG_SETUP, >- "NVRM: AGPGART: aperture mapped from 0x%08lx to 0x%08lx\n", >- agpinfo.aper_base, >- (unsigned long) gart.aperture); >- > if (!agp_sba) agpinfo.mode &= ~0x00000200; > if (!agp_fw) agpinfo.mode &= ~0x00000010; > > if (!(agp_rate & 0x00000004)) agpinfo.mode &= ~0x00000004; > if (!(agp_rate & 0x00000002)) agpinfo.mode &= ~0x00000002; > >- (*(agp_ops.enable))(agpinfo.mode); >+ drm_agp_p->enable(agpinfo.mode); > >- if (agpinfo.mode & 0x00000200) >- nv_printf(NV_DBG_SETUP, "NVRM: AGPGART: backend supports sba\n"); >- if (agpinfo.mode & 0x00000010) >- nv_printf(NV_DBG_SETUP, "NVRM: AGPGART: backend supports fw\n"); >- if (agpinfo.mode & 0x00000004) >- nv_printf(NV_DBG_SETUP, "NVRM: AGPGART: mode 4x\n"); >- else if (agpinfo.mode & 0x00000002) >- nv_printf(NV_DBG_SETUP, "NVRM: AGPGART: mode 2x\n"); >- else if (agpinfo.mode & 0x00000001) >- nv_printf(NV_DBG_SETUP, "NVRM: AGPGART: mode 1x\n"); >- > *ap_phys_base = (void*) agpinfo.aper_base; > *ap_mapped_base = (void*) gart.aperture; > *apsize = (agpinfo.aper_size * 0x100000) - 1; >@@ -333,11 +227,13 @@ > NV_IOUNMAP(gart.aperture, RM_PAGE_SIZE); > } > >- (*(agp_ops.backend_release))(); >+ drm_agp_p->release(); > >-#if !defined (KERNEL_2_2) >+ /* >+ * XXX Same as above; the inter_module_* mechanism will go away at some >+ * point, it has been deprecated in Linux 2.5. >+ */ > inter_module_put("drm_agp"); >-#endif > > if (rm_clear_agp_bitmap(nv, &bitmap)) > { >@@ -384,7 +280,7 @@ > return RM_ERROR; > } > >- ptr = (*agp_ops.allocate_memory)(PageCount, AGP_NORMAL_MEMORY); >+ ptr = drm_agp_p->allocate_memory(PageCount, AGP_NORMAL_MEMORY); > if (ptr == NULL) > { > *pAddress = (void*) 0; >@@ -392,7 +288,7 @@ > return RM_ERR_NO_FREE_MEM; > } > >- err = (*(agp_ops.bind_memory))(ptr, *Offset); >+ err = drm_agp_p->bind_memory(ptr, *Offset); > if (err) > { > // this happens a lot when the aperture itself fills up.. >@@ -409,7 +305,7 @@ > if (status != RM_OK) > { > nv_printf(NV_DBG_ERRORS, "NVRM: memory allocation failed\n"); >- (*(agp_ops.unbind_memory))(ptr); >+ drm_agp_p->unbind_memory(ptr); > goto fail; > } > >@@ -424,7 +320,7 @@ > return RM_OK; > > fail: >- (*(agp_ops.free_memory))(ptr); >+ drm_agp_p->free_memory(ptr); > *pAddress = (void*) 0; > > return RM_ERROR; >@@ -463,7 +359,7 @@ > { > nv_printf(NV_DBG_ERRORS, "NVRM: AGPGART: unable to remap %lu pages\n", > (unsigned long)agp_data->num_pages); >- (*(agp_ops.unbind_memory))(agp_data->ptr); >+ drm_agp_p->unbind_memory(agp_data->ptr); > goto fail; > } > >@@ -481,9 +377,6 @@ > #endif /* AGPGART */ > } > >- >-#if !defined(KERNEL_2_2) >- > RM_STATUS > KernMapAGPNopage( > VOID *address, >@@ -530,9 +423,6 @@ > #endif > } > >-#endif /* !defined(KERNEL_2_2) */ >- >- > RM_STATUS KernFreeAGPPages( > nv_state_t *nv, > VOID **pAddress, >@@ -558,8 +448,8 @@ > { > size_t pages = ptr->page_count; > >- (*(agp_ops.unbind_memory))(ptr); >- (*(agp_ops.free_memory))(ptr); >+ drm_agp_p->unbind_memory(ptr); >+ drm_agp_p->free_memory(ptr); > > nv_printf(NV_DBG_INFO, "NVRM: AGPGART: freed %ld pages\n", > (unsigned long)pages); >diff -u NVIDIA_kernel-1.0-4499/os-interface.c NVIDIA_kernel-1.0-4499-2.6/os-interface.c >--- NVIDIA_kernel-1.0-4499/os-interface.c 2003-09-17 20:22:11.000000000 -0400 >+++ NVIDIA_kernel-1.0-4499-2.6/os-interface.c 2003-10-09 00:30:08.737554632 -0400 >@@ -56,7 +56,7 @@ > PHWINFO pDev > ) > { >- return suser(); >+ return NV_IS_SUSER(); > } > > U032 os_get_page_size(VOID) >@@ -211,6 +211,11 @@ > { > NV_MEM_TRACKING_PAD_SIZE(size); > >+ /* >+ * XXX This needs to be !NV_MAY_SLEEP() rather than in_interrupt(); that >+ * requires quite a bit of locking to be rearranged, however, which is why >+ * I'll leave it alone for now. >+ */ > if (in_interrupt()) { > if (size <= KMALLOC_LIMIT) { > /* >@@ -296,7 +301,7 @@ > *address = (void *) va; > > for (i = 0; i < count; i++) { >- mem_map_reserve(GET_MAP_NR(__pa((va)))); >+ SetPageReserved(virt_to_page(va)); > va += PAGE_SIZE; > } > >@@ -320,7 +325,7 @@ > unsigned long va = (unsigned long) address; > > for (i = 0; i < count; i++) { >- mem_map_unreserve(GET_MAP_NR(__pa((va)))); >+ ClearPageReserved(virt_to_page(va)); > va += PAGE_SIZE; > } > >@@ -426,7 +431,7 @@ > if (in_irq() && MilliSeconds > NV_MAX_ISR_MDELAY) > return RM_ERROR; > >- if (in_interrupt()) >+ if (!NV_MAY_SLEEP()) > { > mdelay(MilliSeconds); > return RM_OK; >@@ -524,8 +529,8 @@ > // The current debug display level (default to maximum debug level) > int cur_debuglevel = 0xaaaaaaaa; > >-MODULE_PARM(silence_nvidia_output, "1i"); > static int silence_nvidia_output = 0; >+NV_MODULE_PARAMETER(silence_nvidia_output); > > > // >@@ -708,14 +713,14 @@ > > ULONG os_cli(ULONG flags) > { >- save_flags(flags); >- cli(); >+ NV_SAVE_FLAGS(flags); >+ NV_CLI(); > return flags; > } > > ULONG os_sti(ULONG flags) > { >- restore_flags(flags); >+ NV_RESTORE_FLAGS(flags); > return flags; > } > >@@ -848,16 +853,6 @@ > NV_IOREMAP_NOCACHE(vaddr, start, size_bytes); > } > >-#if defined (KERNEL_2_2) >- if ((vaddr == NULL)) // && (mode == NV_MEMORY_DEFAULT)) >- { >- unsigned long map_nr = MAP_NR(__va(start)); >- if (map_nr < max_mapnr) { >- vaddr = __va(start); >- } >- } >-#endif >- > #ifdef DEBUG > if (mode == NV_MEMORY_WRITECOMBINED) { > nv_printf(NV_DBG_ERRORS, >@@ -878,16 +873,7 @@ > U032 size_bytes > ) > { >-#if defined (KERNEL_2_2) >- if (MAP_NR(addr) < max_mapnr) { >- // if we didn't want the memory cached, this isn't necessary >- // but we shouldn't be in a timing critical piece of code. >- asm volatile("wbinvd":::"memory"); >- } else >-#endif >- { >- NV_IOUNMAP(addr, size_bytes); >- } >+ NV_IOUNMAP(addr, size_bytes); > } > > VOID* os_map_user_space( >@@ -991,7 +977,7 @@ > > U032 os_get_cpu_count() > { >- return smp_num_cpus; >+ return NV_SMP_NUM_CPUS; > } > > >@@ -1054,12 +1040,15 @@ > if (sgi_funcs.add_barrier == NULL) > { > #if defined(TESTING_SWAP) >-#if !defined (KERNEL_2_2) >+ /* >+ * XXX The inter_module_* mechanism has been deprecated in Linux 2.5, a >+ * new mechanism is in place; this code will need to be updated at some >+ * point. >+ */ > inter_module_register(ADD_BARRIER_FUNC, THIS_MODULE, sgitest_add_barrier); > inter_module_register(REMOVE_BARRIER_FUNC, THIS_MODULE, sgitest_remove_barrier); > inter_module_register(SWAP_READY_FUNC, THIS_MODULE, sgitest_swap_ready); > #endif >-#endif > sgi_funcs.add_barrier = GET_MODULE_SYMBOL(0, ADD_BARRIER_FUNC); > sgi_funcs.remove_barrier = GET_MODULE_SYMBOL(0, REMOVE_BARRIER_FUNC); > sgi_funcs.swap_ready = GET_MODULE_SYMBOL(0, SWAP_READY_FUNC); >diff -u NVIDIA_kernel-1.0-4499/os-registry.c NVIDIA_kernel-1.0-4499-2.6/os-registry.c >--- NVIDIA_kernel-1.0-4499/os-registry.c 2003-09-17 20:22:11.000000000 -0400 >+++ NVIDIA_kernel-1.0-4499-2.6/os-registry.c 2003-10-09 00:30:08.738554480 -0400 >@@ -48,24 +48,6 @@ > * This could be changed to work on a per-device basis. > */ > >-/* >- * The 2nd argument to MODULE_PARM is used to verify parameters passed >- * to the module at load time. It should be a string in the following >- * format: >- * >- * [min[-max]]{b,h,i,l,s} >- * >- * The MIN and MAX specifiers delimit the length of the array. If MAX >- * is omitted, it defaults to MIN; if both are omitted, the default is >- * 1. The final character is a type specifier. >- * >- * b byte >- * h short >- * i int >- * l long >- * s string >- */ >- > /* > * Option: VideoMemoryTypeOverride > * >@@ -92,7 +74,7 @@ > */ > > static int NVreg_VideoMemoryTypeOverride = 1; >-MODULE_PARM(NVreg_VideoMemoryTypeOverride, "i"); >+NV_MODULE_PARAMETER(NVreg_VideoMemoryTypeOverride); > > /* > * Option: EnableVia4x >@@ -111,7 +93,7 @@ > */ > > static int NVreg_EnableVia4x = 0; >-MODULE_PARM(NVreg_EnableVia4x, "i"); >+NV_MODULE_PARAMETER(NVreg_EnableVia4x); > > /* > * Option: EnableALiAGP >@@ -134,7 +116,7 @@ > */ > > static int NVreg_EnableALiAGP = 0; >-MODULE_PARM(NVreg_EnableALiAGP, "i"); >+NV_MODULE_PARAMETER(NVreg_EnableALiAGP); > > /* > * Option: ReqAGPRate >@@ -164,7 +146,7 @@ > */ > > static int NVreg_ReqAGPRate = 7; >-MODULE_PARM(NVreg_ReqAGPRate, "i"); >+NV_MODULE_PARAMETER(NVreg_ReqAGPRate); > > /* > * Option: UpdateKernelAGP >@@ -193,7 +175,7 @@ > */ > > static int NVreg_UpdateKernelAGP = 1; >-MODULE_PARM(NVreg_UpdateKernelAGP, "i"); >+NV_MODULE_PARAMETER(NVreg_UpdateKernelAGP); > > /* > * Option: EnableAGPSBA >@@ -226,7 +208,7 @@ > static int NVreg_EnableAGPSBA = 0; > #endif > >-MODULE_PARM(NVreg_EnableAGPSBA, "i"); >+NV_MODULE_PARAMETER(NVreg_EnableAGPSBA); > > /* > * Option: EnableAGPFW >@@ -250,7 +232,7 @@ > */ > > static int NVreg_EnableAGPFW = 0; >-MODULE_PARM(NVreg_EnableAGPFW, "i"); >+NV_MODULE_PARAMETER(NVreg_EnableAGPFW); > > /* > * Option: SoftEDIDs >@@ -269,7 +251,7 @@ > */ > > static int NVreg_SoftEDIDs = 1; >-MODULE_PARM(NVreg_SoftEDIDs, "i"); >+NV_MODULE_PARAMETER(NVreg_SoftEDIDs); > > /* > * Option: Mobile >@@ -293,14 +275,14 @@ > */ > > static int NVreg_Mobile = ~0; >-MODULE_PARM(NVreg_Mobile, "i"); >+NV_MODULE_PARAMETER(NVreg_Mobile); > > > static int NVreg_ResmanDebugLevel = ~0; >-MODULE_PARM(NVreg_ResmanDebugLevel, "i"); >+NV_MODULE_PARAMETER(NVreg_ResmanDebugLevel); > > static int NVreg_FlatPanelMode = 0; >-MODULE_PARM(NVreg_FlatPanelMode, "i"); >+NV_MODULE_PARAMETER(NVreg_FlatPanelMode); > > /* > * You can enable any of the registry options disabled by default by
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=19060">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 30779
:
19029
|
19030
|
19031
|
19032
|
19059
|
19060
|
19210
|
19211
|
19212
