Advertisement
Guest User

NVIDIA driver 340.65/343.36 Linux Kernel 3.18 patch patch

a guest
Dec 29th, 2014
335
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.48 KB | None | 0 0
  1. --- kernel/nv-drm.c~    2014-11-08 00:57:53.000000000 +0100
  2. +++ kernel/nv-drm.c     2014-11-13 21:03:37.589650873 +0100
  3. @@ -128,6 +128,10 @@ static struct drm_driver nv_drm_driver =
  4.      .gem_prime_vmap = nv_gem_prime_vmap,
  5.      .gem_prime_vunmap = nv_gem_prime_vunmap,
  6.  
  7. +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)
  8. +    .set_busid = drm_pci_set_busid,
  9. +#endif
  10. +
  11.      .name = "nvidia-drm",
  12.      .desc = "NVIDIA DRM driver",
  13.      .date = "20130102",
  14. diff --git a/nv-frontend.c~ b/nv-frontend.c
  15. index c8c8af1..00f0973 100644
  16. --- kernel/nv-frontend.c~
  17. +++ kernel/nv-frontend.c
  18. @@ -327,7 +327,7 @@ long nvidia_frontend_unlocked_ioctl(
  19.      unsigned long i_arg
  20.  )
  21.  {
  22. -    return nvidia_frontend_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
  23. +    return nvidia_frontend_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
  24.  }
  25.  
  26.  long nvidia_frontend_compat_ioctl(
  27. @@ -336,7 +336,7 @@ long nvidia_frontend_compat_ioctl(
  28.      unsigned long i_arg
  29.  )
  30.  {
  31. -    return nvidia_frontend_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
  32. +    return nvidia_frontend_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
  33.  }
  34.  
  35.  int nvidia_frontend_mmap(
  36. diff --git a/nv.c~ b/nv.c
  37. index 6b31000..3db114e 100644
  38. --- kernel/nv.c~
  39. +++ kernel/nv.c
  40. @@ -1796,7 +1796,7 @@ nvidia_unlocked_ioctl(
  41.      unsigned long i_arg
  42.  )
  43.  {
  44. -    return nvidia_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
  45. +    return nvidia_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
  46.  }
  47.  
  48.  /*
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement