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/gma500 | |
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/gma500')
-rw-r--r-- | drivers/gpu/drm/gma500/gem.c | 5 | ||||
-rw-r--r-- | drivers/gpu/drm/gma500/psb_drv.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/gma500/psb_drv.h | 1 |
3 files changed, 0 insertions, 7 deletions
diff --git a/drivers/gpu/drm/gma500/gem.c b/drivers/gpu/drm/gma500/gem.c index 10ae8c52d06f..e2db48a81ed0 100644 --- a/drivers/gpu/drm/gma500/gem.c +++ b/drivers/gpu/drm/gma500/gem.c | |||
@@ -29,11 +29,6 @@ | |||
29 | #include <drm/drm_vma_manager.h> | 29 | #include <drm/drm_vma_manager.h> |
30 | #include "psb_drv.h" | 30 | #include "psb_drv.h" |
31 | 31 | ||
32 | int psb_gem_init_object(struct drm_gem_object *obj) | ||
33 | { | ||
34 | return -EINVAL; | ||
35 | } | ||
36 | |||
37 | void psb_gem_free_object(struct drm_gem_object *obj) | 32 | void psb_gem_free_object(struct drm_gem_object *obj) |
38 | { | 33 | { |
39 | struct gtt_range *gtt = container_of(obj, struct gtt_range, gem); | 34 | struct gtt_range *gtt = container_of(obj, struct gtt_range, gem); |
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c index fcb4e9ff1f20..30dceb43690b 100644 --- a/drivers/gpu/drm/gma500/psb_drv.c +++ b/drivers/gpu/drm/gma500/psb_drv.c | |||
@@ -646,7 +646,6 @@ static struct drm_driver driver = { | |||
646 | .preclose = psb_driver_preclose, | 646 | .preclose = psb_driver_preclose, |
647 | .postclose = psb_driver_close, | 647 | .postclose = psb_driver_close, |
648 | 648 | ||
649 | .gem_init_object = psb_gem_init_object, | ||
650 | .gem_free_object = psb_gem_free_object, | 649 | .gem_free_object = psb_gem_free_object, |
651 | .gem_vm_ops = &psb_gem_vm_ops, | 650 | .gem_vm_ops = &psb_gem_vm_ops, |
652 | .dumb_create = psb_gem_dumb_create, | 651 | .dumb_create = psb_gem_dumb_create, |
diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h index 4535ac7708f8..6856bce58445 100644 --- a/drivers/gpu/drm/gma500/psb_drv.h +++ b/drivers/gpu/drm/gma500/psb_drv.h | |||
@@ -837,7 +837,6 @@ extern const struct drm_connector_helper_funcs | |||
837 | extern const struct drm_connector_funcs psb_intel_lvds_connector_funcs; | 837 | extern const struct drm_connector_funcs psb_intel_lvds_connector_funcs; |
838 | 838 | ||
839 | /* gem.c */ | 839 | /* gem.c */ |
840 | extern int psb_gem_init_object(struct drm_gem_object *obj); | ||
841 | extern void psb_gem_free_object(struct drm_gem_object *obj); | 840 | extern void psb_gem_free_object(struct drm_gem_object *obj); |
842 | extern int psb_gem_get_aperture(struct drm_device *dev, void *data, | 841 | extern int psb_gem_get_aperture(struct drm_device *dev, void *data, |
843 | struct drm_file *file); | 842 | struct drm_file *file); |