aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2018-11-26 16:59:28 -0500
committerEric Anholt <eric@anholt.net>2018-11-27 15:23:32 -0500
commit08f73d668048ffa3ba6b1426b6ba0a89b16aefd7 (patch)
tree74991749982507aeff45de15539ea2111e3d72a9 /drivers/gpu/drm
parent8f1cd826641d677d0f7494253ecfc3335f0bcd4e (diff)
drm/vkms: Drop custom vkms_dumb_map().
This is the same as the default drm_gem_dumb_map_offset() implementation, except that this one missed the ban on userspace mapping an imported dmabuf (which seems like intended common behavior for drivers). Signed-off-by: Eric Anholt <eric@anholt.net> Link: https://patchwork.freedesktop.org/patch/msgid/20181126215929.20546-1-eric@anholt.net Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/vkms/vkms_drv.c1
-rw-r--r--drivers/gpu/drm/vkms/vkms_drv.h3
-rw-r--r--drivers/gpu/drm/vkms/vkms_gem.c26
3 files changed, 0 insertions, 30 deletions
diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_drv.c
index a3d57e0f5ee5..83087877565c 100644
--- a/drivers/gpu/drm/vkms/vkms_drv.c
+++ b/drivers/gpu/drm/vkms/vkms_drv.c
@@ -68,7 +68,6 @@ static struct drm_driver vkms_driver = {
68 .release = vkms_release, 68 .release = vkms_release,
69 .fops = &vkms_driver_fops, 69 .fops = &vkms_driver_fops,
70 .dumb_create = vkms_dumb_create, 70 .dumb_create = vkms_dumb_create,
71 .dumb_map_offset = vkms_dumb_map,
72 .gem_vm_ops = &vkms_gem_vm_ops, 71 .gem_vm_ops = &vkms_gem_vm_ops,
73 .gem_free_object_unlocked = vkms_gem_free_object, 72 .gem_free_object_unlocked = vkms_gem_free_object,
74 .get_vblank_timestamp = vkms_get_vblank_timestamp, 73 .get_vblank_timestamp = vkms_get_vblank_timestamp,
diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h
index 1c93990693e3..e4469cd3d254 100644
--- a/drivers/gpu/drm/vkms/vkms_drv.h
+++ b/drivers/gpu/drm/vkms/vkms_drv.h
@@ -127,9 +127,6 @@ vm_fault_t vkms_gem_fault(struct vm_fault *vmf);
127int vkms_dumb_create(struct drm_file *file, struct drm_device *dev, 127int vkms_dumb_create(struct drm_file *file, struct drm_device *dev,
128 struct drm_mode_create_dumb *args); 128 struct drm_mode_create_dumb *args);
129 129
130int vkms_dumb_map(struct drm_file *file, struct drm_device *dev,
131 u32 handle, u64 *offset);
132
133void vkms_gem_free_object(struct drm_gem_object *obj); 130void vkms_gem_free_object(struct drm_gem_object *obj);
134 131
135int vkms_gem_vmap(struct drm_gem_object *obj); 132int vkms_gem_vmap(struct drm_gem_object *obj);
diff --git a/drivers/gpu/drm/vkms/vkms_gem.c b/drivers/gpu/drm/vkms/vkms_gem.c
index d04e988b4cbe..80311daed47a 100644
--- a/drivers/gpu/drm/vkms/vkms_gem.c
+++ b/drivers/gpu/drm/vkms/vkms_gem.c
@@ -153,32 +153,6 @@ int vkms_dumb_create(struct drm_file *file, struct drm_device *dev,
153 return 0; 153 return 0;
154} 154}
155 155
156int vkms_dumb_map(struct drm_file *file, struct drm_device *dev,
157 u32 handle, u64 *offset)
158{
159 struct drm_gem_object *obj;
160 int ret;
161
162 obj = drm_gem_object_lookup(file, handle);
163 if (!obj)
164 return -ENOENT;
165
166 if (!obj->filp) {
167 ret = -EINVAL;
168 goto unref;
169 }
170
171 ret = drm_gem_create_mmap_offset(obj);
172 if (ret)
173 goto unref;
174
175 *offset = drm_vma_node_offset_addr(&obj->vma_node);
176unref:
177 drm_gem_object_put_unlocked(obj);
178
179 return ret;
180}
181
182static struct page **_get_pages(struct vkms_gem_object *vkms_obj) 156static struct page **_get_pages(struct vkms_gem_object *vkms_obj)
183{ 157{
184 struct drm_gem_object *gem_obj = &vkms_obj->gem; 158 struct drm_gem_object *gem_obj = &vkms_obj->gem;