Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -Naur nvidia-drivers/kernel/nvidia-drm/nvidia-drm-fb.c nvidia-drivers.new/kernel/nvidia-drm/nvidia-drm-fb.c
- --- nvidia-drivers/kernel/nvidia-drm/nvidia-drm-fb.c 2016-08-08 13:06:08.895435481 +0200
- +++ nvidia-drivers.new/kernel/nvidia-drm/nvidia-drm-fb.c 2016-08-08 13:16:04.215438841 +0200
- @@ -32,6 +32,8 @@
- #include <drm/drm_crtc_helper.h>
- +#include <linux/version.h>
- +
- static void nvidia_framebuffer_destroy(struct drm_framebuffer *fb)
- {
- struct nvidia_drm_device *nv_dev = fb->dev->dev_private;
- @@ -114,7 +116,11 @@
- * We don't support any planar format, pick up first buffer only.
- */
- - gem = drm_gem_object_lookup(dev, file, cmd->handles[0]);
- + #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
- + gem = drm_gem_object_lookup(file, cmd->handles[0]);
- + #else
- + gem = drm_gem_object_lookup(dev, file, cmd->handles[0]);
- + #endif
- if (gem == NULL)
- {
- diff -Naur nvidia-drivers/kernel/nvidia-drm/nvidia-drm-gem.c nvidia-drivers.new/kernel/nvidia-drm/nvidia-drm-gem.c
- --- nvidia-drivers/kernel/nvidia-drm/nvidia-drm-gem.c 2016-08-08 13:06:08.895435481 +0200
- +++ nvidia-drivers.new/kernel/nvidia-drm/nvidia-drm-gem.c 2016-08-08 13:44:56.607448618 +0200
- @@ -28,6 +28,8 @@
- #include "nvidia-drm-ioctl.h"
- #include "nvidia-drm-gem.h"
- +#include <linux/version.h>
- +
- static struct nvidia_drm_gem_object *nvidia_drm_gem_new
- (
- struct drm_file *file_priv,
- @@ -408,7 +410,11 @@
- mutex_lock(&dev->struct_mutex);
- - gem = drm_gem_object_lookup(dev, file, handle);
- + #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
- + gem = drm_gem_object_lookup(file, handle);
- + #else
- + gem = drm_gem_object_lookup(dev, file, handle);
- + #endif
- if (gem == NULL)
- {
- diff -Naur nvidia-drivers/kernel/nvidia-uvm/uvm8_gpu.c nvidia-drivers.new/kernel/nvidia-uvm/uvm8_gpu.c
- --- nvidia-drivers/kernel/nvidia-uvm/uvm8_gpu.c 2016-08-08 13:06:08.912435481 +0200
- +++ nvidia-drivers.new/kernel/nvidia-uvm/uvm8_gpu.c 2016-08-08 13:07:58.244436098 +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 -Naur nvidia-drivers/kernel/nvidia-uvm/uvm_linux.h nvidia-drivers.new/kernel/nvidia-uvm/uvm_linux.h
- --- nvidia-drivers/kernel/nvidia-uvm/uvm_linux.h 2016-08-08 13:06:08.912435481 +0200
- +++ nvidia-drivers.new/kernel/nvidia-uvm/uvm_linux.h 2016-08-08 13:11:46.718437388 +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;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement