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/drm_gem.c | |
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/drm_gem.c')
-rw-r--r-- | drivers/gpu/drm/drm_gem.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 49293bdc972a..4761adedad2a 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c | |||
@@ -160,35 +160,6 @@ void drm_gem_private_object_init(struct drm_device *dev, | |||
160 | } | 160 | } |
161 | EXPORT_SYMBOL(drm_gem_private_object_init); | 161 | EXPORT_SYMBOL(drm_gem_private_object_init); |
162 | 162 | ||
163 | /** | ||
164 | * Allocate a GEM object of the specified size with shmfs backing store | ||
165 | */ | ||
166 | struct drm_gem_object * | ||
167 | drm_gem_object_alloc(struct drm_device *dev, size_t size) | ||
168 | { | ||
169 | struct drm_gem_object *obj; | ||
170 | |||
171 | obj = kzalloc(sizeof(*obj), GFP_KERNEL); | ||
172 | if (!obj) | ||
173 | goto free; | ||
174 | |||
175 | if (drm_gem_object_init(dev, obj, size) != 0) | ||
176 | goto free; | ||
177 | |||
178 | if (dev->driver->gem_init_object != NULL && | ||
179 | dev->driver->gem_init_object(obj) != 0) { | ||
180 | goto fput; | ||
181 | } | ||
182 | return obj; | ||
183 | fput: | ||
184 | /* Object_init mangles the global counters - readjust them. */ | ||
185 | fput(obj->filp); | ||
186 | free: | ||
187 | kfree(obj); | ||
188 | return NULL; | ||
189 | } | ||
190 | EXPORT_SYMBOL(drm_gem_object_alloc); | ||
191 | |||
192 | static void | 163 | static void |
193 | drm_gem_remove_prime_handles(struct drm_gem_object *obj, struct drm_file *filp) | 164 | drm_gem_remove_prime_handles(struct drm_gem_object *obj, struct drm_file *filp) |
194 | { | 165 | { |