From 5e7c686c480dd7b07325403ed2d663bb0c25ddf7 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Wed, 14 Dec 2016 18:38:29 +0100 Subject: [PATCH] up to 304.134 - adds support for abi 23 (xorg 1.19) - linux-4.6 patch no longer required --- linux-4.6.patch | 50 ---------------------- xorg-driver-video-nvidia-legacy-304xx.spec | 12 +++--- 2 files changed, 5 insertions(+), 57 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 632fa22..0000000 --- a/linux-4.6.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- NVIDIA-Linux-x86_64-304.131-no-compat32/kernel/nv-mlock.c~ 2015-11-09 06:43:39.000000000 +0100 -+++ NVIDIA-Linux-x86_64-304.131-no-compat32/kernel/nv-mlock.c 2016-06-19 18:34:23.039063568 +0200 -@@ -49,7 +49,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; -@@ -62,7 +66,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; - } -@@ -88,7 +88,11 @@ - { - pci_unmap_page(dev, pte_array[j], - PAGE_SIZE, PCI_DMA_BIDIRECTIONAL); -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)) -+ put_page(user_pages[j]); -+#else - page_cache_release(user_pages[j]); -+#endif - } - os_free_mem(user_pages); - return RM_ERR_OPERATING_SYSTEM; -@@ -122,7 +126,11 @@ - PAGE_SIZE, PCI_DMA_BIDIRECTIONAL); - 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-304xx.spec b/xorg-driver-video-nvidia-legacy-304xx.spec index bf0304a..3040d28 100644 --- a/xorg-driver-video-nvidia-legacy-304xx.spec +++ b/xorg-driver-video-nvidia-legacy-304xx.spec @@ -25,22 +25,22 @@ exit 1 %define no_install_post_check_so 1 -%define rel 3 +%define rel 1 %define mname nvidia-legacy-304xx %define pname xorg-driver-video-%{mname} 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} -Version: 304.131 +Version: 304.134 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: 9f3222fd7287d9b31f54f1d75760e183 +# Source0-md5: 9abd7e9272382bd0e6939c3a367cc1a6 Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run -# Source1-md5: 24c9c6a8679edae3b2a608b191fdc727 +# Source1-md5: 2ecfa6bd145f673264f7977e0366e259 Source2: 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: xorg-driver-video Provides: xorg-xserver-module(glx) @@ -249,7 +248,6 @@ rm -rf NVIDIA-Linux-x86*-%{version}* %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build %{?with_kernel:%{expand:%build_kernel_packages}} -- 2.44.0