summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2008-05-09 12:18:09 -0700
committerKeith Packard <keithp@keithp.com>2008-05-09 12:18:09 -0700
commit1e26ca44c9f3e8a1a30652aa860b405e0248aae1 (patch)
treebdebd7fce23e6608c3a174195a58590cb27c5916
parentec75369b402235d74b06b08907572050962075a6 (diff)
[gem] API cleanup. allocate->create unreference->close name->flink
Make the API names a bit more consistent.
-rw-r--r--linux-core/drmP.h10
-rw-r--r--linux-core/drm_drv.c6
-rw-r--r--linux-core/drm_gem.c20
-rw-r--r--shared-core/drm.h14
4 files changed, 25 insertions, 25 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;
diff --git a/shared-core/drm.h b/shared-core/drm.h
index f1430f59..7b69a634 100644
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -961,7 +961,7 @@ struct drm_mm_info_arg {
};
-struct drm_gem_alloc {
+struct drm_gem_create {
/**
* Requested size for the object.
*
@@ -977,8 +977,8 @@ struct drm_gem_alloc {
uint32_t pad;
};
-struct drm_gem_unreference {
- /** Handle of the object to be unreferenced. */
+struct drm_gem_close {
+ /** Handle of the object to be closed. */
uint32_t handle;
uint32_t pad;
};
@@ -1023,7 +1023,7 @@ struct drm_gem_mmap {
uint64_t addr_ptr; /* void *, but pointers are not 32/64 compatible */
};
-struct drm_gem_name {
+struct drm_gem_flink {
/** Handle for the object being named */
uint32_t handle;
@@ -1123,12 +1123,12 @@ struct drm_gem_set_domain {
#define DRM_IOCTL_UPDATE_DRAW DRM_IOW(0x3f, struct drm_update_draw)
-#define DRM_IOCTL_GEM_ALLOC DRM_IOWR(0x09, struct drm_gem_alloc)
-#define DRM_IOCTL_GEM_UNREFERENCE DRM_IOW (0x0a, struct drm_gem_unreference)
+#define DRM_IOCTL_GEM_CREATE DRM_IOWR(0x09, struct drm_gem_create)
+#define DRM_IOCTL_GEM_CLOSE DRM_IOW (0x0a, struct drm_gem_close)
#define DRM_IOCTL_GEM_PREAD DRM_IOW (0x0b, struct drm_gem_pread)
#define DRM_IOCTL_GEM_PWRITE DRM_IOW (0x0c, struct drm_gem_pwrite)
#define DRM_IOCTL_GEM_MMAP DRM_IOWR(0x0d, struct drm_gem_mmap)
-#define DRM_IOCTL_GEM_NAME DRM_IOWR(0x0e, struct drm_gem_name)
+#define DRM_IOCTL_GEM_FLINK DRM_IOWR(0x0e, struct drm_gem_flink)
#define DRM_IOCTL_GEM_OPEN DRM_IOWR(0x0f, struct drm_gem_open)
#define DRM_IOCTL_GEM_SET_DOMAIN DRM_IOW (0xb7, struct drm_gem_set_domain)