43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
--- a/kernel/nvidia-drm/nvidia-drm-fb.c 2016-05-17 19:36:45.210422962 +0700
|
|
+++ b/kernel/nvidia-drm/nvidia-drm-fb.c 2016-05-17 19:43:19.621579825 +0700
|
|
@@ -77,7 +77,7 @@
|
|
static struct drm_framebuffer *internal_framebuffer_create
|
|
(
|
|
struct drm_device *dev,
|
|
- struct drm_file *file, struct drm_mode_fb_cmd2 *cmd,
|
|
+ struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd,
|
|
uint64_t nvkms_params_ptr,
|
|
uint64_t nvkms_params_size
|
|
)
|
|
@@ -199,7 +199,7 @@
|
|
struct drm_framebuffer *nvidia_drm_framebuffer_create
|
|
(
|
|
struct drm_device *dev,
|
|
- struct drm_file *file, struct drm_mode_fb_cmd2 *cmd
|
|
+ struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd
|
|
)
|
|
{
|
|
return internal_framebuffer_create(dev, file, cmd, 0, 0);
|
|
--- a/kernel/nvidia-drm/nvidia-drm-fb.h 2016-05-17 19:36:45.210422962 +0700
|
|
+++ b/kernel/nvidia-drm/nvidia-drm-fb.h 2016-05-17 19:36:48.517069977 +0700
|
|
@@ -45,7 +45,7 @@
|
|
struct drm_framebuffer *nvidia_drm_framebuffer_create
|
|
(
|
|
struct drm_device *dev,
|
|
- struct drm_file *file, struct drm_mode_fb_cmd2 *cmd
|
|
+ struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd
|
|
);
|
|
|
|
int nvidia_drm_add_nvkms_fb(
|
|
--- a/kernel/nvidia-drm/nvidia-drm-linux.c 2016-05-17 19:36:45.210422962 +0700
|
|
+++ b/kernel/nvidia-drm/nvidia-drm-linux.c 2016-05-17 19:42:18.677163127 +0700
|
|
@@ -121,7 +121,7 @@
|
|
|
|
down_read(&mm->mmap_sem);
|
|
|
|
- pages_pinned = get_user_pages(current, mm,
|
|
+ pages_pinned = get_user_pages_remote(current, mm,
|
|
address, pages_count, write, force,
|
|
user_pages, NULL);
|
|
up_read(&mm->mmap_sem);
|