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

Commit 43387b37 authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

drm/gem: create drm_gem_dumb_destroy 



All the gem based kms drivers really want the same function to
destroy a dumb framebuffer backing storage object.

So give it to them and roll it out in all drivers.

This still leaves the option open for kms drivers which don't use GEM
for backing storage, but it does decently simplify matters for gem
drivers.

Acked-by: default avatarInki Dae <inki.dae@samsung.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Cc: Ben Skeggs <skeggsb@gmail.com>
Reviwed-by: default avatarRob Clark <robdclark@gmail.com>
Cc: Alex Deucher <alexdeucher@gmail.com>
Acked-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 86e81f0e

drivers/gpu/drm/ast/ast_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ static struct drm_driver driver = { 
	.gem_free_object = ast_gem_free_object,

	.dumb_create = ast_dumb_create,

	.dumb_map_offset = ast_dumb_mmap_offset,

	.dumb_destroy = ast_dumb_destroy,

	.dumb_destroy = drm_gem_dumb_destroy,



};

drivers/gpu/drm/ast/ast_drv.h

+0 −3
Original line number Diff line number Diff line
@@ -322,9 +322,6 @@ ast_bo(struct ttm_buffer_object *bo) 
extern int ast_dumb_create(struct drm_file *file,

			   struct drm_device *dev,

			   struct drm_mode_create_dumb *args);

extern int ast_dumb_destroy(struct drm_file *file,

			    struct drm_device *dev,

			    uint32_t handle);



extern int ast_gem_init_object(struct drm_gem_object *obj);

extern void ast_gem_free_object(struct drm_gem_object *obj);

drivers/gpu/drm/ast/ast_main.c

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

}



int ast_dumb_destroy(struct drm_file *file,

		     struct drm_device *dev,

		     uint32_t handle)

{

	return drm_gem_handle_delete(file, handle);

}



int ast_gem_init_object(struct drm_gem_object *obj)

{

	BUG();

drivers/gpu/drm/cirrus/cirrus_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static struct drm_driver driver = { 
	.gem_free_object = cirrus_gem_free_object,

	.dumb_create = cirrus_dumb_create,

	.dumb_map_offset = cirrus_dumb_mmap_offset,

	.dumb_destroy = cirrus_dumb_destroy,

	.dumb_destroy = drm_gem_dumb_destroy,

};



static struct pci_driver cirrus_pci_driver = {

drivers/gpu/drm/cirrus/cirrus_drv.h

+0 −3
Original line number Diff line number Diff line
@@ -203,9 +203,6 @@ int cirrus_gem_create(struct drm_device *dev, 
int cirrus_dumb_create(struct drm_file *file,

		    struct drm_device *dev,

		       struct drm_mode_create_dumb *args);

int cirrus_dumb_destroy(struct drm_file *file,

		     struct drm_device *dev,

			uint32_t handle);



int cirrus_framebuffer_init(struct drm_device *dev,

			   struct cirrus_framebuffer *gfb,