diff options
author | Doug Goldstein <cardoe@gentoo.org> | 2009-06-12 19:48:07 +0000 |
---|---|---|
committer | Doug Goldstein <cardoe@gentoo.org> | 2009-06-12 19:48:07 +0000 |
commit | 21e7b605c656cdb7d6644ee09208abd0da24477d (patch) | |
tree | 5f8291a92ffab484126ef24b0d224eca6b39e83c /x11-drivers/nvidia-drivers/files | |
parent | fix paravirt check. bug #261696 (diff) | |
download | gentoo-2-21e7b605c656cdb7d6644ee09208abd0da24477d.tar.gz gentoo-2-21e7b605c656cdb7d6644ee09208abd0da24477d.tar.bz2 gentoo-2-21e7b605c656cdb7d6644ee09208abd0da24477d.zip |
cull old versions
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'x11-drivers/nvidia-drivers/files')
-rw-r--r-- | x11-drivers/nvidia-drivers/files/NVIDIA_glx-makefile.patch | 15 | ||||
-rw-r--r-- | x11-drivers/nvidia-drivers/files/nvidia-169.07 | 14 | ||||
-rw-r--r-- | x11-drivers/nvidia-drivers/files/nvidia-2.6.28.patch | 180 |
3 files changed, 0 insertions, 209 deletions
diff --git a/x11-drivers/nvidia-drivers/files/NVIDIA_glx-makefile.patch b/x11-drivers/nvidia-drivers/files/NVIDIA_glx-makefile.patch deleted file mode 100644 index 45e550bca1fe..000000000000 --- a/x11-drivers/nvidia-drivers/files/NVIDIA_glx-makefile.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- Makefile.old 2004-11-10 12:13:57.751853304 +1100 -+++ Makefile 2004-11-10 12:14:22.439100272 +1100 -@@ -1,11 +1,5 @@ - default: -- @ echo -- @ echo "It is NOT recommended that you use this Makefile to install" -- @ echo "the NVIDIA driver. Instead, please use the nvidia-installer" -- @ echo "utility. However, should nvidia-installer not operate for you," -- @ echo "you may use this Makefile as a last resort. To install using" -- @ echo "this Makefile, please run 'make install'." -- @ echo -+ @ echo "Gentoo Linux does not use nvidia-installer." - - kernel_module_install: - cd usr/src/nv; make install diff --git a/x11-drivers/nvidia-drivers/files/nvidia-169.07 b/x11-drivers/nvidia-drivers/files/nvidia-169.07 deleted file mode 100644 index a96b0cd1e40f..000000000000 --- a/x11-drivers/nvidia-drivers/files/nvidia-169.07 +++ /dev/null @@ -1,14 +0,0 @@ -# Nvidia drivers support -alias char-major-195 nvidia -alias /dev/nvidiactl char-major-195 - -# To tweak the driver the following options can be used, note that -# you should be careful, as it could cause instability!! For more -# options see /usr/share/doc/PACKAGE/README -# -# !!! SECURITY WARNING !!! -# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW -# WHAT YOU ARE DOING. -# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH, -# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE. -options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1 diff --git a/x11-drivers/nvidia-drivers/files/nvidia-2.6.28.patch b/x11-drivers/nvidia-drivers/files/nvidia-2.6.28.patch deleted file mode 100644 index 594de674d372..000000000000 --- a/x11-drivers/nvidia-drivers/files/nvidia-2.6.28.patch +++ /dev/null @@ -1,180 +0,0 @@ -http://www.nvnews.net/vbulletin/showthread.php?t=121790&page=2#post1823327 -http://www.nvnews.net/vbulletin/showthread.php?t=121790&page=3#post1843626 - ---- usr/src/nv/Makefile.kbuild -+++ usr/src/nv.2990799/Makefile.kbuild -@@ -185,14 +185,16 @@ - acquire_console_sem \ - kmem_cache_create \ - on_each_cpu \ -- smp_call_function -+ smp_call_function \ -+ acpi_evaluate_integer - else - COMPILE_TESTS = \ - remap_page_range \ - vmap \ - change_page_attr \ - i2c_adapter \ -- smp_call_function -+ smp_call_function \ -+ acpi_evaluate_integer - endif - - # ---- usr/src/nv/Makefile.nvidia -+++ usr/src/nv.2990799/Makefile.nvidia -@@ -59,7 +59,8 @@ - vmap \ - change_page_attr \ - i2c_adapter \ -- smp_call_function -+ smp_call_function \ -+ acpi_evaluate_integer - - DEFINES+=$(EXTRA_DEFINES) - ---- usr/src/nv/conftest.sh -+++ usr/src/nv.2990799/conftest.sh -@@ -67,6 +67,8 @@ - } - - build_cflags() { -+ ARCH=`uname -m | sed -e 's/i.86/i386/'` -+ - BASE_CFLAGS="-D__KERNEL__ \ - -DKBUILD_BASENAME=\"#conftest$$\" -DKBUILD_MODNAME=\"#conftest$$\" \ - -nostdinc -isystem $ISYSTEM" -@@ -80,16 +82,20 @@ - test_xen - - if [ "$OUTPUT" != "$SOURCES" ]; then -- ARCH=`uname -m | sed -e 's/i.86/i386/'` - MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default" - if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then - MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" -+ MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" - fi - if [ "$XEN_PRESENT" != "0" ]; then - MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-xen $MACH_CFLAGS" - fi - else - MACH_CFLAGS="-I$HEADERS/asm/mach-default" -+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -+ MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" -+ MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" -+ fi - if [ "$XEN_PRESENT" != "0" ]; then - MACH_CFLAGS="-I$HEADERS/asm/mach-xen $MACH_CFLAGS" - fi -@@ -97,6 +103,9 @@ - - CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS" - -+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include" -+ fi - if [ -n "$BUILD_PARAMS" ]; then - CFLAGS="$CFLAGS -D$BUILD_PARAMS" - fi -@@ -858,7 +867,7 @@ - - if [ -f conftest$$.o ]; then - rm -f conftest$$.o -- echo "#undef NV_ON_EACH_CPU" >> conftest.h -+ echo "#undef NV_ON_EACH_CPU_PRESENT" >> conftest.h - return - fi - -@@ -897,6 +906,57 @@ - fi - ;; - -+ acpi_evaluate_integer) -+ # -+ # Determine if the acpi_evaluate_integer() function is -+ # present and the type of its 'data' argument. -+ # -+ -+ echo "$CONFTEST_PREAMBLE -+ #include <acpi/acpi_bus.h> -+ acpi_status acpi_evaluate_integer(acpi_handle h, acpi_string s, -+ struct acpi_object_list *l, unsigned long long *d) { -+ return AE_OK; -+ }" > conftest$$.c -+ -+ $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1 -+ rm -f conftest$$.c -+ -+ if [ -f conftest$$.o ]; then -+ rm -f conftest$$.o -+ echo "#define NV_ACPI_EVALUATE_INTEGER_PRESENT" >> conftest.h -+ echo "typedef unsigned long long nv_acpi_integer_t;" >> conftest.h -+ return -+ fi -+ -+ echo "$CONFTEST_PREAMBLE -+ #include <acpi/acpi_bus.h> -+ acpi_status acpi_evaluate_integer(acpi_handle h, acpi_string s, -+ struct acpi_object_list *l, unsigned long *d) { -+ return AE_OK; -+ }" > conftest$$.c -+ -+ $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1 -+ rm -f conftest$$.c -+ -+ if [ -f conftest$$.o ]; then -+ rm -f conftest$$.o -+ echo "#define NV_ACPI_EVALUATE_INTEGER_PRESENT" >> conftest.h -+ echo "typedef unsigned long nv_acpi_integer_t;" >> conftest.h -+ return -+ else -+ # -+ # We can't report a compile test failure here because -+ # this is a catch-all for both kernels that don't -+ # have acpi_evaluate_integer() and kernels that have -+ # broken header files that make it impossible to -+ # tell if the function is present. -+ # -+ echo "#undef NV_ACPI_EVALUATE_INTEGER_PRESENT" >> conftest.h -+ echo "typedef unsigned long nv_acpi_integer_t;" >> conftest.h -+ fi -+ ;; -+ - esac - } - ---- usr/src/nv/nvacpi.c -+++ usr/src/nv.2990799/nvacpi.c -@@ -136,7 +136,7 @@ - struct acpi_object_list control_argument_list = { 0, NULL }; - nv_stack_t *sp = NULL; - struct list_head *node, *next; -- unsigned long device_id = 0; -+ nv_acpi_integer_t device_id = 0; - int device_counter = 0; - - NV_KMEM_CACHE_ALLOC_STACK(sp); -@@ -158,11 +158,9 @@ - - os_mem_set((void *)pNvAcpiObject, 0, sizeof(nv_acpi_t)); - -- // assign driver data structure ptr to this device -- acpi_driver_data(device) = pNvAcpiObject; -- -- // store a device reference in our object -+ device->driver_data = pNvAcpiObject; - pNvAcpiObject->device = device; -+ - pNvAcpiObject->sp = sp; - - // grab handles to all the important nodes representing devices -@@ -306,7 +304,7 @@ - */ - nv_acpi_t *pNvAcpiObject = data; - u32 event_val = 0; -- unsigned long state; -+ nv_acpi_integer_t state; - int status = 0; - int device_counter = 0; - |