Advertisement
Guest User

Untitled

a guest
May 17th, 2016
5,249
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.63 KB | None | 0 0
  1. --- a/kernel/nvidia-drm/nvidia-drm-fb.c 2016-05-17 19:36:45.210422962 +0700
  2. +++ b/kernel/nvidia-drm/nvidia-drm-fb.c 2016-05-17 19:43:19.621579825 +0700
  3. @@ -77,7 +77,7 @@
  4. static struct drm_framebuffer *internal_framebuffer_create
  5. (
  6. struct drm_device *dev,
  7. - struct drm_file *file, struct drm_mode_fb_cmd2 *cmd,
  8. + struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd,
  9. uint64_t nvkms_params_ptr,
  10. uint64_t nvkms_params_size
  11. )
  12. @@ -199,7 +199,7 @@
  13. struct drm_framebuffer *nvidia_drm_framebuffer_create
  14. (
  15. struct drm_device *dev,
  16. - struct drm_file *file, struct drm_mode_fb_cmd2 *cmd
  17. + struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd
  18. )
  19. {
  20. return internal_framebuffer_create(dev, file, cmd, 0, 0);
  21. --- a/kernel/nvidia-drm/nvidia-drm-fb.h 2016-05-17 19:36:45.210422962 +0700
  22. +++ b/kernel/nvidia-drm/nvidia-drm-fb.h 2016-05-17 19:36:48.517069977 +0700
  23. @@ -45,7 +45,7 @@
  24. struct drm_framebuffer *nvidia_drm_framebuffer_create
  25. (
  26. struct drm_device *dev,
  27. - struct drm_file *file, struct drm_mode_fb_cmd2 *cmd
  28. + struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd
  29. );
  30.  
  31. int nvidia_drm_add_nvkms_fb(
  32. --- a/kernel/nvidia-drm/nvidia-drm-linux.c 2016-05-17 19:36:45.210422962 +0700
  33. +++ b/kernel/nvidia-drm/nvidia-drm-linux.c 2016-05-17 19:42:18.677163127 +0700
  34. @@ -121,7 +121,7 @@
  35.  
  36. down_read(&mm->mmap_sem);
  37.  
  38. - pages_pinned = get_user_pages(current, mm,
  39. + pages_pinned = get_user_pages_remote(current, mm,
  40. address, pages_count, write, force,
  41. user_pages, NULL);
  42. up_read(&mm->mmap_sem);
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement