From: Jan Rękorajski Date: Sat, 26 Apr 2014 17:19:17 +0000 (+0200) Subject: - updated to 331.67 X-Git-Tag: auto/th/xorg-driver-video-nvidia-331.67-1 X-Git-Url: https://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia.git;a=commitdiff_plain;h=0cf9d2499c8c6309dadc8e73fd12abdced26ad2e;ds=sidebyside - updated to 331.67 --- diff --git a/linux-3.13.patch b/linux-3.13.patch deleted file mode 100644 index fafe65b..0000000 --- a/linux-3.13.patch +++ /dev/null @@ -1,121 +0,0 @@ -diff -rupN NVIDIA-Linux-x86_64-331.38.orig/kernel/nv-acpi.c NVIDIA-Linux-x86_64-331.38/kernel/nv-acpi.c ---- NVIDIA-Linux-x86_64-331.38.orig/kernel/nv-acpi.c 2014-01-25 09:39:47.126966926 +0100 -+++ NVIDIA-Linux-x86_64-331.38/kernel/nv-acpi.c 2014-01-26 09:59:45.853427603 +0100 -@@ -303,7 +303,10 @@ static int nv_acpi_remove(struct acpi_de - - if (pNvAcpiObject->notify_handler_installed) - { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) -+ /* beginning with 3.13, acpi_remove_notify_handler() waits for events to finish */ - NV_ACPI_OS_WAIT_EVENTS_COMPLETE(); -+#endif - - // remove event notifier - status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event); -@@ -1076,10 +1079,17 @@ RM_STATUS NV_API_CALL nv_acpi_dsm_method - NvU8 argument3[4]; /* For all DSM sub functions, input size is 4 */ - NvU32 data_size; - acpi_handle dev_handle = NULL; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) - #ifdef DEVICE_ACPI_HANDLE - nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); - dev_handle = DEVICE_ACPI_HANDLE(&nvl->dev->dev); - #endif -+#else -+#ifdef ACPI_HANDLE -+ nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); -+ dev_handle = ACPI_HANDLE(&nvl->dev->dev); -+#endif -+#endif - - if (!dev_handle) - return RM_ERR_NOT_SUPPORTED; -@@ -1179,12 +1189,21 @@ RM_STATUS NV_API_CALL nv_acpi_ddc_method - NvU32 i; - acpi_handle dev_handle = NULL; - acpi_handle lcd_dev_handle = NULL; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) - #ifdef DEVICE_ACPI_HANDLE - nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); - dev_handle = DEVICE_ACPI_HANDLE(&nvl->dev->dev); - #else - return RM_ERR_NOT_SUPPORTED; - #endif -+#else -+#ifdef ACPI_HANDLE -+ nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); -+ dev_handle = ACPI_HANDLE(&nvl->dev->dev); -+#else -+ return RM_ERR_NOT_SUPPORTED; -+#endif -+#endif - if (!dev_handle) - return RM_ERR_INVALID_ARGUMENT; - -@@ -1294,12 +1313,21 @@ RM_STATUS NV_API_CALL nv_acpi_rom_method - struct acpi_object_list input = { 2, rom_arg }; - acpi_handle dev_handle = NULL; - uint32_t offset, length; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) - #ifdef DEVICE_ACPI_HANDLE - nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); - dev_handle = DEVICE_ACPI_HANDLE(&nvl->dev->dev); - #else - return RM_ERR_NOT_SUPPORTED; - #endif -+#else -+#ifdef ACPI_HANDLE -+ nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); -+ dev_handle = ACPI_HANDLE(&nvl->dev->dev); -+#else -+ return RM_ERR_NOT_SUPPORTED; -+#endif -+#endif - - if (!dev_handle) - return RM_ERR_INVALID_ARGUMENT; -@@ -1364,12 +1392,21 @@ RM_STATUS NV_API_CALL nv_acpi_dod_method - union acpi_object *dod; - acpi_handle dev_handle = NULL; - NvU32 i, count = (*pSize / sizeof(NvU32)); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) - #ifdef DEVICE_ACPI_HANDLE - nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); - dev_handle = DEVICE_ACPI_HANDLE(&nvl->dev->dev); - #else - return RM_ERR_NOT_SUPPORTED; - #endif -+#else -+#ifdef ACPI_HANDLE -+ nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); -+ dev_handle = ACPI_HANDLE(&nvl->dev->dev); -+#else -+ return RM_ERR_NOT_SUPPORTED; -+#endif -+#endif - - if (!dev_handle) - return RM_ERR_INVALID_ARGUMENT; -diff -rupN NVIDIA-Linux-x86_64-331.38.orig/kernel/uvm/nvidia_uvm_linux.h NVIDIA-Linux-x86_64-331.38/kernel/uvm/nvidia_uvm_linux.h ---- NVIDIA-Linux-x86_64-331.38.orig/kernel/uvm/nvidia_uvm_linux.h 2014-01-25 09:39:47.172966925 +0100 -+++ NVIDIA-Linux-x86_64-331.38/kernel/uvm/nvidia_uvm_linux.h 2014-01-25 09:46:40.572999245 +0100 -@@ -405,11 +405,17 @@ typedef void irqreturn_t; - // not require the RCU's read lock on current->cred. - // - // -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) -+#define NV_KUID_TO_UID(value) (__kuid_val(value)) -+#else -+#define NV_KUID_TO_UID(value) (value) -+#endif -+ - #if defined(NV_TASK_STRUCT_HAS_CRED) - #define NV_CURRENT_EUID() \ -- (((typeof(*current->cred) __force __kernel *)current->cred)->euid) -+ NV_KUID_TO_UID(((typeof(*current->cred) __force __kernel *)current->cred)->euid) - #else --#define NV_CURRENT_EUID() (current->euid) -+#define NV_CURRENT_EUID() NV_KUID_TO_UID(current->euid) - #endif - - #define NV_ATOMIC_SET(data,val) atomic_set(&(data), (val)) diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index b887c7d..411c995 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -45,29 +45,28 @@ exit 1 %define kpkg %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%kernel_pkg ; done) %define bkpkg %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%build_kernel_pkg ; done) -%define rel 3 +%define rel 1 %define pname xorg-driver-video-nvidia Summary: Linux Drivers for nVidia GeForce/Quadro Chips Summary(hu.UTF-8): Linux meghajtók nVidia GeForce/Quadro chipekhez Summary(pl.UTF-8): Sterowniki do kart graficznych nVidia GeForce/Quadro Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel} # when updating version here, keep nvidia-settings.spec in sync as well -Version: 331.38 +Version: 331.67 Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}} Epoch: 1 License: nVidia Binary Group: X11 Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run -# Source0-md5: 16aa229f7f118c8cafad6fb3f4ac082e +# Source0-md5: 7b6587714018fa7d1931fb3444d53c52 Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run -# Source1-md5: f2059ae373665cb6c8fb826e1173b04d +# Source1-md5: 5354ea041b6b49fb31dcf1f5694ad5ea Source2: %{pname}-xinitrc.sh Source3: gl.pc.in Source4: 10-nvidia.conf Source5: 10-nvidia-modules.conf Patch0: X11-driver-nvidia-GL.patch Patch1: X11-driver-nvidia-desktop.patch -Patch2: linux-3.13.patch URL: http://www.nvidia.com/object/unix.html BuildRequires: rpmbuild(macros) >= 1.679 %{?with_dist_kernel:%{expand:%kbrs}} @@ -269,7 +268,6 @@ rm -rf NVIDIA-Linux-x86*-%{version}* %endif %patch0 -p1 %patch1 -p1 -%patch2 -p1 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild %build