From cc24367309588bbbe44e146fdba97a98c7474adb Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Wed, 14 Dec 2016 18:40:16 +0100 Subject: [PATCH] up to 340.101 - adds support for abi 23 (xorg 1.19) - linux-4.6 patch no longer required --- linux-4.6.patch | 38 ---------------------- xorg-driver-video-nvidia-legacy-340xx.spec | 12 +++---- 2 files changed, 5 insertions(+), 45 deletions(-) delete mode 100644 linux-4.6.patch diff --git a/linux-4.6.patch b/linux-4.6.patch deleted file mode 100644 index 365dd1a..0000000 --- a/linux-4.6.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- NVIDIA-Linux-x86_64-340.96-no-compat32/kernel/os-mlock.c~ 2015-11-09 06:44:53.000000000 +0100 -+++ NVIDIA-Linux-x86_64-340.96-no-compat32/kernel/os-mlock.c 2016-06-19 18:41:01.530699309 +0200 -@@ -45,7 +45,11 @@ - } - - down_read(&mm->mmap_sem); -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)) -+ ret = get_user_pages((unsigned long)address, -+#else - ret = get_user_pages(current, mm, (unsigned long)address, -+#endif - page_count, write, force, user_pages, NULL); - up_read(&mm->mmap_sem); - pinned = ret; -@@ -58,7 +62,11 @@ - else if (pinned < page_count) - { - for (i = 0; i < pinned; i++) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)) -+ put_page(user_pages[i]); -+#else - page_cache_release(user_pages[i]); -+#endif - os_free_mem(user_pages); - return RM_ERR_INVALID_ADDRESS; - } -@@ -85,7 +93,11 @@ - { - if (write) - set_page_dirty_lock(user_pages[i]); -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)) -+ put_page(user_pages[i]); -+#else - page_cache_release(user_pages[i]); -+#endif - } - - os_free_mem(user_pages); diff --git a/xorg-driver-video-nvidia-legacy-340xx.spec b/xorg-driver-video-nvidia-legacy-340xx.spec index 4e383fe..6d4f332 100644 --- a/xorg-driver-video-nvidia-legacy-340xx.spec +++ b/xorg-driver-video-nvidia-legacy-340xx.spec @@ -25,22 +25,22 @@ exit 1 %define no_install_post_check_so 1 -%define rel 3 +%define rel 1 %define pname xorg-driver-video-nvidia-legacy-340xx 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: 340.96 +Version: 340.101 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: cb64b165b638671bcdc75bcf297b8d90 +# Source0-md5: b2b33b50cf375ccba7d3b959b9f509ec Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run -# Source1-md5: 7bdbcee13bade63227933d9217571882 +# Source1-md5: dd1a25ab34b7855d533474f3e8f3e868 Source2: xorg-driver-video-nvidia-xinitrc.sh Source3: gl.pc.in Source4: 10-nvidia.conf @@ -48,7 +48,6 @@ Source5: 10-nvidia-modules.conf Patch0: X11-driver-nvidia-GL.patch Patch1: X11-driver-nvidia-desktop.patch Patch2: linux-4.0.patch -Patch3: linux-4.6.patch URL: http://www.nvidia.com/object/unix.html BuildRequires: rpmbuild(macros) >= 1.701 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}} @@ -56,7 +55,7 @@ BuildRequires: sed >= 4.0 BuildConflicts: XFree86-nvidia Requires: %{pname}-libs = %{epoch}:%{version}-%{rel} Requires: xorg-xserver-server -Requires: xorg-xserver-server(videodrv-abi) <= 20.0 +Requires: xorg-xserver-server(videodrv-abi) <= 23.0 Requires: xorg-xserver-server(videodrv-abi) >= 2.0 Provides: ocl-icd(nvidia) Provides: ocl-icd-driver @@ -251,7 +250,6 @@ rm -rf NVIDIA-Linux-x86*-%{version}* %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild %build -- 2.44.0