diff options
author | David Herrmann <dh.herrmann@gmail.com> | 2013-10-02 04:15:18 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-10-09 00:38:02 -0400 |
commit | 16eb5f4379b2097438a224381be3b4d9e56ac979 (patch) | |
tree | cc7e55381cd8d80e62fb8eb24ae7fe9591385b32 /include/drm | |
parent | 55fb74adc628b99424360b0123f47ea4484c56fd (diff) |
drm: kill ->gem_init_object() and friends
All drivers embed gem-objects into their own buffer objects. There is no
reason to keep drm_gem_object_alloc(), gem->driver_private and
->gem_init_object() anymore.
New drivers are highly encouraged to do the same. There is no benefit in
allocating gem-objects separately.
Cc: Dave Airlie <airlied@gmail.com>
Cc: Alex Deucher <alexdeucher@gmail.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Jerome Glisse <jglisse@redhat.com>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Inki Dae <inki.dae@samsung.com>
Cc: Ben Skeggs <skeggsb@gmail.com>
Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/drmP.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index b46fb45f2cca..69dd5fd5b215 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
@@ -667,8 +667,6 @@ struct drm_gem_object { | |||
667 | uint32_t pending_read_domains; | 667 | uint32_t pending_read_domains; |
668 | uint32_t pending_write_domain; | 668 | uint32_t pending_write_domain; |
669 | 669 | ||
670 | void *driver_private; | ||
671 | |||
672 | /** | 670 | /** |
673 | * dma_buf - dma buf associated with this GEM object | 671 | * dma_buf - dma buf associated with this GEM object |
674 | * | 672 | * |
@@ -922,7 +920,6 @@ struct drm_driver { | |||
922 | * | 920 | * |
923 | * Returns 0 on success. | 921 | * Returns 0 on success. |
924 | */ | 922 | */ |
925 | int (*gem_init_object) (struct drm_gem_object *obj); | ||
926 | void (*gem_free_object) (struct drm_gem_object *obj); | 923 | void (*gem_free_object) (struct drm_gem_object *obj); |
927 | int (*gem_open_object) (struct drm_gem_object *, struct drm_file *); | 924 | int (*gem_open_object) (struct drm_gem_object *, struct drm_file *); |
928 | void (*gem_close_object) (struct drm_gem_object *, struct drm_file *); | 925 | void (*gem_close_object) (struct drm_gem_object *, struct drm_file *); |
@@ -1556,8 +1553,6 @@ int drm_gem_init(struct drm_device *dev); | |||
1556 | void drm_gem_destroy(struct drm_device *dev); | 1553 | void drm_gem_destroy(struct drm_device *dev); |
1557 | void drm_gem_object_release(struct drm_gem_object *obj); | 1554 | void drm_gem_object_release(struct drm_gem_object *obj); |
1558 | void drm_gem_object_free(struct kref *kref); | 1555 | void drm_gem_object_free(struct kref *kref); |
1559 | struct drm_gem_object *drm_gem_object_alloc(struct drm_device *dev, | ||
1560 | size_t size); | ||
1561 | int drm_gem_object_init(struct drm_device *dev, | 1556 | int drm_gem_object_init(struct drm_device *dev, |
1562 | struct drm_gem_object *obj, size_t size); | 1557 | struct drm_gem_object *obj, size_t size); |
1563 | void drm_gem_private_object_init(struct drm_device *dev, | 1558 | void drm_gem_private_object_init(struct drm_device *dev, |