diff --git a/packages/x11/driver/xf86-video-nvidia/package.mk b/packages/x11/driver/xf86-video-nvidia/package.mk index 9d222d1636..31b1a4ab5c 100644 --- a/packages/x11/driver/xf86-video-nvidia/package.mk +++ b/packages/x11/driver/xf86-video-nvidia/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="xf86-video-nvidia" -PKG_VERSION="340.76" +PKG_VERSION="346.59" PKG_REV="1" PKG_ARCH="x86_64" PKG_LICENSE="nonfree" diff --git a/packages/x11/driver/xf86-video-nvidia/patches/xf86-video-nvidia-kernel-3.18.patch b/packages/x11/driver/xf86-video-nvidia/patches/xf86-video-nvidia-kernel-3.18.patch deleted file mode 100644 index 537d41ca3c..0000000000 --- a/packages/x11/driver/xf86-video-nvidia/patches/xf86-video-nvidia-kernel-3.18.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c -index f4011c2..929a187 100644 ---- a/kernel/nv-drm.c -+++ b/kernel/nv-drm.c -@@ -17,6 +17,7 @@ - #if defined(NV_DRM_AVAILABLE) - - #include -+#include - - extern nv_linux_state_t *nv_linux_devices; - -@@ -114,6 +115,7 @@ static struct drm_driver nv_drm_driver = { - .driver_features = DRIVER_GEM | DRIVER_PRIME, - .load = nv_drm_load, - .unload = nv_drm_unload, -+ .set_busid = drm_pci_set_busid, - .fops = &nv_drm_fops, - - .gem_free_object = nv_gem_free, diff --git a/packages/x11/driver/xf86-video-nvidia/patches/xf86-video-nvidia-kernel-4.0.patch b/packages/x11/driver/xf86-video-nvidia/patches/xf86-video-nvidia-kernel-4.0.patch deleted file mode 100644 index f0d0dbb561..0000000000 --- a/packages/x11/driver/xf86-video-nvidia/patches/xf86-video-nvidia-kernel-4.0.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Naur NVIDIA-Linux-x86_64-340.76-no-compat32/kernel/nv-pat.c NVIDIA-Linux-x86_64-340.76-no-compat32.patch/kernel/nv-pat.c ---- NVIDIA-Linux-x86_64-340.76-no-compat32/kernel/nv-pat.c 2015-01-22 20:01:16.000000000 +0100 -+++ NVIDIA-Linux-x86_64-340.76-no-compat32.patch/kernel/nv-pat.c 2015-04-04 19:16:01.931219988 +0200 -@@ -35,8 +35,13 @@ - unsigned long cr0 = read_cr0(); - write_cr0(((cr0 & (0xdfffffff)) | 0x40000000)); - wbinvd(); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 20, 0) - *cr4 = read_cr4(); - if (*cr4 & 0x80) write_cr4(*cr4 & ~0x80); -+#else -+ *cr4 = __read_cr4(); -+ if (*cr4 & 0x80) __write_cr4(*cr4 & ~0x80); -+#endif - __flush_tlb(); - } - -@@ -46,7 +51,11 @@ - wbinvd(); - __flush_tlb(); - write_cr0((cr0 & 0x9fffffff)); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 20, 0) - if (cr4 & 0x80) write_cr4(cr4); -+#else -+ if (cr4 & 0x80) __write_cr4(cr4); -+#endif - } - - static int nv_determine_pat_mode(void)