Update Package - xf86-video-nvidia 346.59

This commit is contained in:
Lukas Rusak 2015-03-01 21:36:48 -08:00
parent e118851efb
commit 7eaabf84a7
3 changed files with 1 additions and 50 deletions

View File

@ -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"

View File

@ -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 <drm/drmP.h>
+#include <drm/drm_gem.h>
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,

View File

@ -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)