[patch] nvidia 367.35-r1 kernel 4.7 patch

kernel47.patch (text/plain), 1.96 KB, created by Sven B. on 2016-07-27 20:33:53 UTC

diff -urN kernel/nvidia-drm/nvidia-drm-fb.c kernel.new/nvidia-drm/nvidia-drm-fb.c
--- kernel/nvidia-drm/nvidia-drm-fb.c	2016-07-12 06:53:45.000000000 +0200
+++ kernel.new/nvidia-drm/nvidia-drm-fb.c	2016-07-27 21:19:35.163781919 +0200
@@ -114,7 +114,7 @@
      * We don't support any planar format, pick up first buffer only.
      */
 
-    gem = drm_gem_object_lookup(dev, file, cmd->handles[0]);
+    gem = drm_gem_object_lookup(file, cmd->handles[0]);
 
     if (gem == NULL)
     {
diff -urN kernel/nvidia-drm/nvidia-drm-gem.c kernel.new/nvidia-drm/nvidia-drm-gem.c
--- kernel/nvidia-drm/nvidia-drm-gem.c	2016-07-12 06:53:45.000000000 +0200
+++ kernel.new/nvidia-drm/nvidia-drm-gem.c	2016-07-27 21:20:10.149882081 +0200
@@ -408,7 +408,7 @@
 
     mutex_lock(&dev->struct_mutex);
 
-    gem = drm_gem_object_lookup(dev, file, handle);
+    gem = drm_gem_object_lookup(file, handle);
 
     if (gem == NULL)
     {
diff -urN kernel/nvidia-uvm/uvm8_gpu.c kernel.new/nvidia-uvm/uvm8_gpu.c
--- kernel/nvidia-uvm/uvm8_gpu.c	2016-07-12 06:52:17.000000000 +0200
+++ kernel.new/nvidia-uvm/uvm8_gpu.c	2016-07-27 21:28:00.455268091 +0200
@@ -647,7 +647,7 @@
                    gpu->id, uvm_gpu_retained_count(gpu));
 
     // All channels should have been removed before the retained count went to 0
-    UVM_ASSERT(radix_tree_empty(&gpu->instance_ptr_table));
+    UVM_ASSERT(radix_tree_is_empty(&gpu->instance_ptr_table));
 
     // Remove the GPU from the table.
     uvm_spin_lock_irqsave(&g_uvm_global.gpu_table_lock);
diff -urN kernel/nvidia-uvm/uvm_linux.h kernel.new/nvidia-uvm/uvm_linux.h
--- kernel/nvidia-uvm/uvm_linux.h	2016-07-12 06:52:17.000000000 +0200
+++ kernel.new/nvidia-uvm/uvm_linux.h	2016-07-27 21:29:20.781508969 +0200
@@ -554,7 +554,7 @@
     INIT_RADIX_TREE(tree, GFP_NOWAIT);
 }
 
-static bool radix_tree_empty(struct radix_tree_root *tree)
+static bool radix_tree_is_empty(struct radix_tree_root *tree)
 {
     void *dummy;
     return radix_tree_gang_lookup(tree, &dummy, 0, 1) == 0;