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/mgag200 | |
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/mgag200')
-rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_drv.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_drv.h | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_main.c | 6 |
3 files changed, 0 insertions, 8 deletions
diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c index fcce7b2f8011..f15ea3c4a90a 100644 --- a/drivers/gpu/drm/mgag200/mgag200_drv.c +++ b/drivers/gpu/drm/mgag200/mgag200_drv.c | |||
@@ -99,7 +99,6 @@ static struct drm_driver driver = { | |||
99 | .minor = DRIVER_MINOR, | 99 | .minor = DRIVER_MINOR, |
100 | .patchlevel = DRIVER_PATCHLEVEL, | 100 | .patchlevel = DRIVER_PATCHLEVEL, |
101 | 101 | ||
102 | .gem_init_object = mgag200_gem_init_object, | ||
103 | .gem_free_object = mgag200_gem_free_object, | 102 | .gem_free_object = mgag200_gem_free_object, |
104 | .dumb_create = mgag200_dumb_create, | 103 | .dumb_create = mgag200_dumb_create, |
105 | .dumb_map_offset = mgag200_dumb_mmap_offset, | 104 | .dumb_map_offset = mgag200_dumb_mmap_offset, |
diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.h b/drivers/gpu/drm/mgag200/mgag200_drv.h index baaae19332e2..cf11ee68a6d9 100644 --- a/drivers/gpu/drm/mgag200/mgag200_drv.h +++ b/drivers/gpu/drm/mgag200/mgag200_drv.h | |||
@@ -260,7 +260,6 @@ int mgag200_driver_unload(struct drm_device *dev); | |||
260 | int mgag200_gem_create(struct drm_device *dev, | 260 | int mgag200_gem_create(struct drm_device *dev, |
261 | u32 size, bool iskernel, | 261 | u32 size, bool iskernel, |
262 | struct drm_gem_object **obj); | 262 | struct drm_gem_object **obj); |
263 | int mgag200_gem_init_object(struct drm_gem_object *obj); | ||
264 | int mgag200_dumb_create(struct drm_file *file, | 263 | int mgag200_dumb_create(struct drm_file *file, |
265 | struct drm_device *dev, | 264 | struct drm_device *dev, |
266 | struct drm_mode_create_dumb *args); | 265 | struct drm_mode_create_dumb *args); |
diff --git a/drivers/gpu/drm/mgag200/mgag200_main.c b/drivers/gpu/drm/mgag200/mgag200_main.c index 0f8b861b10b3..b1120cb1db6d 100644 --- a/drivers/gpu/drm/mgag200/mgag200_main.c +++ b/drivers/gpu/drm/mgag200/mgag200_main.c | |||
@@ -310,12 +310,6 @@ int mgag200_dumb_create(struct drm_file *file, | |||
310 | return 0; | 310 | return 0; |
311 | } | 311 | } |
312 | 312 | ||
313 | int mgag200_gem_init_object(struct drm_gem_object *obj) | ||
314 | { | ||
315 | BUG(); | ||
316 | return 0; | ||
317 | } | ||
318 | |||
319 | void mgag200_bo_unref(struct mgag200_bo **bo) | 313 | void mgag200_bo_unref(struct mgag200_bo **bo) |
320 | { | 314 | { |
321 | struct ttm_buffer_object *tbo; | 315 | struct ttm_buffer_object *tbo; |