Advertisement
Guest User

Untitled

a guest
Aug 20th, 2016
1,320
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 2.25 KB | None | 0 0
  1. diff -Naur a/kernel/nvidia-drm/nvidia-drm-fb.c b/kernel/nvidia-drm/nvidia-drm-fb.c
  2. --- a/kernel/nvidia-drm/nvidia-drm-fb.c 2016-08-20 21:02:56.220661347 -0300
  3. +++ b/kernel/nvidia-drm/nvidia-drm-fb.c 2016-08-20 21:08:56.420667987 -0300
  4. @@ -31,6 +31,7 @@
  5.  #include "nvidia-drm-gem.h"
  6.  
  7.  #include <drm/drm_crtc_helper.h>
  8. +#include <linux/version.h>
  9.  
  10.  static void nvidia_framebuffer_destroy(struct drm_framebuffer *fb)
  11.  {
  12. @@ -113,8 +114,13 @@
  13.       *
  14.       * We don't support any planar format, pick up first buffer only.
  15.       */
  16. +    
  17. +    #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
  18. +        gem = drm_gem_object_lookup(file, cmd->handles[0]);
  19. +    #else
  20. +        gem = drm_gem_object_lookup(dev, file, cmd->handles[0]);
  21. +    #endif
  22.  
  23. -    gem = drm_gem_object_lookup(dev, file, cmd->handles[0]);
  24.  
  25.      if (gem == NULL)
  26.      {
  27. diff -Naur a/kernel/nvidia-drm/nvidia-drm-gem.c b/kernel/nvidia-drm/nvidia-drm-gem.c
  28. --- a/kernel/nvidia-drm/nvidia-drm-gem.c    2016-08-20 21:02:56.220661347 -0300
  29. +++ b/kernel/nvidia-drm/nvidia-drm-gem.c    2016-08-20 21:10:34.160669788 -0300
  30. @@ -27,6 +27,7 @@
  31.  #include "nvidia-drm-priv.h"
  32.  #include "nvidia-drm-ioctl.h"
  33.  #include "nvidia-drm-gem.h"
  34. +#include <linux/version.h>
  35.  
  36.  static struct nvidia_drm_gem_object *nvidia_drm_gem_new
  37.  (
  38. @@ -407,8 +408,13 @@
  39.      int ret = -EINVAL;
  40.  
  41.      mutex_lock(&dev->struct_mutex);
  42. +    
  43. +    #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
  44. +        gem = drm_gem_object_lookup(file, handle);
  45. +    #else
  46. +        gem = drm_gem_object_lookup(dev, file, handle);
  47. +    #endif
  48.  
  49. -    gem = drm_gem_object_lookup(dev, file, handle);
  50.  
  51.      if (gem == NULL)
  52.      {
  53. diff -Naur a/kernel/nvidia-uvm/uvm_linux.h b/kernel/nvidia-uvm/uvm_linux.h
  54. --- a/kernel/nvidia-uvm/uvm_linux.h 2016-08-20 21:02:56.220661347 -0300
  55. +++ b/kernel/nvidia-uvm/uvm_linux.h 2016-08-20 21:06:33.380665350 -0300
  56. @@ -554,12 +554,13 @@
  57.      INIT_RADIX_TREE(tree, GFP_NOWAIT);
  58.  }
  59.  
  60. +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
  61.  static bool radix_tree_empty(struct radix_tree_root *tree)
  62.  {
  63.      void *dummy;
  64.      return radix_tree_gang_lookup(tree, &dummy, 0, 1) == 0;
  65.  }
  66. -
  67. +#endif
  68.  
  69.  #if !defined(NV_USLEEP_RANGE_PRESENT)
  70.  static void __sched usleep_range(unsigned long min, unsigned long max)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement