summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD9
-rw-r--r--fs52243.patch14
3 files changed, 24 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2f0a43bfab9b..0b281ad90a13 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Mon Feb 27 22:41:59 UTC 2017
+# Fri Mar 3 20:13:26 UTC 2017
pkgbase = nvidia-340xx-ck
pkgdesc = NVIDIA drivers for linux-ck, 340xx legacy branch.
pkgver = 340.102
- pkgrel = 3
+ pkgrel = 4
url = http://www.nvidia.com/
install = readme.install
arch = i686
@@ -20,7 +20,9 @@ pkgbase = nvidia-340xx-ck
conflicts = nvidia-304xx-ck
options = !strip
source = 4.10.0_kernel.patch
+ source = fs52243.patch
sha256sums = b47c308d486dd777617d4195fa928091b677e4fca421b487328fab9932bc6222
+ sha256sums = d1741377218e512063434c52a62a4fe3cfb23ab0a0ebc9fc817567692541e73e
source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/340.102/NVIDIA-Linux-x86-340.102.run
sha256sums_i686 = 61b13d5dae0f6f5d788a4d8c4c98e8d971d19cb90b606058060d007946248828
source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/340.102/NVIDIA-Linux-x86_64-340.102-no-compat32.run
diff --git a/PKGBUILD b/PKGBUILD
index 3942edf223ef..537e5cdb47e8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=nvidia-340xx-ck
pkgver=340.102
_extramodules=extramodules-4.10-ck
-pkgrel=3
+pkgrel=4
pkgdesc="NVIDIA drivers for linux-ck, 340xx legacy branch."
arch=('i686' 'x86_64')
url="http://www.nvidia.com/"
@@ -16,10 +16,12 @@ conflicts=('nvidia-ck' 'nvidia-304xx-ck')
license=('custom')
install=readme.install
options=(!strip)
-source=('4.10.0_kernel.patch')
+source=('4.10.0_kernel.patch'
+'fs52243.patch')
source_i686+=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run")
source_x86_64+=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
-sha256sums=('b47c308d486dd777617d4195fa928091b677e4fca421b487328fab9932bc6222')
+sha256sums=('b47c308d486dd777617d4195fa928091b677e4fca421b487328fab9932bc6222'
+ 'd1741377218e512063434c52a62a4fe3cfb23ab0a0ebc9fc817567692541e73e')
sha256sums_i686=('61b13d5dae0f6f5d788a4d8c4c98e8d971d19cb90b606058060d007946248828')
sha256sums_x86_64=('6a36bd9a0033769ecd11ce2aa60aeb41b50b20616c43fd19c55e027c451f585e')
[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
@@ -30,6 +32,7 @@ prepare() {
cd "${_pkg}"
# patches here
+ patch -Np0 < "${srcdir}"/fs52243.patch
patch -Np1 < "${srcdir}"/4.10.0_kernel.patch
cp -a kernel kernel-dkms
diff --git a/fs52243.patch b/fs52243.patch
new file mode 100644
index 000000000000..b6dc35a2e7ff
--- /dev/null
+++ b/fs52243.patch
@@ -0,0 +1,14 @@
+--- kernel/nv-drm.c 2016-12-15 12:41:26.000000000 +0100
++++ kernel/nv-drm.c 2016-12-15 12:58:48.000000000 +0100
+@@ -115,7 +115,11 @@
+ };
+
+ static struct drm_driver nv_drm_driver = {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
++ .driver_features = DRIVER_GEM | DRIVER_PRIME | DRIVER_LEGACY,
++#else
+ .driver_features = DRIVER_GEM | DRIVER_PRIME,
++#endif
+ .load = nv_drm_load,
+ .unload = nv_drm_unload,
+ .fops = &nv_drm_fops,