diff options
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_drv.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_gem.c | 17 | ||||
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_gem.h | 4 | ||||
-rw-r--r-- | include/uapi/drm/exynos_drm.h | 18 |
4 files changed, 0 insertions, 42 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index 2103d970d6ea..d69bd9723805 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c | |||
@@ -299,9 +299,6 @@ static const struct vm_operations_struct exynos_drm_gem_vm_ops = { | |||
299 | static const struct drm_ioctl_desc exynos_ioctls[] = { | 299 | static const struct drm_ioctl_desc exynos_ioctls[] = { |
300 | DRM_IOCTL_DEF_DRV(EXYNOS_GEM_CREATE, exynos_drm_gem_create_ioctl, | 300 | DRM_IOCTL_DEF_DRV(EXYNOS_GEM_CREATE, exynos_drm_gem_create_ioctl, |
301 | DRM_UNLOCKED | DRM_AUTH), | 301 | DRM_UNLOCKED | DRM_AUTH), |
302 | DRM_IOCTL_DEF_DRV(EXYNOS_GEM_MAP_OFFSET, | ||
303 | exynos_drm_gem_map_offset_ioctl, DRM_UNLOCKED | | ||
304 | DRM_AUTH), | ||
305 | DRM_IOCTL_DEF_DRV(EXYNOS_GEM_MMAP, | 302 | DRM_IOCTL_DEF_DRV(EXYNOS_GEM_MMAP, |
306 | exynos_drm_gem_mmap_ioctl, DRM_UNLOCKED | DRM_AUTH), | 303 | exynos_drm_gem_mmap_ioctl, DRM_UNLOCKED | DRM_AUTH), |
307 | DRM_IOCTL_DEF_DRV(EXYNOS_GEM_GET, | 304 | DRM_IOCTL_DEF_DRV(EXYNOS_GEM_GET, |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c index 15db80138382..2f3665de2d60 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c | |||
@@ -318,23 +318,6 @@ void exynos_drm_gem_put_dma_addr(struct drm_device *dev, | |||
318 | drm_gem_object_unreference_unlocked(obj); | 318 | drm_gem_object_unreference_unlocked(obj); |
319 | } | 319 | } |
320 | 320 | ||
321 | int exynos_drm_gem_map_offset_ioctl(struct drm_device *dev, void *data, | ||
322 | struct drm_file *file_priv) | ||
323 | { | ||
324 | struct drm_exynos_gem_map_off *args = data; | ||
325 | |||
326 | DRM_DEBUG_KMS("handle = 0x%x, offset = 0x%lx\n", | ||
327 | args->handle, (unsigned long)args->offset); | ||
328 | |||
329 | if (!(dev->driver->driver_features & DRIVER_GEM)) { | ||
330 | DRM_ERROR("does not support GEM.\n"); | ||
331 | return -ENODEV; | ||
332 | } | ||
333 | |||
334 | return exynos_drm_gem_dumb_map_offset(file_priv, dev, args->handle, | ||
335 | &args->offset); | ||
336 | } | ||
337 | |||
338 | int exynos_drm_gem_mmap_buffer(struct file *filp, | 321 | int exynos_drm_gem_mmap_buffer(struct file *filp, |
339 | struct vm_area_struct *vma) | 322 | struct vm_area_struct *vma) |
340 | { | 323 | { |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.h b/drivers/gpu/drm/exynos/exynos_drm_gem.h index 1592c0ba7de8..8e460940d118 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gem.h +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.h | |||
@@ -111,10 +111,6 @@ void exynos_drm_gem_put_dma_addr(struct drm_device *dev, | |||
111 | unsigned int gem_handle, | 111 | unsigned int gem_handle, |
112 | struct drm_file *filp); | 112 | struct drm_file *filp); |
113 | 113 | ||
114 | /* get buffer offset to map to user space. */ | ||
115 | int exynos_drm_gem_map_offset_ioctl(struct drm_device *dev, void *data, | ||
116 | struct drm_file *file_priv); | ||
117 | |||
118 | /* | 114 | /* |
119 | * mmap the physically continuous memory that a gem object contains | 115 | * mmap the physically continuous memory that a gem object contains |
120 | * to user space. | 116 | * to user space. |
diff --git a/include/uapi/drm/exynos_drm.h b/include/uapi/drm/exynos_drm.h index d5844122ff32..67a751c74a77 100644 --- a/include/uapi/drm/exynos_drm.h +++ b/include/uapi/drm/exynos_drm.h | |||
@@ -33,20 +33,6 @@ struct drm_exynos_gem_create { | |||
33 | }; | 33 | }; |
34 | 34 | ||
35 | /** | 35 | /** |
36 | * A structure for getting buffer offset. | ||
37 | * | ||
38 | * @handle: a pointer to gem object created. | ||
39 | * @pad: just padding to be 64-bit aligned. | ||
40 | * @offset: relatived offset value of the memory region allocated. | ||
41 | * - this value should be set by user. | ||
42 | */ | ||
43 | struct drm_exynos_gem_map_off { | ||
44 | unsigned int handle; | ||
45 | unsigned int pad; | ||
46 | uint64_t offset; | ||
47 | }; | ||
48 | |||
49 | /** | ||
50 | * A structure for mapping buffer. | 36 | * A structure for mapping buffer. |
51 | * | 37 | * |
52 | * @handle: a handle to gem object created. | 38 | * @handle: a handle to gem object created. |
@@ -316,7 +302,6 @@ struct drm_exynos_ipp_cmd_ctrl { | |||
316 | }; | 302 | }; |
317 | 303 | ||
318 | #define DRM_EXYNOS_GEM_CREATE 0x00 | 304 | #define DRM_EXYNOS_GEM_CREATE 0x00 |
319 | #define DRM_EXYNOS_GEM_MAP_OFFSET 0x01 | ||
320 | #define DRM_EXYNOS_GEM_MMAP 0x02 | 305 | #define DRM_EXYNOS_GEM_MMAP 0x02 |
321 | /* Reserved 0x03 ~ 0x05 for exynos specific gem ioctl */ | 306 | /* Reserved 0x03 ~ 0x05 for exynos specific gem ioctl */ |
322 | #define DRM_EXYNOS_GEM_GET 0x04 | 307 | #define DRM_EXYNOS_GEM_GET 0x04 |
@@ -336,9 +321,6 @@ struct drm_exynos_ipp_cmd_ctrl { | |||
336 | #define DRM_IOCTL_EXYNOS_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + \ | 321 | #define DRM_IOCTL_EXYNOS_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + \ |
337 | DRM_EXYNOS_GEM_CREATE, struct drm_exynos_gem_create) | 322 | DRM_EXYNOS_GEM_CREATE, struct drm_exynos_gem_create) |
338 | 323 | ||
339 | #define DRM_IOCTL_EXYNOS_GEM_MAP_OFFSET DRM_IOWR(DRM_COMMAND_BASE + \ | ||
340 | DRM_EXYNOS_GEM_MAP_OFFSET, struct drm_exynos_gem_map_off) | ||
341 | |||
342 | #define DRM_IOCTL_EXYNOS_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + \ | 324 | #define DRM_IOCTL_EXYNOS_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + \ |
343 | DRM_EXYNOS_GEM_MMAP, struct drm_exynos_gem_mmap) | 325 | DRM_EXYNOS_GEM_MMAP, struct drm_exynos_gem_mmap) |
344 | 326 | ||