[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Update: nVidia drivers (1.0-5332)



FYI:  Drivers work for me with 2.6 kernel (2.6.1-bk3) after applying 
this patch that I found on the NVnet driver forum (attached).  
'glxgears' only musters a little over 1000 fps no matter which 
AGPgart I use on my FX5200.

Also, for those who care, vertex buffer objects ARB is now enabled in 
these drivers (see 'glxinfo' dump for complete list).

-- 
Scott Coppen
diff -ruN NVIDIA-Linux-x86_64-1.0-5332-pkg0/usr/src/nv/Makefile NVIDIA-Linux-x86_64-1.0-5332-pkg0-old/usr/src/nv/Makefile
--- NVIDIA-Linux-x86_64-1.0-5332-pkg0/usr/src/nv/Makefile	2004-01-09 13:07:06.000000000 -0800
+++ NVIDIA-Linux-x86_64-1.0-5332-pkg0-old/usr/src/nv/Makefile	2004-01-09 13:07:06.000000000 -0800
@@ -1,124 +1,36 @@
 # This Makefile is automatically generated; do not edit
 #   Generated on 'builder26' on Fri Jan  9 12:42:34 PST 2004
 
-# to use this file, rename or delete the default Makefile, then rename or
-# link this file to Makefile. then type 'make'
+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=5332    -DNV_UNIX  -DNV_LINUX  -DNV_INT64_OK  -DNV_64_BITS  -DNVCPU_X86_64 
+INCLUDES=-I.
 
-#
-# KBUILD Makefile for the NVIDIA Linux kernel module.
-#
-# The motivation for replacing the original Makefile is the hope that this
-# version will simplify the build and installation process. In the past,
-# many architectural and cosmetic changes to the Linux kernel have made it
-# difficult to maintain compatibility or required duplication of logic.
-#
-# Linux 2.6 introduces numerous such changes, many of which impact modules.
-# Relying on KBUILD, some aspects of the build system otherwise difficult
-# to support (for example, module versioning) are abstracted away and dealt
-# with elsewhere, making life significantly easier here.
-#
-# The new approach currently has its own share of problems, some of which
-# are architectural difficulties with KBUILD, others minor annoyances. For
-# this reason, an improved version of the NVIDIA Makefile is available to
-# those experiencing difficulties.
-#
-# kbuild Makefile originally developed by:
-#
-# Alistair J Strachan (alistair devzero co uk) (first pass, enhancements)
-# Christian Zander (zander mail minion de) (enhancements)
-#
+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)
 
-all: install
-install: package-install
+CFLAGS=-Wall -Wimplicit -Wreturn-type -Wswitch -Wformat -Wchar-subscripts -Wparentheses -Wpointer-arith  -Wno-multichar  -Werror -O -mno-red-zone -MD $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-error
 
-#
-# The NVIDIA kernel module base name and static file names. KBUILD will go
-# ahead and append ".o" or ".ko" to form the final module name.
-#
-
-MODULE_NAME := nvidia
-VERSION_HEADER := nv_compiler.h
-
-#
-# List of object files to link into NVIDIA kernel module; make sure KBUILD
-# understands that we want a module.
-#
-
-RESMAN_CORE_OBJS := nv-kernel.o
-RESMAN_GLUE_OBJS := nv.o os-agp.o os-interface.o os-registry.o
-
-$(MODULE_NAME)-objs := $(RESMAN_CORE_OBJS) $(RESMAN_GLUE_OBJS)
-
-#
-# A bug in KBUILD 2.4 means that leaving obj-m set in top-level context
-# will cause Rules.make to call pathdown.sh, which is wrong. So, we only
-# set this conditional of a kernel-level instance.
-#
-
-ifdef TOPDIR
-obj-m += $(MODULE_NAME).o
-endif
-
-#
-# Include local source directory in $(CC)'s include path and set disable any
-# warning types that are of little interest to us.
-#
-
-EXTRA_CFLAGS += -I$(src)
-EXTRA_CFLAGS += -Wall -Wimplicit -Wreturn-type -Wswitch -Wformat -Wchar-subscripts -Wparentheses -Wpointer-arith  -Wno-multichar  -Werror -O -mno-red-zone -MD $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-error
-
-#
-# Determine location of the Linux kernel source tree. Allow users to override
-# the default (i.e. automatically determined) kernel source location with the
-# KERNDIR directive; this new directive replaces NVIDIA's SYSINCLUDE.
-#
-
-ifdef KERNDIR
-  KERNEL_SOURCES := $(KERNDIR)
-  KERNEL_HEADERS := -I$(KERNEL_SOURCES)/include
-  MODULE_ROOT    := /lib/modules/$(shell uname -r)/kernel/drivers # XXX
-else
-  KERNEL_SOURCES := /lib/modules/$(shell uname -r)/build
-  KERNEL_HEADERS := -I$(KERNEL_SOURCES)/include
-  MODULE_ROOT    := /lib/modules/$(shell uname -r)/kernel/drivers
-endif
-
-#
-# We rely on these two definitions below; if they aren't set, we set them to
-# reasonable defaults (Linux 2.4's KBUILD, and top-level passes will not set
-# these).
-#
-
-src ?= .
-obj ?= .
-
-#
-# Sets any internal variables left unset by KBUILD (e.g. this happens during
-# a top-level run).
-#
-
-TOPDIR ?= $(KERNEL_SOURCES)
-PATCHLEVEL ?= $(shell sh $(src)/conftest.sh kernel_patch_level $(TOPDIR))
-
-#
-# Linux 2.4 uses the .o module extension. Linux 2.6, however, uses the .ko
-# module extension. Handle these gracefully.
-#
+RESMAN_KERNEL_MODULE=nv-kernel.o
+
+KERNDIR=/lib/modules/$(shell uname -r)
 
-ifeq ($(PATCHLEVEL), 4)
-  MODULE_OBJECT := $(MODULE_NAME).o
+# check for newer paths. if found, use them, otherwise use old paths
+# these wouldn't work with the gnu make included with rh6.2
+# KERNINC=$(if -d $(KERNDIR)/build, $(KERNDIR)/build/include, /usr/src/linux/include)
+# INSTALLDIR=$(if -d $(KERNDIR)/kernel, $(KERNDIR)/kernel/drivers/video, $(KERNDIR)/video)
+
+# this is slightly more brain-dead, but works..
+ifeq ($(shell if test -d $(KERNDIR)/build; then echo yes; fi),yes)
+KERNINC=$(KERNDIR)/build/include
 else
-  MODULE_OBJECT := $(MODULE_NAME).ko
+KERNINC=/usr/src/linux/include
 endif
 
-#
-# NVIDIA specific CFLAGS and #define's. The remap_page_range check has become
-# necessary with the introduction of the five argument version to Linux 2.4
-# distribution kernels; this conflicting change cannot be detected at compile
-# time.
-#
-
-EXTRA_CFLAGS += -D_LOOSE_KERNEL_NAMES -D__KERNEL__ -DMODULE  -mcmodel=kernel -DNTRM -D_GNU_SOURCE -D_LOOSE_KERNEL_NAMES -D__KERNEL__ -DMODULE  -DNV_MAJOR_VERSION=1 -DNV_MINOR_VERSION=0 -DNV_PATCHLEVEL=5332    -DNV_UNIX  -DNV_LINUX  -DNV_INT64_OK  -DNV_64_BITS  -DNVCPU_X86_64  
+ifeq ($(shell if test -d $(KERNDIR)/kernel; then echo yes; fi),yes)
+INSTALLDIR=$(KERNDIR)/kernel/drivers/video
+else
+INSTALLDIR=$(KERNDIR)/video
+endif
 
 ifeq ($(shell echo $(NVDEBUG)),1)
   ifeq ($(shell test -z $(RMDEBUG) && echo yes),yes)
@@ -127,54 +39,41 @@
 endif
 
 ifeq ($(shell echo $(RMDEBUG)),1)
-  EXTRA_CFLAGS += -DDEBUG -g -fno-common
+CFLAGS += -DDEBUG -g -fno-common
 endif
 
-ifeq ($(shell sh $(src)/conftest.sh remap_page_range $(KERNEL_HEADERS)), 5)
-  EXTRA_CFLAGS += -DREMAP_PAGE_RANGE_5
-endif
-
-ifeq ($(shell sh $(src)/conftest.sh remap_page_range $(KERNEL_HEADERS)), 4)
-  EXTRA_CFLAGS += -DREMAP_PAGE_RANGE_4
-endif
-
-#
-# NVIDIA binary object file includes .common section.
-#
+# this is just plain wrong, get rid of it
+BROKENDIR=$(KERNDIR)/kernel/video
 
-EXTRA_LDFLAGS := -d
+INSTALL=$(shell which install)
 
-#
-# Miscellaneous NVIDIA kernel module build support targets. They are needed
-# to satisfy KBUILD requirements and to support NVIDIA specifics.
-#
-
-$(obj)/nv-kernel.o:
-	cp $(src)/$(RESMAN_CORE_OBJS) $(obj)/$(RESMAN_CORE_OBJS)
+# allow specification of alternate include file tree on command line and extra defines
+ifdef SYSINCLUDE
+INCLUDES += -I$(SYSINCLUDE)
+else
+INCLUDES += -I$(KERNINC)
+endif
 
-$(obj)/$(VERSION_HEADER):
-	echo \#define NV_COMPILER \"`$(CC) -v 2>&1 | tail -n 1`\" > $@
+ifeq ($(shell sh conftest.sh remap_page_range $(INCLUDES)), 5)
+  DEFINES += -DREMAP_PAGE_RANGE_5
+endif
 
-$(obj)/nv.o: $(obj)/$(VERSION_HEADER)
+ifeq ($(shell sh conftest.sh remap_page_range $(INCLUDES)), 4)
+  DEFINES += -DREMAP_PAGE_RANGE_4
+endif
 
-#
-# More quirks for Linux 2.4 KBUILD, which doesn't link automatically.
-#
+DEFINES+=$(EXTRA_DEFINES)
 
-ifeq ($(PATCHLEVEL), 4)
-$(obj)/$(MODULE_NAME).o: $($(MODULE_NAME)-objs)
-	$(LD) $(EXTRA_LDFLAGS) -r -o $@ $($(MODULE_NAME)-objs)
+# allow build parameters to be passed in through the environment
+ifdef BUILD_PARAMS
+    DEFINES+=-D$(BUILD_PARAMS)
 endif
 
-#
-# KBUILD build parameters.
-#
+VERSION_HDR=nv_compiler.h
 
-KBUILD_PARAMS := -C $(KERNEL_SOURCES) SUBDIRS=$(PWD)
+all: install
 
-#
-# NVIDIA sanity checks.
-#
+install: package-install
 
 suser-sanity-check:
 	@if ! sh conftest.sh suser_sanity_check nvidia; then exit 1; fi
@@ -185,51 +84,36 @@
 gcc-sanity-check:
 	@if ! sh conftest.sh cc_sanity_check full_output $(CC); then exit 1; fi
 
-#
-# Build the NVIDIA kernel module using Linux KBUILD. This target is used by
-# the "package-install" target below.
-#
-
-module: gcc-sanity-check
-	@make $(KBUILD_PARAMS) modules; \
-	if ! [ -f $(MODULE_OBJECT) ]; then \
-	  echo "$(MODULE_OBJECT) failed to build!"; \
-	  exit 1; \
-	fi
-
-#
-# Build the NVIDIA kernel module with KBUILD. Verify that the user posesses
-# sufficient privileges. Rebuild the module dependency file.
-#
-
-module-install: suser-sanity-check module
-	@mkdir -p $(MODULE_ROOT)/video; \
-	install -m 0664 -o root -g root $(MODULE_OBJECT) $(MODULE_ROOT)/video; \
-	PATH="$(PATH):/bin:/sbin" depmod -ae;
-
-#
-# This target builds, then installs, then creates device nodes and inserts
-# the module, if successful.
-#
-
-package-install: module-install rmmod-sanity-check
-	@sh makedevices.sh; \
-	PATH="$(PATH):/bin:/sbin" modprobe $(MODULE_NAME) && \
-	echo "$(MODULE_OBJECT) installed successfully.";
-
-#
-# Support hack, KBUILD isn't prepared to clean up after external modules.
-#
+module: gcc-sanity-check $(LINUX_MODULE) $(RESMAN_KERNEL_MODULE) 
+	ld -r -o nvidia.o $(LINUX_MODULE) $(RESMAN_KERNEL_MODULE)
+
+package-install: module suser-sanity-check rmmod-sanity-check 
+	mkdir -p $(INSTALLDIR) && \
+	$(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."; \
+
+$(VERSION_HDR): 
+	echo \#define NV_COMPILER \"`$(CC) -v 2>&1 | tail -n 1`\" > $@
+
+$(LINUX_MODULE): $(OBJECTS)
+	ld -r -o $@ $(OBJECTS)
+
+%.o: %.c $(HEADERS)
+	$(CC) -c $(CFLAGS) $<
+
+# debug tool to preprocess the file and leave .i to make it easier to untangle #defines
+%.i: %.c
+	$(CC) $(CFLAGS) -E $< > $@
+
+%.s: %.c
+	$(CC) $(CFLAGS) -S $< > $@
+
 
 clean:
-	@rm -f $(RESMAN_GLUE_OBJS) *.d .*.{cmd,flags}
-	@rm -f $(MODULE_NAME).{o,ko,mod.{o,c}} built-in.o $(VERSION_HEADER) *~
+	$(RM) $(OBJECTS) $(LINUX_MODULE) $(VERSION_HDR) *.d NVdriver nvidia.o
 
-#
-# Linux 2.4 KBUILD requires the inclusion of Rules.make; Linux 2.6's KBUILD
-# includes dependencies automatically.
-#
 
-ifeq ($(PATCHLEVEL), 4)
-include $(KERNEL_SOURCES)/Rules.make
-endif
+-include $(OBJECTS:%.o=%.d)
diff -ruN NVIDIA-Linux-x86_64-1.0-5332-pkg0/usr/src/nv/Makefile.kbuild NVIDIA-Linux-x86_64-1.0-5332-pkg0-old/usr/src/nv/Makefile.kbuild
--- NVIDIA-Linux-x86_64-1.0-5332-pkg0/usr/src/nv/Makefile.kbuild	1969-12-31 16:00:00.000000000 -0800
+++ NVIDIA-Linux-x86_64-1.0-5332-pkg0-old/usr/src/nv/Makefile.kbuild	2004-01-09 13:07:06.000000000 -0800
@@ -0,0 +1,235 @@
+# This Makefile is automatically generated; do not edit
+#   Generated on 'builder26' on Fri Jan  9 12:42:34 PST 2004
+
+# to use this file, rename or delete the default Makefile, then rename or
+# link this file to Makefile. then type 'make'
+
+#
+# KBUILD Makefile for the NVIDIA Linux kernel module.
+#
+# The motivation for replacing the original Makefile is the hope that this
+# version will simplify the build and installation process. In the past,
+# many architectural and cosmetic changes to the Linux kernel have made it
+# difficult to maintain compatibility or required duplication of logic.
+#
+# Linux 2.6 introduces numerous such changes, many of which impact modules.
+# Relying on KBUILD, some aspects of the build system otherwise difficult
+# to support (for example, module versioning) are abstracted away and dealt
+# with elsewhere, making life significantly easier here.
+#
+# The new approach currently has its own share of problems, some of which
+# are architectural difficulties with KBUILD, others minor annoyances. For
+# this reason, an improved version of the NVIDIA Makefile is available to
+# those experiencing difficulties.
+#
+# kbuild Makefile originally developed by:
+#
+# Alistair J Strachan (alistair devzero co uk) (first pass, enhancements)
+# Christian Zander (zander mail minion de) (enhancements)
+#
+
+all: install
+install: package-install
+
+#
+# The NVIDIA kernel module base name and static file names. KBUILD will go
+# ahead and append ".o" or ".ko" to form the final module name.
+#
+
+MODULE_NAME := nvidia
+VERSION_HEADER := nv_compiler.h
+
+#
+# List of object files to link into NVIDIA kernel module; make sure KBUILD
+# understands that we want a module.
+#
+
+RESMAN_CORE_OBJS := nv-kernel.o
+RESMAN_GLUE_OBJS := nv.o os-agp.o os-interface.o os-registry.o
+
+$(MODULE_NAME)-objs := $(RESMAN_CORE_OBJS) $(RESMAN_GLUE_OBJS)
+
+#
+# A bug in KBUILD 2.4 means that leaving obj-m set in top-level context
+# will cause Rules.make to call pathdown.sh, which is wrong. So, we only
+# set this conditional of a kernel-level instance.
+#
+
+ifdef TOPDIR
+obj-m += $(MODULE_NAME).o
+endif
+
+#
+# Include local source directory in $(CC)'s include path and set disable any
+# warning types that are of little interest to us.
+#
+
+EXTRA_CFLAGS += -I$(src)
+EXTRA_CFLAGS += -Wall -Wimplicit -Wreturn-type -Wswitch -Wformat -Wchar-subscripts -Wparentheses -Wpointer-arith  -Wno-multichar  -Werror -O -mno-red-zone -MD $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-error
+
+#
+# Determine location of the Linux kernel source tree. Allow users to override
+# the default (i.e. automatically determined) kernel source location with the
+# KERNDIR directive; this new directive replaces NVIDIA's SYSINCLUDE.
+#
+
+ifdef KERNDIR
+  KERNEL_SOURCES := $(KERNDIR)
+  KERNEL_HEADERS := -I$(KERNEL_SOURCES)/include
+  MODULE_ROOT    := /lib/modules/$(shell uname -r)/kernel/drivers # XXX
+else
+  KERNEL_SOURCES := /lib/modules/$(shell uname -r)/build
+  KERNEL_HEADERS := -I$(KERNEL_SOURCES)/include
+  MODULE_ROOT    := /lib/modules/$(shell uname -r)/kernel/drivers
+endif
+
+#
+# We rely on these two definitions below; if they aren't set, we set them to
+# reasonable defaults (Linux 2.4's KBUILD, and top-level passes will not set
+# these).
+#
+
+src ?= .
+obj ?= .
+
+#
+# Sets any internal variables left unset by KBUILD (e.g. this happens during
+# a top-level run).
+#
+
+TOPDIR ?= $(KERNEL_SOURCES)
+PATCHLEVEL ?= $(shell sh $(src)/conftest.sh kernel_patch_level $(TOPDIR))
+
+#
+# Linux 2.4 uses the .o module extension. Linux 2.6, however, uses the .ko
+# module extension. Handle these gracefully.
+#
+
+ifeq ($(PATCHLEVEL), 4)
+  MODULE_OBJECT := $(MODULE_NAME).o
+else
+  MODULE_OBJECT := $(MODULE_NAME).ko
+endif
+
+#
+# NVIDIA specific CFLAGS and #define's. The remap_page_range check has become
+# necessary with the introduction of the five argument version to Linux 2.4
+# distribution kernels; this conflicting change cannot be detected at compile
+# time.
+#
+
+EXTRA_CFLAGS += -D_LOOSE_KERNEL_NAMES -D__KERNEL__ -DMODULE  -mcmodel=kernel -DNTRM -D_GNU_SOURCE -D_LOOSE_KERNEL_NAMES -D__KERNEL__ -DMODULE  -DNV_MAJOR_VERSION=1 -DNV_MINOR_VERSION=0 -DNV_PATCHLEVEL=5332    -DNV_UNIX  -DNV_LINUX  -DNV_INT64_OK  -DNV_64_BITS  -DNVCPU_X86_64  
+
+ifeq ($(shell echo $(NVDEBUG)),1)
+  ifeq ($(shell test -z $(RMDEBUG) && echo yes),yes)
+    RMDEBUG=1
+  endif
+endif
+
+ifeq ($(shell echo $(RMDEBUG)),1)
+  EXTRA_CFLAGS += -DDEBUG -g -fno-common
+endif
+
+ifeq ($(shell sh $(src)/conftest.sh remap_page_range $(KERNEL_HEADERS)), 5)
+  EXTRA_CFLAGS += -DREMAP_PAGE_RANGE_5
+endif
+
+ifeq ($(shell sh $(src)/conftest.sh remap_page_range $(KERNEL_HEADERS)), 4)
+  EXTRA_CFLAGS += -DREMAP_PAGE_RANGE_4
+endif
+
+#
+# NVIDIA binary object file includes .common section.
+#
+
+EXTRA_LDFLAGS := -d
+
+#
+# Miscellaneous NVIDIA kernel module build support targets. They are needed
+# to satisfy KBUILD requirements and to support NVIDIA specifics.
+#
+
+$(obj)/nv-kernel.o:
+	cp $(src)/$(RESMAN_CORE_OBJS) $(obj)/$(RESMAN_CORE_OBJS)
+
+$(obj)/$(VERSION_HEADER):
+	echo \#define NV_COMPILER \"`$(CC) -v 2>&1 | tail -n 1`\" > $@
+
+$(obj)/nv.o: $(obj)/$(VERSION_HEADER)
+
+#
+# More quirks for Linux 2.4 KBUILD, which doesn't link automatically.
+#
+
+ifeq ($(PATCHLEVEL), 4)
+$(obj)/$(MODULE_NAME).o: $($(MODULE_NAME)-objs)
+	$(LD) $(EXTRA_LDFLAGS) -r -o $@ $($(MODULE_NAME)-objs)
+endif
+
+#
+# KBUILD build parameters.
+#
+
+KBUILD_PARAMS := -C $(KERNEL_SOURCES) SUBDIRS=$(PWD)
+
+#
+# NVIDIA sanity checks.
+#
+
+suser-sanity-check:
+	@if ! sh conftest.sh suser_sanity_check nvidia; then exit 1; fi
+
+rmmod-sanity-check:
+	@if ! sh conftest.sh rmmod_sanity_check nvidia; then exit 1; fi
+
+gcc-sanity-check:
+	@if ! sh conftest.sh cc_sanity_check full_output $(CC); then exit 1; fi
+
+#
+# Build the NVIDIA kernel module using Linux KBUILD. This target is used by
+# the "package-install" target below.
+#
+
+module: gcc-sanity-check
+	@make $(KBUILD_PARAMS) modules; \
+	if ! [ -f $(MODULE_OBJECT) ]; then \
+	  echo "$(MODULE_OBJECT) failed to build!"; \
+	  exit 1; \
+	fi
+
+#
+# Build the NVIDIA kernel module with KBUILD. Verify that the user posesses
+# sufficient privileges. Rebuild the module dependency file.
+#
+
+module-install: suser-sanity-check module
+	@mkdir -p $(MODULE_ROOT)/video; \
+	install -m 0664 -o root -g root $(MODULE_OBJECT) $(MODULE_ROOT)/video; \
+	PATH="$(PATH):/bin:/sbin" depmod -ae;
+
+#
+# This target builds, then installs, then creates device nodes and inserts
+# the module, if successful.
+#
+
+package-install: module-install rmmod-sanity-check
+	@sh makedevices.sh; \
+	PATH="$(PATH):/bin:/sbin" modprobe $(MODULE_NAME) && \
+	echo "$(MODULE_OBJECT) installed successfully.";
+
+#
+# Support hack, KBUILD isn't prepared to clean up after external modules.
+#
+
+clean:
+	@rm -f $(RESMAN_GLUE_OBJS) *.d .*.{cmd,flags}
+	@rm -f $(MODULE_NAME).{o,ko,mod.{o,c}} built-in.o $(VERSION_HEADER) *~
+
+#
+# Linux 2.4 KBUILD requires the inclusion of Rules.make; Linux 2.6's KBUILD
+# includes dependencies automatically.
+#
+
+ifeq ($(PATCHLEVEL), 4)
+include $(KERNEL_SOURCES)/Rules.make
+endif
diff -ruN NVIDIA-Linux-x86_64-1.0-5332-pkg0/usr/src/nv/Makefile.old NVIDIA-Linux-x86_64-1.0-5332-pkg0-old/usr/src/nv/Makefile.old
--- NVIDIA-Linux-x86_64-1.0-5332-pkg0/usr/src/nv/Makefile.old	2004-01-09 13:07:06.000000000 -0800
+++ NVIDIA-Linux-x86_64-1.0-5332-pkg0-old/usr/src/nv/Makefile.old	1969-12-31 16:00:00.000000000 -0800
@@ -1,119 +0,0 @@
-# This Makefile is automatically generated; do not edit
-#   Generated on 'builder26' on Fri Jan  9 12:42:34 PST 2004
-
-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=5332    -DNV_UNIX  -DNV_LINUX  -DNV_INT64_OK  -DNV_64_BITS  -DNVCPU_X86_64 
-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  -Wno-multichar  -Werror -O -mno-red-zone -MD $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-error
-
-RESMAN_KERNEL_MODULE=nv-kernel.o
-
-KERNDIR=/lib/modules/$(shell uname -r)
-
-# check for newer paths. if found, use them, otherwise use old paths
-# these wouldn't work with the gnu make included with rh6.2
-# KERNINC=$(if -d $(KERNDIR)/build, $(KERNDIR)/build/include, /usr/src/linux/include)
-# INSTALLDIR=$(if -d $(KERNDIR)/kernel, $(KERNDIR)/kernel/drivers/video, $(KERNDIR)/video)
-
-# this is slightly more brain-dead, but works..
-ifeq ($(shell if test -d $(KERNDIR)/build; then echo yes; fi),yes)
-KERNINC=$(KERNDIR)/build/include
-else
-KERNINC=/usr/src/linux/include
-endif
-
-ifeq ($(shell if test -d $(KERNDIR)/kernel; then echo yes; fi),yes)
-INSTALLDIR=$(KERNDIR)/kernel/drivers/video
-else
-INSTALLDIR=$(KERNDIR)/video
-endif
-
-ifeq ($(shell echo $(NVDEBUG)),1)
-  ifeq ($(shell test -z $(RMDEBUG) && echo yes),yes)
-    RMDEBUG=1
-  endif
-endif
-
-ifeq ($(shell echo $(RMDEBUG)),1)
-CFLAGS += -DDEBUG -g -fno-common
-endif
-
-# this is just plain wrong, get rid of it
-BROKENDIR=$(KERNDIR)/kernel/video
-
-INSTALL=$(shell which install)
-
-# allow specification of alternate include file tree on command line and extra defines
-ifdef SYSINCLUDE
-INCLUDES += -I$(SYSINCLUDE)
-else
-INCLUDES += -I$(KERNINC)
-endif
-
-ifeq ($(shell sh conftest.sh remap_page_range $(INCLUDES)), 5)
-  DEFINES += -DREMAP_PAGE_RANGE_5
-endif
-
-ifeq ($(shell sh conftest.sh remap_page_range $(INCLUDES)), 4)
-  DEFINES += -DREMAP_PAGE_RANGE_4
-endif
-
-DEFINES+=$(EXTRA_DEFINES)
-
-# allow build parameters to be passed in through the environment
-ifdef BUILD_PARAMS
-    DEFINES+=-D$(BUILD_PARAMS)
-endif
-
-VERSION_HDR=nv_compiler.h
-
-all: install
-
-install: package-install
-
-suser-sanity-check:
-	@if ! sh conftest.sh suser_sanity_check nvidia; then exit 1; fi
-
-rmmod-sanity-check:
-	@if ! sh conftest.sh rmmod_sanity_check nvidia; then exit 1; fi
-
-gcc-sanity-check:
-	@if ! sh conftest.sh cc_sanity_check full_output $(CC); then exit 1; fi
-
-module: gcc-sanity-check $(LINUX_MODULE) $(RESMAN_KERNEL_MODULE) 
-	ld -r -o nvidia.o $(LINUX_MODULE) $(RESMAN_KERNEL_MODULE)
-
-package-install: module suser-sanity-check rmmod-sanity-check 
-	mkdir -p $(INSTALLDIR) && \
-	$(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."; \
-
-$(VERSION_HDR): 
-	echo \#define NV_COMPILER \"`$(CC) -v 2>&1 | tail -n 1`\" > $@
-
-$(LINUX_MODULE): $(OBJECTS)
-	ld -r -o $@ $(OBJECTS)
-
-%.o: %.c $(HEADERS)
-	$(CC) -c $(CFLAGS) $<
-
-# debug tool to preprocess the file and leave .i to make it easier to untangle #defines
-%.i: %.c
-	$(CC) $(CFLAGS) -E $< > $@
-
-%.s: %.c
-	$(CC) $(CFLAGS) -S $< > $@
-
-
-clean:
-	$(RM) $(OBJECTS) $(LINUX_MODULE) $(VERSION_HDR) *.d NVdriver nvidia.o
-
-
--include $(OBJECTS:%.o=%.d)
diff -ruN NVIDIA-Linux-x86_64-1.0-5332-pkg0/usr/src/nv/nv-linux.h NVIDIA-Linux-x86_64-1.0-5332-pkg0-old/usr/src/nv/nv-linux.h
--- NVIDIA-Linux-x86_64-1.0-5332-pkg0/usr/src/nv/nv-linux.h	2004-01-22 00:30:24.199076086 -0800
+++ NVIDIA-Linux-x86_64-1.0-5332-pkg0-old/usr/src/nv/nv-linux.h	2004-01-09 13:07:05.000000000 -0800
@@ -24,7 +24,7 @@
 #  define KERNEL_2_4
 #elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
 #  error This driver does not support 2.5 kernels!
-#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 7, 0) && ( defined(NVCPU_X86) || defined(NVCPU_X86_64) )
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 7, 0) && defined(NVCPU_X86)
 #  define KERNEL_2_6
 #else
 #  error This driver does not support development kernels!
diff -ruN NVIDIA-Linux-x86_64-1.0-5332-pkg0/usr/src/nv/nv.c NVIDIA-Linux-x86_64-1.0-5332-pkg0-old/usr/src/nv/nv.c
--- NVIDIA-Linux-x86_64-1.0-5332-pkg0/usr/src/nv/nv.c	2004-01-22 00:32:35.527162307 -0800
+++ NVIDIA-Linux-x86_64-1.0-5332-pkg0-old/usr/src/nv/nv.c	2004-01-09 13:07:05.000000000 -0800
@@ -427,8 +427,7 @@
         {
             struct scatterlist *sg_ptr = &at->sg_list[i];
 
-				sg_ptr->page = virt_to_page( page_ptr->virt_addr );
-            sg_ptr->offset = offset_in_page( page_ptr->virt_addr );
+            sg_ptr->address = (char *) page_ptr->virt_addr;
             sg_ptr->length  = PAGE_SIZE;
 
             if (pci_map_sg(at->dev, sg_ptr, 1, PCI_DMA_BIDIRECTIONAL) == 0)
@@ -436,7 +435,7 @@
                 goto failed;
             }
 
-            page_ptr->dma_addr = sg_dma_address(sg_ptr);
+            page_ptr->dma_addr = sg_ptr->dma_address;
         }
 #endif
 
name of display: :0.0
display: :0  screen: 0
direct rendering: Yes
server glx vendor string: NVIDIA Corporation
server glx version string: 1.3
server glx extensions:
    GLX_EXT_visual_info, GLX_EXT_visual_rating, GLX_SGIX_fbconfig, 
    GLX_SGIX_pbuffer, GLX_SGI_video_sync, GLX_SGI_swap_control, 
    GLX_ARB_multisample, GLX_NV_float_buffer
client glx vendor string: NVIDIA Corporation
client glx version string: 1.3
client glx extensions:
    GLX_ARB_get_proc_address, GLX_ARB_multisample, GLX_EXT_visual_info, 
    GLX_EXT_visual_rating, GLX_EXT_import_context, GLX_SGI_video_sync, 
    GLX_NV_swap_group, GLX_SGIX_fbconfig, GLX_SGIX_pbuffer, 
    GLX_SGI_swap_control, GLX_NV_float_buffer
GLX extensions:
    GLX_EXT_visual_info, GLX_EXT_visual_rating, GLX_SGIX_fbconfig, 
    GLX_SGIX_pbuffer, GLX_SGI_video_sync, GLX_SGI_swap_control, 
    GLX_ARB_multisample, GLX_NV_float_buffer, GLX_ARB_get_proc_address
OpenGL vendor string: NVIDIA Corporation
OpenGL renderer string: GeForce FX 5200/PCI/SSE2
OpenGL version string: 1.4.1 NVIDIA 53.32
OpenGL extensions:
    GL_ARB_depth_texture, GL_ARB_fragment_program, GL_ARB_imaging, 
    GL_ARB_multisample, GL_ARB_multitexture, GL_ARB_occlusion_query, 
    GL_ARB_point_parameters, GL_ARB_point_sprite, GL_ARB_shadow, 
    GL_ARB_texture_border_clamp, GL_ARB_texture_compression, 
    GL_ARB_texture_cube_map, GL_ARB_texture_env_add, 
    GL_ARB_texture_env_combine, GL_ARB_texture_env_dot3, 
    GL_ARB_texture_mirrored_repeat, GL_ARB_transpose_matrix, 
    GL_ARB_vertex_buffer_object, GL_ARB_vertex_program, GL_ARB_window_pos, 
    GL_S3_s3tc, GL_EXT_texture_env_add, GL_EXT_abgr, GL_EXT_bgra, 
    GL_EXT_blend_color, GL_EXT_blend_func_separate, GL_EXT_blend_minmax, 
    GL_EXT_blend_subtract, GL_EXT_compiled_vertex_array, 
    GL_EXT_draw_range_elements, GL_EXT_fog_coord, GL_EXT_multi_draw_arrays, 
    GL_EXT_packed_pixels, GL_EXT_paletted_texture, GL_EXT_point_parameters, 
    GL_EXT_rescale_normal, GL_EXT_secondary_color, 
    GL_EXT_separate_specular_color, GL_EXT_shadow_funcs, 
    GL_EXT_shared_texture_palette, GL_EXT_stencil_two_side, 
    GL_EXT_stencil_wrap, GL_EXT_texture3D, GL_EXT_texture_compression_s3tc, 
    GL_EXT_texture_cube_map, GL_EXT_texture_edge_clamp, 
    GL_EXT_texture_env_combine, GL_EXT_texture_env_dot3, 
    GL_EXT_texture_filter_anisotropic, GL_EXT_texture_lod, 
    GL_EXT_texture_lod_bias, GL_EXT_texture_object, GL_EXT_vertex_array, 
    GL_HP_occlusion_test, GL_IBM_rasterpos_clip, 
    GL_IBM_texture_mirrored_repeat, GL_KTX_buffer_region, GL_NV_blend_square, 
    GL_NV_copy_depth_to_color, GL_NV_depth_clamp, GL_NV_fence, 
    GL_NV_float_buffer, GL_NV_fog_distance, GL_NV_fragment_program, 
    GL_NV_half_float, GL_NV_light_max_exponent, GL_NV_multisample_filter_hint, 
    GL_NV_occlusion_query, GL_NV_packed_depth_stencil, GL_NV_pixel_data_range, 
    GL_NV_point_sprite, GL_NV_primitive_restart, GL_NV_register_combiners, 
    GL_NV_register_combiners2, GL_NV_texgen_reflection, 
    GL_NV_texture_compression_vtc, GL_NV_texture_env_combine4, 
    GL_NV_texture_expand_normal, GL_NV_texture_rectangle, 
    GL_NV_texture_shader, GL_NV_texture_shader2, GL_NV_texture_shader3, 
    GL_NV_vertex_array_range, GL_NV_vertex_array_range2, GL_NV_vertex_program, 
    GL_NV_vertex_program1_1, GL_NV_vertex_program2, GL_NVX_ycrcb, 
    GL_SGIS_generate_mipmap, GL_SGIS_texture_lod, GL_SGIX_depth_texture, 
    GL_SGIX_shadow, GL_SUN_slice_accum
glu version: 1.3
glu extensions:
    GLU_EXT_nurbs_tessellator, GLU_EXT_object_space_tess

   visual  x  bf lv rg d st colorbuffer ax dp st accumbuffer  ms  cav
 id dep cl sp sz l  ci b ro  r  g  b  a bf th cl  r  g  b  a ns b eat
----------------------------------------------------------------------
0x21 24 tc  0 32  0 r  y  .  8  8  8  0  0 24  8 16 16 16 16  0 0 None
0x22 24 dc  0 32  0 r  y  .  8  8  8  0  0 24  8 16 16 16 16  0 0 None
0x23 24 tc  0 32  0 r  y  .  8  8  8  8  0 24  8 16 16 16 16  0 0 None
0x24 24 tc  0 32  0 r  .  .  8  8  8  0  0 24  8 16 16 16 16  0 0 None
0x25 24 tc  0 32  0 r  .  .  8  8  8  8  0 24  8 16 16 16 16  0 0 None
0x26 24 tc  0 32  0 r  y  .  8  8  8  0  0 16  0 16 16 16 16  0 0 None
0x27 24 tc  0 32  0 r  y  .  8  8  8  8  0 16  0 16 16 16 16  0 0 None
0x28 24 tc  0 32  0 r  .  .  8  8  8  0  0 16  0 16 16 16 16  0 0 None
0x29 24 tc  0 32  0 r  .  .  8  8  8  8  0 16  0 16 16 16 16  0 0 None
0x2a 24 tc  0 32  0 r  y  .  8  8  8  0  0  0  0 16 16 16 16  0 0 None
0x2b 24 tc  0 32  0 r  y  .  8  8  8  8  0  0  0 16 16 16 16  0 0 None
0x2c 24 tc  0 32  0 r  .  .  8  8  8  0  0  0  0 16 16 16 16  0 0 None
0x2d 24 tc  0 32  0 r  .  .  8  8  8  8  0  0  0 16 16 16 16  0 0 None
0x2e 24 tc  0 32  0 r  y  .  8  8  8  0  0 24  8 16 16 16 16  2 1 Ncon
0x2f 24 tc  0 32  0 r  y  .  8  8  8  8  0 24  8 16 16 16 16  2 1 Ncon
0x30 24 tc  0 32  0 r  y  .  8  8  8  0  0 24  8 16 16 16 16  4 1 Ncon
0x31 24 tc  0 32  0 r  y  .  8  8  8  8  0 24  8 16 16 16 16  4 1 Ncon
0x32 24 tc  0 32  0 r  y  .  8  8  8  0  0 16  0 16 16 16 16  2 1 Ncon
0x33 24 tc  0 32  0 r  y  .  8  8  8  8  0 16  0 16 16 16 16  2 1 Ncon
0x34 24 tc  0 32  0 r  y  .  8  8  8  0  0 16  0 16 16 16 16  4 1 Ncon
0x35 24 tc  0 32  0 r  y  .  8  8  8  8  0 16  0 16 16 16 16  4 1 Ncon
0x36 24 dc  0 32  0 r  y  .  8  8  8  8  0 24  8 16 16 16 16  0 0 None
0x37 24 dc  0 32  0 r  .  .  8  8  8  0  0 24  8 16 16 16 16  0 0 None
0x38 24 dc  0 32  0 r  .  .  8  8  8  8  0 24  8 16 16 16 16  0 0 None
0x39 24 dc  0 32  0 r  y  .  8  8  8  0  0 16  0 16 16 16 16  0 0 None
0x3a 24 dc  0 32  0 r  y  .  8  8  8  8  0 16  0 16 16 16 16  0 0 None
0x3b 24 dc  0 32  0 r  .  .  8  8  8  0  0 16  0 16 16 16 16  0 0 None
0x3c 24 dc  0 32  0 r  .  .  8  8  8  8  0 16  0 16 16 16 16  0 0 None
0x3d 24 dc  0 32  0 r  y  .  8  8  8  0  0  0  0 16 16 16 16  0 0 None
0x3e 24 dc  0 32  0 r  y  .  8  8  8  8  0  0  0 16 16 16 16  0 0 None
0x3f 24 dc  0 32  0 r  .  .  8  8  8  0  0  0  0 16 16 16 16  0 0 None
0x40 24 dc  0 32  0 r  .  .  8  8  8  8  0  0  0 16 16 16 16  0 0 None
0x41 24 dc  0 32  0 r  y  .  8  8  8  0  0 24  8 16 16 16 16  2 1 Ncon
0x42 24 dc  0 32  0 r  y  .  8  8  8  8  0 24  8 16 16 16 16  2 1 Ncon
0x43 24 dc  0 32  0 r  y  .  8  8  8  0  0 24  8 16 16 16 16  4 1 Ncon
0x44 24 dc  0 32  0 r  y  .  8  8  8  8  0 24  8 16 16 16 16  4 1 Ncon
0x45 24 dc  0 32  0 r  y  .  8  8  8  0  0 16  0 16 16 16 16  2 1 Ncon
0x46 24 dc  0 32  0 r  y  .  8  8  8  8  0 16  0 16 16 16 16  2 1 Ncon
0x47 24 dc  0 32  0 r  y  .  8  8  8  0  0 16  0 16 16 16 16  4 1 Ncon
0x48 24 dc  0 32  0 r  y  .  8  8  8  8  0 16  0 16 16 16 16  4 1 Ncon

[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]