Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16eb5f43 authored by David Herrmann's avatar David Herrmann Committed by Dave Airlie
Browse files

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: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 55fb74ad

drivers/gpu/drm/ast/ast_drv.c

+0 −1
Original line number Diff line number Diff line
@@ -211,7 +211,6 @@ static struct drm_driver driver = { 
	.minor = DRIVER_MINOR,

	.patchlevel = DRIVER_PATCHLEVEL,



	.gem_init_object = ast_gem_init_object,

	.gem_free_object = ast_gem_free_object,

	.dumb_create = ast_dumb_create,

	.dumb_map_offset = ast_dumb_mmap_offset,

drivers/gpu/drm/ast/ast_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -323,7 +323,6 @@ extern int ast_dumb_create(struct drm_file *file, 
			   struct drm_device *dev,

			   struct drm_mode_create_dumb *args);



extern int ast_gem_init_object(struct drm_gem_object *obj);

extern void ast_gem_free_object(struct drm_gem_object *obj);

extern int ast_dumb_mmap_offset(struct drm_file *file,

				struct drm_device *dev,

drivers/gpu/drm/ast/ast_main.c

+0 −6
Original line number Diff line number Diff line
@@ -449,12 +449,6 @@ int ast_dumb_create(struct drm_file *file, 
	return 0;

}



int ast_gem_init_object(struct drm_gem_object *obj)

{

	BUG();

	return 0;

}



void ast_bo_unref(struct ast_bo **bo)

{

	struct ttm_buffer_object *tbo;

drivers/gpu/drm/cirrus/cirrus_drv.c

+0 −1
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ static struct drm_driver driver = { 
	.major = DRIVER_MAJOR,

	.minor = DRIVER_MINOR,

	.patchlevel = DRIVER_PATCHLEVEL,

	.gem_init_object = cirrus_gem_init_object,

	.gem_free_object = cirrus_gem_free_object,

	.dumb_create = cirrus_dumb_create,

	.dumb_map_offset = cirrus_dumb_mmap_offset,

drivers/gpu/drm/cirrus/cirrus_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -191,7 +191,6 @@ int cirrus_device_init(struct cirrus_device *cdev, 
		      struct pci_dev *pdev,

		      uint32_t flags);

void cirrus_device_fini(struct cirrus_device *cdev);

int cirrus_gem_init_object(struct drm_gem_object *obj);

void cirrus_gem_free_object(struct drm_gem_object *obj);

int cirrus_dumb_mmap_offset(struct drm_file *file,

			    struct drm_device *dev,