summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/drmP.h10
-rw-r--r--linux-core/drm_drv.c6
-rw-r--r--linux-core/drm_gem.c20
3 files changed, 18 insertions, 18 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index 11688cdd..419b4be3 100644
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -1394,18 +1394,18 @@ static inline void drm_gem_object_handle_unreference (struct drm_gem_object *obj
struct drm_gem_object *
drm_gem_object_lookup(struct drm_device *dev, struct drm_file *filp,
int handle);
-int drm_gem_alloc_ioctl(struct drm_device *dev, void *data,
+int drm_gem_create_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file_priv);
+int drm_gem_close_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
-int drm_gem_unreference_ioctl(struct drm_device *dev, void *data,
- struct drm_file *file_priv);
int drm_gem_pread_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
int drm_gem_pwrite_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
int drm_gem_mmap_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
-int drm_gem_name_ioctl(struct drm_device *dev, void *data,
- struct drm_file *file_priv);
+int drm_gem_flink_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file_priv);
int drm_gem_open_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
int drm_gem_set_domain_ioctl(struct drm_device *dev, void *data,
diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c
index 16c38dbe..edc1f057 100644
--- a/linux-core/drm_drv.c
+++ b/linux-core/drm_drv.c
@@ -151,12 +151,12 @@ static struct drm_ioctl_desc drm_ioctls[] = {
DRM_IOCTL_DEF(DRM_IOCTL_MM_INFO, drm_mm_info_ioctl, 0),
- DRM_IOCTL_DEF(DRM_IOCTL_GEM_ALLOC, drm_gem_alloc_ioctl, 0),
- DRM_IOCTL_DEF(DRM_IOCTL_GEM_UNREFERENCE, drm_gem_unreference_ioctl, 0),
+ DRM_IOCTL_DEF(DRM_IOCTL_GEM_CREATE, drm_gem_create_ioctl, 0),
+ DRM_IOCTL_DEF(DRM_IOCTL_GEM_CLOSE, drm_gem_close_ioctl, 0),
DRM_IOCTL_DEF(DRM_IOCTL_GEM_PREAD, drm_gem_pread_ioctl, 0),
DRM_IOCTL_DEF(DRM_IOCTL_GEM_PWRITE, drm_gem_pwrite_ioctl, 0),
DRM_IOCTL_DEF(DRM_IOCTL_GEM_MMAP, drm_gem_mmap_ioctl, 0),
- DRM_IOCTL_DEF(DRM_IOCTL_GEM_NAME, drm_gem_name_ioctl, DRM_AUTH),
+ DRM_IOCTL_DEF(DRM_IOCTL_GEM_FLINK, drm_gem_flink_ioctl, DRM_AUTH),
DRM_IOCTL_DEF(DRM_IOCTL_GEM_OPEN, drm_gem_open_ioctl, DRM_AUTH),
DRM_IOCTL_DEF(DRM_IOCTL_GEM_SET_DOMAIN, drm_gem_set_domain_ioctl, DRM_AUTH),
};
diff --git a/linux-core/drm_gem.c b/linux-core/drm_gem.c
index c85265ad..6c462921 100644
--- a/linux-core/drm_gem.c
+++ b/linux-core/drm_gem.c
@@ -204,13 +204,13 @@ drm_gem_object_lookup(struct drm_device *dev, struct drm_file *filp,
EXPORT_SYMBOL(drm_gem_object_lookup);
/**
- * Allocates a new mm object and returns a handle to it.
+ * Creates a new mm object and returns a handle to it.
*/
int
-drm_gem_alloc_ioctl(struct drm_device *dev, void *data,
- struct drm_file *file_priv)
+drm_gem_create_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file_priv)
{
- struct drm_gem_alloc *args = data;
+ struct drm_gem_create *args = data;
struct drm_gem_object *obj;
int handle, ret;
@@ -239,10 +239,10 @@ drm_gem_alloc_ioctl(struct drm_device *dev, void *data,
* Releases the handle to an mm object.
*/
int
-drm_gem_unreference_ioctl(struct drm_device *dev, void *data,
- struct drm_file *file_priv)
+drm_gem_close_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file_priv)
{
- struct drm_gem_unreference *args = data;
+ struct drm_gem_close *args = data;
int ret;
if (!(dev->driver->driver_features & DRIVER_GEM))
@@ -376,10 +376,10 @@ drm_gem_pwrite_ioctl(struct drm_device *dev, void *data,
* is freed, the name goes away.
*/
int
-drm_gem_name_ioctl(struct drm_device *dev, void *data,
- struct drm_file *file_priv)
+drm_gem_flink_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file_priv)
{
- struct drm_gem_name *args = data;
+ struct drm_gem_flink *args = data;
struct drm_gem_object *obj;
int ret;