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 /drivers/gpu/drm/udl | |
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 'drivers/gpu/drm/udl')
-rw-r--r-- | drivers/gpu/drm/udl/udl_drv.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/udl/udl_drv.h | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/udl/udl_gem.c | 7 |
3 files changed, 0 insertions, 9 deletions
diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c index 7650dc0d78ce..3ddd6cd98ac1 100644 --- a/drivers/gpu/drm/udl/udl_drv.c +++ b/drivers/gpu/drm/udl/udl_drv.c | |||
@@ -77,7 +77,6 @@ static struct drm_driver driver = { | |||
77 | .unload = udl_driver_unload, | 77 | .unload = udl_driver_unload, |
78 | 78 | ||
79 | /* gem hooks */ | 79 | /* gem hooks */ |
80 | .gem_init_object = udl_gem_init_object, | ||
81 | .gem_free_object = udl_gem_free_object, | 80 | .gem_free_object = udl_gem_free_object, |
82 | .gem_vm_ops = &udl_gem_vm_ops, | 81 | .gem_vm_ops = &udl_gem_vm_ops, |
83 | 82 | ||
diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h index 56aec9409fa3..1fbf7b357f16 100644 --- a/drivers/gpu/drm/udl/udl_drv.h +++ b/drivers/gpu/drm/udl/udl_drv.h | |||
@@ -115,7 +115,6 @@ int udl_dumb_create(struct drm_file *file_priv, | |||
115 | int udl_gem_mmap(struct drm_file *file_priv, struct drm_device *dev, | 115 | int udl_gem_mmap(struct drm_file *file_priv, struct drm_device *dev, |
116 | uint32_t handle, uint64_t *offset); | 116 | uint32_t handle, uint64_t *offset); |
117 | 117 | ||
118 | int udl_gem_init_object(struct drm_gem_object *obj); | ||
119 | void udl_gem_free_object(struct drm_gem_object *gem_obj); | 118 | void udl_gem_free_object(struct drm_gem_object *gem_obj); |
120 | struct udl_gem_object *udl_gem_alloc_object(struct drm_device *dev, | 119 | struct udl_gem_object *udl_gem_alloc_object(struct drm_device *dev, |
121 | size_t size); | 120 | size_t size); |
diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c index 8bf646183bac..24ffbe990736 100644 --- a/drivers/gpu/drm/udl/udl_gem.c +++ b/drivers/gpu/drm/udl/udl_gem.c | |||
@@ -107,13 +107,6 @@ int udl_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
107 | } | 107 | } |
108 | } | 108 | } |
109 | 109 | ||
110 | int udl_gem_init_object(struct drm_gem_object *obj) | ||
111 | { | ||
112 | BUG(); | ||
113 | |||
114 | return 0; | ||
115 | } | ||
116 | |||
117 | static int udl_gem_get_pages(struct udl_gem_object *obj, gfp_t gfpmask) | 110 | static int udl_gem_get_pages(struct udl_gem_object *obj, gfp_t gfpmask) |
118 | { | 111 | { |
119 | struct page **pages; | 112 | struct page **pages; |