|
Line
Link Here
|
| 0 |
-- a/kernel/nvidia-drm/nvidia-drm-fb.c |
0 |
++ b/kernel/nvidia-drm/nvidia-drm-fb.c |
|
Lines 77-83
Link Here
|
| 77 |
static struct drm_framebuffer *internal_framebuffer_create |
77 |
static struct drm_framebuffer *internal_framebuffer_create |
| 78 |
( |
78 |
( |
| 79 |
struct drm_device *dev, |
79 |
struct drm_device *dev, |
| 80 |
struct drm_file *file, struct drm_mode_fb_cmd2 *cmd, |
80 |
struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd, |
| 81 |
uint64_t nvkms_params_ptr, |
81 |
uint64_t nvkms_params_ptr, |
| 82 |
uint64_t nvkms_params_size |
82 |
uint64_t nvkms_params_size |
| 83 |
) |
83 |
) |
|
Lines 199-205
Link Here
|
| 199 |
struct drm_framebuffer *nvidia_drm_framebuffer_create |
199 |
struct drm_framebuffer *nvidia_drm_framebuffer_create |
| 200 |
( |
200 |
( |
| 201 |
struct drm_device *dev, |
201 |
struct drm_device *dev, |
| 202 |
struct drm_file *file, struct drm_mode_fb_cmd2 *cmd |
202 |
struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd |
| 203 |
) |
203 |
) |
| 204 |
{ |
204 |
{ |
| 205 |
return internal_framebuffer_create(dev, file, cmd, 0, 0); |
205 |
return internal_framebuffer_create(dev, file, cmd, 0, 0); |
| 206 |
-- a/kernel/nvidia-drm/nvidia-drm-fb.h |
206 |
++ b/kernel/nvidia-drm/nvidia-drm-fb.h |
|
Lines 45-51
Link Here
|
| 45 |
struct drm_framebuffer *nvidia_drm_framebuffer_create |
45 |
struct drm_framebuffer *nvidia_drm_framebuffer_create |
| 46 |
( |
46 |
( |
| 47 |
struct drm_device *dev, |
47 |
struct drm_device *dev, |
| 48 |
struct drm_file *file, struct drm_mode_fb_cmd2 *cmd |
48 |
struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd |
| 49 |
); |
49 |
); |
| 50 |
|
50 |
|
| 51 |
int nvidia_drm_add_nvkms_fb( |
51 |
int nvidia_drm_add_nvkms_fb( |
| 52 |
-- a/kernel/nvidia-drm/nvidia-drm-linux.c |
52 |
++ b/kernel/nvidia-drm/nvidia-drm-linux.c |
|
Lines 31-36
Link Here
|
| 31 |
|
31 |
|
| 32 |
#if defined(NV_DRM_AVAILABLE) |
32 |
#if defined(NV_DRM_AVAILABLE) |
| 33 |
|
33 |
|
|
|
34 |
#include "nv-mm.h" |
| 34 |
#include "nv-pgprot.h" |
35 |
#include "nv-pgprot.h" |
| 35 |
|
36 |
|
| 36 |
MODULE_PARM_DESC( |
37 |
MODULE_PARM_DESC( |
|
Lines 121-128
Link Here
|
| 121 |
|
122 |
|
| 122 |
down_read(&mm->mmap_sem); |
123 |
down_read(&mm->mmap_sem); |
| 123 |
|
124 |
|
| 124 |
pages_pinned = get_user_pages(current, mm, |
125 |
pages_pinned = NV_GET_USER_PAGES(address, pages_count, write, force, |
| 125 |
address, pages_count, write, force, |
|
|
| 126 |
user_pages, NULL); |
126 |
user_pages, NULL); |
| 127 |
up_read(&mm->mmap_sem); |
127 |
up_read(&mm->mmap_sem); |
