drm/nouveau: embed gem object in nouveau_bo
Subsystems (13)
PATCH v2 1/2 drm/nouveau: embed gem object in nouveau_bo
There is no reason to keep the gem object separately allocated. nouveau is the last user of gem_obj->driver_private, so if we embed it, we can get rid of 8bytes per gem-object.
The implementation follows the radeon driver. bo->gem is only valid, iff the bo was created via the gem helpers _and_ iff the user holds a valid gem reference. That is, as the gem object holds a reference to the nouveau_bo. If you use nouveau_ref() to gain a bo reference, you are not guaranteed to also hold a gem reference. The gem object might get destroyed after the last user drops the gem-ref via drm_gem_object_unreference(). Use drm_gem_object_reference() to gain a gem-reference.
For debugging, we can use bo->gem.filp != NULL to test whether a gem-bo is valid. However, this shouldn't be used for real functionality to avoid gem-internal dependencies.
Note that the implementation follows the previous style. However, we no longer can check for bo->gem != NULL to test for a valid gem object. This wasn't done before, so we should be safe now.
--- drivers/gpu/drm/nouveau/nouveau_abi16.c | 4 ++-- drivers/gpu/drm/nouveau/nouveau_bo.c | 4 ++-- drivers/gpu/drm/nouveau/nouveau_bo.h | 5 ++++- drivers/gpu/drm/nouveau/nouveau_display.c | 10 ++++----- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 36 +++++++++++++++---------------- drivers/gpu/drm/nouveau/nouveau_gem.h | 2 +- drivers/gpu/drm/nouveau/nouveau_prime.c | 10 +++++---- 8 files changed, 38 insertions(+), 35 deletions(-)
drivers/gpu/drm/nouveau/nouveau_abi16.c +2 -2
@@ -130,7 +130,7 @@ nouveau_abi16_chan_fini(struct nouveau_abi16 *abi16,if (chan->ntfy) {nouveau_bo_vma_del (chan->ntfy, &chan->ntfy_vma);nouveau_bo_unpin (chan->ntfy); -drm_gem_object_unreference_unlocked (chan->ntfy->gem); +drm_gem_object_unreference_unlocked (&chan->ntfy->gem); }if (chan->heap.block_size)
@@ -320,7 +320,7 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS) goto done; } - ret =drm_gem_handle_create (file_priv, chan->ntfy->gem, + ret =drm_gem_handle_create (file_priv, &chan->ntfy->gem, &init->notifier_handle);if (ret) goto done;
drivers/gpu/drm/nouveau/nouveau_bo.c +2 -2
@@ -146,7 +146,7 @@ nouveau_bo_del_ttm(struct ttm_buffer_object *bo)struct drm_device *dev = drm->dev;struct nouveau_bo *nvbo =nouveau_bo (bo); -if (unlikely (nvbo->gem)) +if (unlikely (nvbo->gem.filp))DRM_ERROR ("bo %p still attached to GEM object\n" , bo);WARN_ON (nvbo->pin_refcnt >0 );nv10_bo_put_tile_region (dev, nvbo->tile,NULL );
@@ -1267,7 +1267,7 @@ nouveau_bo_verify_access(struct ttm_buffer_object *bo, struct file *filp) {struct nouveau_bo *nvbo =nouveau_bo (bo); -return drm_vma_node_verify_access (&nvbo->gem->vma_node, filp); +return drm_vma_node_verify_access (&nvbo->gem.vma_node, filp); } static int
drivers/gpu/drm/nouveau/nouveau_bo.h +4 -1
@@ -27,7 +27,10 @@ struct nouveau_bo {u32 tile_flags;struct nouveau_drm_tile *tile; -struct drm_gem_object *gem; +/* Only valid if allocated via nouveau_gem_new() and iff you hold a +* gem reference to it! For debugging, use gem.filp != NULL to test +* whether it is valid. */ +struct drm_gem_object gem;/* protect by the ttm reservation lock */ int pin_refcnt;
drivers/gpu/drm/nouveau/nouveau_display.c +5 -5
@@ -50,7 +50,7 @@ nouveau_user_framebuffer_destroy(struct drm_framebuffer *drm_fb)struct nouveau_framebuffer *fb =nouveau_framebuffer (drm_fb);if (fb->nvbo) -drm_gem_object_unreference_unlocked (fb->nvbo->gem); +drm_gem_object_unreference_unlocked (&fb->nvbo->gem);drm_framebuffer_cleanup (drm_fb);kfree (fb);
@@ -63,7 +63,7 @@ nouveau_user_framebuffer_create_handle(struct drm_framebuffer *drm_fb, {struct nouveau_framebuffer *fb =nouveau_framebuffer (drm_fb); -return drm_gem_handle_create (file_priv, fb->nvbo->gem, handle); +return drm_gem_handle_create (file_priv, &fb->nvbo->gem, handle); }static const struct drm_framebuffer_funcs nouveau_framebuffer_funcs = {
@@ -674,8 +674,8 @@ nouveau_display_dumb_create(struct drm_file *file_priv, struct drm_device *dev,if (ret)return ret; - ret =drm_gem_handle_create (file_priv, bo->gem, &args->handle); -drm_gem_object_unreference_unlocked (bo->gem); + ret =drm_gem_handle_create (file_priv, &bo->gem, &args->handle); +drm_gem_object_unreference_unlocked (&bo->gem);return ret; }
@@ -688,7 +688,7 @@ nouveau_display_dumb_map_offset(struct drm_file *file_priv, gem =drm_gem_object_lookup (dev, file_priv, handle);if (gem) { -struct nouveau_bo *bo = gem->driver_private; +struct nouveau_bo *bo =nouveau_gem_object (gem); *poffset =drm_vma_node_offset_addr (&bo->bo.vma_node);drm_gem_object_unreference_unlocked (gem);return 0 ;
drivers/gpu/drm/nouveau/nouveau_fbcon.c +1 -1
@@ -420,7 +420,7 @@ nouveau_fbcon_destroy(struct drm_device *dev, struct nouveau_fbdev *fbcon)nouveau_bo_unmap (nouveau_fb->nvbo);nouveau_bo_vma_del (nouveau_fb->nvbo, &nouveau_fb->vma);nouveau_bo_unpin (nouveau_fb->nvbo); -drm_gem_object_unreference_unlocked (nouveau_fb->nvbo->gem); +drm_gem_object_unreference_unlocked (&nouveau_fb->nvbo->gem); nouveau_fb->nvbo =NULL ; }drm_fb_helper_fini (&fbcon->helper);
drivers/gpu/drm/nouveau/nouveau_gem.c +17 -19
@@ -43,20 +43,17 @@ nouveau_gem_object_new(struct drm_gem_object *gem)void nouveau_gem_object_del (struct drm_gem_object *gem) { -struct nouveau_bo *nvbo = gem->driver_private; +struct nouveau_bo *nvbo =nouveau_gem_object (gem);struct ttm_buffer_object *bo = &nvbo->bo; -if (!nvbo) -return ; - nvbo->gem =NULL ; -if (gem->import_attach)drm_prime_gem_destroy (gem, nvbo->bo.sg); -ttm_bo_unref (&bo); -drm_gem_object_release (gem); -kfree (gem); + +/* reset filp so nouveau_bo_del_ttm() can test for it */ + gem->filp =NULL ; +ttm_bo_unref (&bo); }int
@@ -186,14 +183,15 @@ nouveau_gem_new(struct drm_device *dev, int size, int align, uint32_t domain,if (nv_device (drm->device)->card_type >=NV_50 ) nvbo->valid_domains &= domain; - nvbo->gem =drm_gem_object_alloc (dev, nvbo->bo.mem.size); -if (!nvbo->gem) { +/* Initialize the embedded gem-object. We return a single gem-reference +* to the caller, instead of a normal nouveau_bo ttm reference. */ + ret =drm_gem_object_init (dev, &nvbo->gem, nvbo->bo.mem.size); +if (ret) {nouveau_bo_ref (NULL , pnvbo);return -ENOMEM ; } - nvbo->bo.persistent_swap_storage = nvbo->gem->filp; - nvbo->gem->driver_private = nvbo; + nvbo->bo.persistent_swap_storage = nvbo->gem.filp;return 0 ; }
@@ -250,15 +248,15 @@ nouveau_gem_ioctl_new(struct drm_device *dev, void *data,if (ret)return ret; - ret =drm_gem_handle_create (file_priv, nvbo->gem, &req->info.handle); + ret =drm_gem_handle_create (file_priv, &nvbo->gem, &req->info.handle);if (ret ==0 ) { - ret =nouveau_gem_info (file_priv, nvbo->gem, &req->info); + ret =nouveau_gem_info (file_priv, &nvbo->gem, &req->info);if (ret)drm_gem_handle_delete (file_priv, req->info.handle); }/* drop reference from allocate - handle holds it now */ -drm_gem_object_unreference_unlocked (nvbo->gem); +drm_gem_object_unreference_unlocked (&nvbo->gem);return ret; }
@@ -266,7 +264,7 @@ static int nouveau_gem_set_domain(struct drm_gem_object *gem, uint32_t read_domains, uint32_t write_domains, uint32_t valid_domains) { - struct nouveau_bo *nvbo = gem->driver_private; + struct nouveau_bo *nvbo = nouveau_gem_object(gem);struct ttm_buffer_object *bo = &nvbo->bo;uint32_t domains = valid_domains & nvbo->valid_domains & (write_domains ? write_domains : read_domains);
@@ -327,7 +325,7 @@ validate_fini_list(struct list_head *list, struct nouveau_fence *fence,list_del (&nvbo->entry); nvbo->reserved_by =NULL ;ttm_bo_unreserve_ticket (&nvbo->bo, ticket); -drm_gem_object_unreference_unlocked (nvbo->gem); +drm_gem_object_unreference_unlocked (&nvbo->gem); } }
@@ -376,7 +374,7 @@ retry:validate_fini (op,NULL );return -ENOENT ; } - nvbo = gem->driver_private; + nvbo =nouveau_gem_object (gem);if (nvbo == res_bo) { res_bo =NULL ;drm_gem_object_unreference_unlocked (gem);
@@ -478,7 +476,7 @@ validate_list(struct nouveau_channel *chan, struct nouveau_cli *cli,return ret; } - ret =nouveau_gem_set_domain (nvbo->gem, b->read_domains, + ret =nouveau_gem_set_domain (&nvbo->gem, b->read_domains, b->write_domains, b->valid_domains);if (unlikely (ret)) {
drivers/gpu/drm/nouveau/nouveau_gem.h +1 -1
@@ -12,7 +12,7 @@static inline struct nouveau_bo *nouveau_gem_object (struct drm_gem_object *gem) { -return gem ? gem->driver_private :NULL ; + return gem ? container_of(gem, struct nouveau_bo, gem) : NULL; }/* nouveau_gem.c */
drivers/gpu/drm/nouveau/nouveau_prime.c +6 -4
@@ -71,14 +71,16 @@ struct drm_gem_object *nouveau_gem_prime_import_sg_table(struct drm_device *dev,return ERR_PTR (ret); nvbo->valid_domains =NOUVEAU_GEM_DOMAIN_GART ; - nvbo->gem =drm_gem_object_alloc (dev, nvbo->bo.mem.size); -if (!nvbo->gem) { + +/* Initialize the embedded gem-object. We return a single gem-reference +* to the caller, instead of a normal nouveau_bo ttm reference. */ + ret =drm_gem_object_init (dev, &nvbo->gem, nvbo->bo.mem.size); +if (ret) {nouveau_bo_ref (NULL , &nvbo);return ERR_PTR (-ENOMEM ); } - nvbo->gem->driver_private = nvbo; -return nvbo->gem; +return &nvbo->gem; }int nouveau_gem_prime_pin (struct drm_gem_object *obj)
Signature · 1 line
1.8.4
PATCH v2 2/2 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.
--- drivers/gpu/drm/ast/ast_drv.c | 1 - drivers/gpu/drm/ast/ast_drv.h | 1 - drivers/gpu/drm/ast/ast_main.c | 6 ------ drivers/gpu/drm/cirrus/cirrus_drv.c | 1 - drivers/gpu/drm/cirrus/cirrus_drv.h | 1 - drivers/gpu/drm/cirrus/cirrus_main.c | 6 ------ drivers/gpu/drm/drm_gem.c | 29 ----------------------------- drivers/gpu/drm/exynos/exynos_drm_drv.c | 1 - drivers/gpu/drm/exynos/exynos_drm_gem.c | 5 ----- drivers/gpu/drm/exynos/exynos_drm_gem.h | 3 --- drivers/gpu/drm/gma500/gem.c | 5 ----- drivers/gpu/drm/gma500/psb_drv.c | 1 - drivers/gpu/drm/gma500/psb_drv.h | 1 - drivers/gpu/drm/i915/i915_drv.c | 1 - drivers/gpu/drm/i915/i915_drv.h | 1 - drivers/gpu/drm/i915/i915_gem.c | 7 ------- drivers/gpu/drm/mgag200/mgag200_drv.c | 1 - drivers/gpu/drm/mgag200/mgag200_drv.h | 1 - drivers/gpu/drm/mgag200/mgag200_main.c | 6 ------ drivers/gpu/drm/nouveau/nouveau_drm.c | 1 - drivers/gpu/drm/nouveau/nouveau_gem.c | 6 ------ drivers/gpu/drm/nouveau/nouveau_gem.h | 1 - drivers/gpu/drm/omapdrm/omap_drv.c | 1 - drivers/gpu/drm/omapdrm/omap_drv.h | 1 - drivers/gpu/drm/omapdrm/omap_gem.c | 5 ----- drivers/gpu/drm/qxl/qxl_drv.c | 1 - drivers/gpu/drm/qxl/qxl_drv.h | 1 - drivers/gpu/drm/qxl/qxl_gem.c | 6 ------ drivers/gpu/drm/radeon/radeon_drv.c | 2 -- drivers/gpu/drm/radeon/radeon_gem.c | 7 ------- drivers/gpu/drm/udl/udl_drv.c | 1 - drivers/gpu/drm/udl/udl_drv.h | 1 - drivers/gpu/drm/udl/udl_gem.c | 7 ------- include/drm/drmP.h | 5 ----- 34 files changed, 124 deletions(-)
drivers/gpu/drm/ast/ast_drv.c +0 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,
drivers/gpu/drm/cirrus/cirrus_main.c +0 -6
@@ -255,12 +255,6 @@ int cirrus_dumb_create(struct drm_file *file,return 0 ; } -int cirrus_gem_init_object (struct drm_gem_object *obj) -{ -BUG (); -return 0 ; -} -void cirrus_bo_unref (struct cirrus_bo **bo) {struct ttm_buffer_object *tbo;
drivers/gpu/drm/drm_gem.c +0 -29
@@ -160,35 +160,6 @@ void drm_gem_private_object_init(struct drm_device *dev, }EXPORT_SYMBOL (drm_gem_private_object_init); -/** -* Allocate a GEM object of the specified size with shmfs backing store -*/ -struct drm_gem_object * -drm_gem_object_alloc (struct drm_device *dev,size_t size) -{ -struct drm_gem_object *obj; - - obj =kzalloc (sizeof (*obj),GFP_KERNEL ); -if (!obj) - goto free; - -if (drm_gem_object_init (dev, obj, size) !=0 ) - goto free; - -if (dev->driver->gem_init_object !=NULL && - dev->driver->gem_init_object (obj) !=0 ) { - goto fput; - } -return obj; -fput: -/* Object_init mangles the global counters - readjust them. */ -fput (obj->filp); -free: -kfree (obj); -return NULL ; -} -EXPORT_SYMBOL (drm_gem_object_alloc); -static void drm_gem_remove_prime_handles (struct drm_gem_object *obj,struct drm_file *filp) {
drivers/gpu/drm/exynos/exynos_drm_drv.c +0 -1
@@ -264,7 +264,6 @@ static struct drm_driver exynos_drm_driver = { .get_vblank_counter = drm_vblank_count, .enable_vblank = exynos_drm_crtc_enable_vblank, .disable_vblank = exynos_drm_crtc_disable_vblank, - .gem_init_object = exynos_drm_gem_init_object, .gem_free_object = exynos_drm_gem_free_object, .gem_vm_ops = &exynos_drm_gem_vm_ops, .dumb_create = exynos_drm_gem_dumb_create,
drivers/gpu/drm/exynos/exynos_drm_gem.c +0 -5
@@ -630,11 +630,6 @@ void exynos_gem_unmap_sgt_from_dma(struct drm_device *drm_dev,dma_unmap_sg (drm_dev->dev, sgt->sgl, sgt->nents, dir); } -int exynos_drm_gem_init_object (struct drm_gem_object *obj) -{ -return 0 ; -} -void exynos_drm_gem_free_object (struct drm_gem_object *obj) {struct exynos_drm_gem_obj *exynos_gem_obj;
drivers/gpu/drm/exynos/exynos_drm_gem.h +0 -3
@@ -135,9 +135,6 @@ unsigned long exynos_drm_gem_get_size(struct drm_device *dev,unsigned int gem_handle, struct drm_file *file_priv); -/* initialize gem object. */ -int exynos_drm_gem_init_object (struct drm_gem_object *obj); -/* free gem object. */ void exynos_drm_gem_free_object (struct drm_gem_object *gem_obj);
drivers/gpu/drm/gma500/gem.c +0 -5
@@ -29,11 +29,6 @@#include <drm/drm_vma_manager.h> #include "psb_drv.h" -int psb_gem_init_object (struct drm_gem_object *obj) -{ -return -EINVAL ; -} -void psb_gem_free_object (struct drm_gem_object *obj) { struct gtt_range *gtt = container_of(obj, struct gtt_range, gem);
drivers/gpu/drm/gma500/psb_drv.c +0 -1
@@ -646,7 +646,6 @@ static struct drm_driver driver = { .preclose = psb_driver_preclose, .postclose = psb_driver_close, - .gem_init_object = psb_gem_init_object, .gem_free_object = psb_gem_free_object, .gem_vm_ops = &psb_gem_vm_ops, .dumb_create = psb_gem_dumb_create,
drivers/gpu/drm/gma500/psb_drv.h +0 -1
@@ -837,7 +837,6 @@ extern const struct drm_connector_helper_funcsextern const struct drm_connector_funcs psb_intel_lvds_connector_funcs;/* gem.c */ -extern int psb_gem_init_object (struct drm_gem_object *obj);extern void psb_gem_free_object (struct drm_gem_object *obj);extern int psb_gem_get_aperture (struct drm_device *dev,void *data,struct drm_file *file);
drivers/gpu/drm/i915/i915_drv.c +0 -1
@@ -938,7 +938,6 @@ static struct drm_driver driver = { .debugfs_init = i915_debugfs_init, .debugfs_cleanup = i915_debugfs_cleanup, #endif - .gem_init_object = i915_gem_init_object, .gem_free_object = i915_gem_free_object, .gem_vm_ops = &i915_gem_vm_ops,
drivers/gpu/drm/i915/i915_drv.h +0 -1
@@ -1848,7 +1848,6 @@ int i915_gem_wait_ioctl(struct drm_device *dev, void *data,void i915_gem_load (struct drm_device *dev);void *i915_gem_object_alloc (struct drm_device *dev);void i915_gem_object_free (struct drm_i915_gem_object *obj); -int i915_gem_init_object (struct drm_gem_object *obj);void i915_gem_object_init (struct drm_i915_gem_object *obj,const struct drm_i915_gem_object_ops *ops); struct drm_i915_gem_object *i915_gem_alloc_object(struct drm_device *dev,
drivers/gpu/drm/i915/i915_gem.c +0 -7
@@ -4107,13 +4107,6 @@ struct drm_i915_gem_object *i915_gem_alloc_object(struct drm_device *dev,return obj; } -int i915_gem_init_object (struct drm_gem_object *obj) -{ -BUG (); - -return 0 ; -} -void i915_gem_free_object (struct drm_gem_object *gem_obj) {struct drm_i915_gem_object *obj =to_intel_bo (gem_obj);
drivers/gpu/drm/mgag200/mgag200_drv.c +0 -1
@@ -99,7 +99,6 @@ static struct drm_driver driver = { .minor = DRIVER_MINOR, .patchlevel = DRIVER_PATCHLEVEL, - .gem_init_object = mgag200_gem_init_object, .gem_free_object = mgag200_gem_free_object, .dumb_create = mgag200_dumb_create, .dumb_map_offset = mgag200_dumb_mmap_offset,
drivers/gpu/drm/mgag200/mgag200_drv.h +0 -1
@@ -260,7 +260,6 @@ int mgag200_driver_unload(struct drm_device *dev);int mgag200_gem_create (struct drm_device *dev,u32 size,bool iskernel,struct drm_gem_object **obj); -int mgag200_gem_init_object (struct drm_gem_object *obj);int mgag200_dumb_create (struct drm_file *file,struct drm_device *dev,struct drm_mode_create_dumb *args);
drivers/gpu/drm/mgag200/mgag200_main.c +0 -6
@@ -310,12 +310,6 @@ int mgag200_dumb_create(struct drm_file *file,return 0 ; } -int mgag200_gem_init_object (struct drm_gem_object *obj) -{ -BUG (); -return 0 ; -} -void mgag200_bo_unref (struct mgag200_bo **bo) {struct ttm_buffer_object *tbo;
drivers/gpu/drm/nouveau/nouveau_drm.c +0 -1
@@ -834,7 +834,6 @@ driver = { .gem_prime_vmap = nouveau_gem_prime_vmap, .gem_prime_vunmap = nouveau_gem_prime_vunmap, - .gem_init_object = nouveau_gem_object_new, .gem_free_object = nouveau_gem_object_del, .gem_open_object = nouveau_gem_object_open, .gem_close_object = nouveau_gem_object_close,
drivers/gpu/drm/nouveau/nouveau_gem.c +0 -6
@@ -34,12 +34,6 @@#include "nouveau_ttm.h" #include "nouveau_gem.h" -int -nouveau_gem_object_new (struct drm_gem_object *gem) -{ -return 0 ; -} -void nouveau_gem_object_del (struct drm_gem_object *gem) {
drivers/gpu/drm/nouveau/nouveau_gem.h +0 -1
@@ -19,7 +19,6 @@ nouveau_gem_object(struct drm_gem_object *gem)extern int nouveau_gem_new (struct drm_device *,int size,int align,uint32_t domain,uint32_t tile_mode,uint32_t tile_flags,struct nouveau_bo **); -extern int nouveau_gem_object_new (struct drm_gem_object *);extern void nouveau_gem_object_del (struct drm_gem_object *);extern int nouveau_gem_object_open (struct drm_gem_object *,struct drm_file *); extern void nouveau_gem_object_close(struct drm_gem_object *,
drivers/gpu/drm/omapdrm/omap_drv.c +0 -1
@@ -620,7 +620,6 @@ static struct drm_driver omap_drm_driver = { .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_export = omap_gem_prime_export, .gem_prime_import = omap_gem_prime_import, - .gem_init_object = omap_gem_init_object, .gem_free_object = omap_gem_free_object, .gem_vm_ops = &omap_gem_vm_ops, .dumb_create = omap_gem_dumb_create,
drivers/gpu/drm/omapdrm/omap_drv.h +0 -1
@@ -220,7 +220,6 @@ struct drm_gem_object *omap_gem_new(struct drm_device *dev,int omap_gem_new_handle (struct drm_device *dev,struct drm_file *file,union omap_gem_size gsize,uint32_t flags,uint32_t *handle);void omap_gem_free_object (struct drm_gem_object *obj); -int omap_gem_init_object (struct drm_gem_object *obj);void *omap_gem_vaddr (struct drm_gem_object *obj);int omap_gem_dumb_map_offset (struct drm_file *file,struct drm_device *dev,uint32_t handle,uint64_t *offset);
drivers/gpu/drm/omapdrm/omap_gem.c +0 -5
@@ -1274,11 +1274,6 @@ unlock:return ret; } -int omap_gem_init_object (struct drm_gem_object *obj) -{ -return -EINVAL ;/* unused */ -} -/* don't call directly.. called from GEM core when it is time to actually * free the object.. */
drivers/gpu/drm/qxl/qxl_drv.c +0 -1
@@ -225,7 +225,6 @@ static struct drm_driver qxl_driver = { .debugfs_init = qxl_debugfs_init, .debugfs_cleanup = qxl_debugfs_takedown, #endif - .gem_init_object = qxl_gem_object_init, .gem_free_object = qxl_gem_object_free, .gem_open_object = qxl_gem_object_open, .gem_close_object = qxl_gem_object_close,
drivers/gpu/drm/qxl/qxl_drv.h +0 -1
@@ -412,7 +412,6 @@ int qxl_gem_object_create_with_handle(struct qxl_device *qdev,struct qxl_surface *surf, struct qxl_bo **qobj, uint32_t *handle); -int qxl_gem_object_init (struct drm_gem_object *obj);void qxl_gem_object_free (struct drm_gem_object *gobj);int qxl_gem_object_open (struct drm_gem_object *obj,struct drm_file *file_priv); void qxl_gem_object_close(struct drm_gem_object *obj,
drivers/gpu/drm/qxl/qxl_gem.c +0 -6
@@ -28,12 +28,6 @@#include "qxl_drv.h" #include "qxl_object.h" -int qxl_gem_object_init (struct drm_gem_object *obj) -{ -/* we do nothings here */ -return 0 ; -} -void qxl_gem_object_free (struct drm_gem_object *gobj) {struct qxl_bo *qobj =gem_to_qxl_bo (gobj);
drivers/gpu/drm/radeon/radeon_drv.c +0 -2
@@ -100,7 +100,6 @@ void radeon_driver_irq_preinstall_kms(struct drm_device *dev);int radeon_driver_irq_postinstall_kms (struct drm_device *dev);void radeon_driver_irq_uninstall_kms (struct drm_device *dev);irqreturn_t radeon_driver_irq_handler_kms (DRM_IRQ_ARGS ); -int radeon_gem_object_init (struct drm_gem_object *obj);void radeon_gem_object_free (struct drm_gem_object *obj);int radeon_gem_object_open (struct drm_gem_object *obj,struct drm_file *file_priv);
@@ -408,7 +407,6 @@ static struct drm_driver kms_driver = { .irq_uninstall = radeon_driver_irq_uninstall_kms, .irq_handler = radeon_driver_irq_handler_kms, .ioctls = radeon_ioctls_kms, - .gem_init_object = radeon_gem_object_init, .gem_free_object = radeon_gem_object_free, .gem_open_object = radeon_gem_object_open, .gem_close_object = radeon_gem_object_close,
drivers/gpu/drm/radeon/radeon_gem.c +0 -7
@@ -29,13 +29,6 @@#include <drm/radeon_drm.h> #include "radeon.h" -int radeon_gem_object_init (struct drm_gem_object *obj) -{ -BUG (); - -return 0 ; -} -void radeon_gem_object_free (struct drm_gem_object *gobj) {struct radeon_bo *robj =gem_to_radeon_bo (gobj);
drivers/gpu/drm/udl/udl_drv.c +0 -1
@@ -77,7 +77,6 @@ static struct drm_driver driver = { .unload = udl_driver_unload,/* gem hooks */ - .gem_init_object = udl_gem_init_object, .gem_free_object = udl_gem_free_object, .gem_vm_ops = &udl_gem_vm_ops,
drivers/gpu/drm/udl/udl_drv.h +0 -1
@@ -115,7 +115,6 @@ int udl_dumb_create(struct drm_file *file_priv,int udl_gem_mmap (struct drm_file *file_priv,struct drm_device *dev,uint32_t handle,uint64_t *offset); -int udl_gem_init_object (struct drm_gem_object *obj);void udl_gem_free_object (struct drm_gem_object *gem_obj);struct udl_gem_object *udl_gem_alloc_object (struct drm_device *dev,size_t size);
drivers/gpu/drm/udl/udl_gem.c +0 -7
@@ -107,13 +107,6 @@ int udl_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf) } } -int udl_gem_init_object (struct drm_gem_object *obj) -{ -BUG (); - -return 0 ; -} -static int udl_gem_get_pages (struct udl_gem_object *obj,gfp_t gfpmask) {struct page **pages;
include/drm/drmP.h +0 -5
@@ -667,8 +667,6 @@ struct drm_gem_object {uint32_t pending_read_domains;uint32_t pending_write_domain; -void *driver_private; -/** * dma_buf - dma buf associated with this GEM object *
@@ -922,7 +920,6 @@ struct drm_driver {* * Returns 0 on success. */ -int (*gem_init_object) (struct drm_gem_object *obj);void (*gem_free_object) (struct drm_gem_object *obj);int (*gem_open_object) (struct drm_gem_object *,struct drm_file *);void (*gem_close_object) (struct drm_gem_object *,struct drm_file *);
@@ -1556,8 +1553,6 @@ int drm_gem_init(struct drm_device *dev);void drm_gem_destroy (struct drm_device *dev);void drm_gem_object_release (struct drm_gem_object *obj);void drm_gem_object_free (struct kref *kref); -struct drm_gem_object *drm_gem_object_alloc (struct drm_device *dev, -size_t size);int drm_gem_object_init (struct drm_device *dev,struct drm_gem_object *obj,size_t size); void drm_gem_private_object_init(struct drm_device *dev,
Signature · 1 line
1.8.4
Re: [PATCH v2 2/2] drm: kill ->gem_init_object() and friends
Quoted 7 lines · David Herrmann
All drivers embed gem-objects into their own buffer objects. There is no reason to keep
drm_gem_object_alloc(),gem->driver_privateand ->gem_init_object() anymore.New drivers are highly encouraged to do the same. There is no benefit in allocating gem-objects separately.
Quoted 9 lines
Cc Dave Airlie <[email protected]>Cc Alex Deucher <[email protected]>Cc Daniel Vetter <[email protected]>Cc Jerome Glisse <[email protected]>Cc Rob Clark <[email protected]>Cc Inki Dae <[email protected]>Cc Ben Skeggs <[email protected]>Cc Patrik Jakobsson <[email protected]>Signed-off-by David Herrmann <[email protected]>
Quoted 559 lines
--- drivers/gpu/drm/ast/ast_drv.c | 1 - drivers/gpu/drm/ast/ast_drv.h | 1 - drivers/gpu/drm/ast/ast_main.c | 6 ------ drivers/gpu/drm/cirrus/cirrus_drv.c | 1 - drivers/gpu/drm/cirrus/cirrus_drv.h | 1 - drivers/gpu/drm/cirrus/cirrus_main.c | 6 ------ drivers/gpu/drm/drm_gem.c | 29 ----------------------------- drivers/gpu/drm/exynos/exynos_drm_drv.c | 1 - drivers/gpu/drm/exynos/exynos_drm_gem.c | 5 ----- drivers/gpu/drm/exynos/exynos_drm_gem.h | 3 --- drivers/gpu/drm/gma500/gem.c | 5 ----- drivers/gpu/drm/gma500/psb_drv.c | 1 - drivers/gpu/drm/gma500/psb_drv.h | 1 - drivers/gpu/drm/i915/i915_drv.c | 1 - drivers/gpu/drm/i915/i915_drv.h | 1 - drivers/gpu/drm/i915/i915_gem.c | 7 ------- drivers/gpu/drm/mgag200/mgag200_drv.c | 1 - drivers/gpu/drm/mgag200/mgag200_drv.h | 1 - drivers/gpu/drm/mgag200/mgag200_main.c | 6 ------ drivers/gpu/drm/nouveau/nouveau_drm.c | 1 - drivers/gpu/drm/nouveau/nouveau_gem.c | 6 ------ drivers/gpu/drm/nouveau/nouveau_gem.h | 1 - drivers/gpu/drm/omapdrm/omap_drv.c | 1 - drivers/gpu/drm/omapdrm/omap_drv.h | 1 - drivers/gpu/drm/omapdrm/omap_gem.c | 5 ----- drivers/gpu/drm/qxl/qxl_drv.c | 1 - drivers/gpu/drm/qxl/qxl_drv.h | 1 - drivers/gpu/drm/qxl/qxl_gem.c | 6 ------ drivers/gpu/drm/radeon/radeon_drv.c | 2 -- drivers/gpu/drm/radeon/radeon_gem.c | 7 ------- drivers/gpu/drm/udl/udl_drv.c | 1 - drivers/gpu/drm/udl/udl_drv.h | 1 - drivers/gpu/drm/udl/udl_gem.c | 7 ------- include/drm/drmP.h | 5 ----- 34 files changed, 124 deletions(-)drivers/gpu/drm/ast/ast_drv.c +0
-1@@ -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@@ -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@@ -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@@ -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@@ -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,drivers/gpu/drm/cirrus/cirrus_main.c +0
-6@@ -255,12 +255,6 @@ int cirrus_dumb_create(struct drm_file *file,return 0 ; } -int cirrus_gem_init_object (struct drm_gem_object *obj) -{ -BUG (); -return 0 ; -} -void cirrus_bo_unref (struct cirrus_bo **bo) {struct ttm_buffer_object *tbo;drivers/gpu/drm/drm_gem.c +0
-29@@ -160,35 +160,6 @@ void drm_gem_private_object_init(struct drm_device *dev, }EXPORT_SYMBOL (drm_gem_private_object_init); -/** -* Allocate a GEM object of the specified size with shmfs backing store -*/ -struct drm_gem_object * -drm_gem_object_alloc (struct drm_device *dev,size_t size) -{ -struct drm_gem_object *obj; - - obj =kzalloc (sizeof (*obj),GFP_KERNEL ); -if (!obj) - goto free; - -if (drm_gem_object_init (dev, obj, size) !=0 ) - goto free; - -if (dev->driver->gem_init_object !=NULL && - dev->driver->gem_init_object (obj) !=0 ) { - goto fput; - } -return obj; -fput: -/* Object_init mangles the global counters - readjust them. */ -fput (obj->filp); -free: -kfree (obj); -return NULL ; -} -EXPORT_SYMBOL (drm_gem_object_alloc); -static void drm_gem_remove_prime_handles (struct drm_gem_object *obj,struct drm_file *filp) {drivers/gpu/drm/exynos/exynos_drm_drv.c +0
-1@@ -264,7 +264,6 @@ static struct drm_driver exynos_drm_driver = { .get_vblank_counter = drm_vblank_count, .enable_vblank = exynos_drm_crtc_enable_vblank, .disable_vblank = exynos_drm_crtc_disable_vblank, - .gem_init_object = exynos_drm_gem_init_object, .gem_free_object = exynos_drm_gem_free_object, .gem_vm_ops = &exynos_drm_gem_vm_ops, .dumb_create = exynos_drm_gem_dumb_create,drivers/gpu/drm/exynos/exynos_drm_gem.c +0
-5@@ -630,11 +630,6 @@ void exynos_gem_unmap_sgt_from_dma(struct drm_device *drm_dev,dma_unmap_sg (drm_dev->dev, sgt->sgl, sgt->nents, dir); } -int exynos_drm_gem_init_object (struct drm_gem_object *obj) -{ -return 0 ; -} -void exynos_drm_gem_free_object (struct drm_gem_object *obj) {struct exynos_drm_gem_obj *exynos_gem_obj;drivers/gpu/drm/exynos/exynos_drm_gem.h +0
-3@@ -135,9 +135,6 @@ unsigned long exynos_drm_gem_get_size(struct drm_device *dev,unsigned int gem_handle, struct drm_file *file_priv); -/* initialize gem object. */ -int exynos_drm_gem_init_object (struct drm_gem_object *obj); -/* free gem object. */ void exynos_drm_gem_free_object (struct drm_gem_object *gem_obj);drivers/gpu/drm/gma500/gem.c +0
-5@@ -29,11 +29,6 @@#include <drm/drm_vma_manager.h> #include "psb_drv.h" -int psb_gem_init_object (struct drm_gem_object *obj) -{ -return -EINVAL ; -} -void psb_gem_free_object (struct drm_gem_object *obj) { struct gtt_range *gtt = container_of(obj, struct gtt_range, gem);drivers/gpu/drm/gma500/psb_drv.c +0
-1@@ -646,7 +646,6 @@ static struct drm_driver driver = { .preclose = psb_driver_preclose, .postclose = psb_driver_close, - .gem_init_object = psb_gem_init_object, .gem_free_object = psb_gem_free_object, .gem_vm_ops = &psb_gem_vm_ops, .dumb_create = psb_gem_dumb_create,drivers/gpu/drm/gma500/psb_drv.h +0
-1@@ -837,7 +837,6 @@ extern const struct drm_connector_helper_funcsextern const struct drm_connector_funcs psb_intel_lvds_connector_funcs;/* gem.c */ -extern int psb_gem_init_object (struct drm_gem_object *obj);extern void psb_gem_free_object (struct drm_gem_object *obj);extern int psb_gem_get_aperture (struct drm_device *dev,void *data,struct drm_file *file);drivers/gpu/drm/i915/i915_drv.c +0
-1@@ -938,7 +938,6 @@ static struct drm_driver driver = { .debugfs_init = i915_debugfs_init, .debugfs_cleanup = i915_debugfs_cleanup, #endif - .gem_init_object = i915_gem_init_object, .gem_free_object = i915_gem_free_object, .gem_vm_ops = &i915_gem_vm_ops,drivers/gpu/drm/i915/i915_drv.h +0
-1@@ -1848,7 +1848,6 @@ int i915_gem_wait_ioctl(struct drm_device *dev, void *data,void i915_gem_load (struct drm_device *dev);void *i915_gem_object_alloc (struct drm_device *dev);void i915_gem_object_free (struct drm_i915_gem_object *obj); -int i915_gem_init_object (struct drm_gem_object *obj);void i915_gem_object_init (struct drm_i915_gem_object *obj,const struct drm_i915_gem_object_ops *ops); struct drm_i915_gem_object *i915_gem_alloc_object(struct drm_device *dev,drivers/gpu/drm/i915/i915_gem.c +0
-7@@ -4107,13 +4107,6 @@ struct drm_i915_gem_object *i915_gem_alloc_object(struct drm_device *dev,return obj; } -int i915_gem_init_object (struct drm_gem_object *obj) -{ -BUG (); - -return 0 ; -} -void i915_gem_free_object (struct drm_gem_object *gem_obj) {struct drm_i915_gem_object *obj =to_intel_bo (gem_obj);drivers/gpu/drm/mgag200/mgag200_drv.c +0
-1@@ -99,7 +99,6 @@ static struct drm_driver driver = { .minor = DRIVER_MINOR, .patchlevel = DRIVER_PATCHLEVEL, - .gem_init_object = mgag200_gem_init_object, .gem_free_object = mgag200_gem_free_object, .dumb_create = mgag200_dumb_create, .dumb_map_offset = mgag200_dumb_mmap_offset,drivers/gpu/drm/mgag200/mgag200_drv.h +0
-1@@ -260,7 +260,6 @@ int mgag200_driver_unload(struct drm_device *dev);int mgag200_gem_create (struct drm_device *dev,u32 size,bool iskernel,struct drm_gem_object **obj); -int mgag200_gem_init_object (struct drm_gem_object *obj);int mgag200_dumb_create (struct drm_file *file,struct drm_device *dev,struct drm_mode_create_dumb *args);drivers/gpu/drm/mgag200/mgag200_main.c +0
-6@@ -310,12 +310,6 @@ int mgag200_dumb_create(struct drm_file *file,return 0 ; } -int mgag200_gem_init_object (struct drm_gem_object *obj) -{ -BUG (); -return 0 ; -} -void mgag200_bo_unref (struct mgag200_bo **bo) {struct ttm_buffer_object *tbo;drivers/gpu/drm/nouveau/nouveau_drm.c +0
-1@@ -834,7 +834,6 @@ driver = { .gem_prime_vmap = nouveau_gem_prime_vmap, .gem_prime_vunmap = nouveau_gem_prime_vunmap, - .gem_init_object = nouveau_gem_object_new, .gem_free_object = nouveau_gem_object_del, .gem_open_object = nouveau_gem_object_open, .gem_close_object = nouveau_gem_object_close,drivers/gpu/drm/nouveau/nouveau_gem.c +0
-6@@ -34,12 +34,6 @@#include "nouveau_ttm.h" #include "nouveau_gem.h" -int -nouveau_gem_object_new (struct drm_gem_object *gem) -{ -return 0 ; -} -void nouveau_gem_object_del (struct drm_gem_object *gem) {drivers/gpu/drm/nouveau/nouveau_gem.h +0
-1@@ -19,7 +19,6 @@ nouveau_gem_object(struct drm_gem_object *gem)extern int nouveau_gem_new (struct drm_device *,int size,int align,uint32_t domain,uint32_t tile_mode,uint32_t tile_flags,struct nouveau_bo **); -extern int nouveau_gem_object_new (struct drm_gem_object *);extern void nouveau_gem_object_del (struct drm_gem_object *);extern int nouveau_gem_object_open (struct drm_gem_object *,struct drm_file *); extern void nouveau_gem_object_close(struct drm_gem_object *,drivers/gpu/drm/omapdrm/omap_drv.c +0
-1@@ -620,7 +620,6 @@ static struct drm_driver omap_drm_driver = { .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_export = omap_gem_prime_export, .gem_prime_import = omap_gem_prime_import, - .gem_init_object = omap_gem_init_object, .gem_free_object = omap_gem_free_object, .gem_vm_ops = &omap_gem_vm_ops, .dumb_create = omap_gem_dumb_create,drivers/gpu/drm/omapdrm/omap_drv.h +0
-1@@ -220,7 +220,6 @@ struct drm_gem_object *omap_gem_new(struct drm_device *dev,int omap_gem_new_handle (struct drm_device *dev,struct drm_file *file,union omap_gem_size gsize,uint32_t flags,uint32_t *handle);void omap_gem_free_object (struct drm_gem_object *obj); -int omap_gem_init_object (struct drm_gem_object *obj);void *omap_gem_vaddr (struct drm_gem_object *obj);int omap_gem_dumb_map_offset (struct drm_file *file,struct drm_device *dev,uint32_t handle,uint64_t *offset);drivers/gpu/drm/omapdrm/omap_gem.c +0
-5@@ -1274,11 +1274,6 @@ unlock:return ret; } -int omap_gem_init_object (struct drm_gem_object *obj) -{ -return -EINVAL ;/* unused */ -} -/* don't call directly.. called from GEM core when it is time to actually * free the object.. */ drivers/gpu/drm/qxl/qxl_drv.c +0
-1@@ -225,7 +225,6 @@ static struct drm_driver qxl_driver = { .debugfs_init = qxl_debugfs_init, .debugfs_cleanup = qxl_debugfs_takedown, #endif - .gem_init_object = qxl_gem_object_init, .gem_free_object = qxl_gem_object_free, .gem_open_object = qxl_gem_object_open, .gem_close_object = qxl_gem_object_close,drivers/gpu/drm/qxl/qxl_drv.h +0
-1@@ -412,7 +412,6 @@ int qxl_gem_object_create_with_handle(struct qxl_device *qdev,struct qxl_surface *surf, struct qxl_bo **qobj, uint32_t *handle); -int qxl_gem_object_init (struct drm_gem_object *obj);void qxl_gem_object_free (struct drm_gem_object *gobj);int qxl_gem_object_open (struct drm_gem_object *obj,struct drm_file *file_priv); void qxl_gem_object_close(struct drm_gem_object *obj,drivers/gpu/drm/qxl/qxl_gem.c +0
-6@@ -28,12 +28,6 @@#include "qxl_drv.h" #include "qxl_object.h" -int qxl_gem_object_init (struct drm_gem_object *obj) -{ -/* we do nothings here */ -return 0 ; -} -void qxl_gem_object_free (struct drm_gem_object *gobj) {struct qxl_bo *qobj =gem_to_qxl_bo (gobj);drivers/gpu/drm/radeon/radeon_drv.c +0
-2@@ -100,7 +100,6 @@ void radeon_driver_irq_preinstall_kms(struct drm_device *dev);int radeon_driver_irq_postinstall_kms (struct drm_device *dev);void radeon_driver_irq_uninstall_kms (struct drm_device *dev);irqreturn_t radeon_driver_irq_handler_kms (DRM_IRQ_ARGS ); -int radeon_gem_object_init (struct drm_gem_object *obj);void radeon_gem_object_free (struct drm_gem_object *obj);int radeon_gem_object_open (struct drm_gem_object *obj,struct drm_file *file_priv);@@ -408,7 +407,6 @@ static struct drm_driver kms_driver = { .irq_uninstall = radeon_driver_irq_uninstall_kms, .irq_handler = radeon_driver_irq_handler_kms, .ioctls = radeon_ioctls_kms, - .gem_init_object = radeon_gem_object_init, .gem_free_object = radeon_gem_object_free, .gem_open_object = radeon_gem_object_open, .gem_close_object = radeon_gem_object_close,drivers/gpu/drm/radeon/radeon_gem.c +0
-7@@ -29,13 +29,6 @@#include <drm/radeon_drm.h> #include "radeon.h" -int radeon_gem_object_init (struct drm_gem_object *obj) -{ -BUG (); - -return 0 ; -} -void radeon_gem_object_free (struct drm_gem_object *gobj) {struct radeon_bo *robj =gem_to_radeon_bo (gobj);drivers/gpu/drm/udl/udl_drv.c +0
-1@@ -77,7 +77,6 @@ static struct drm_driver driver = { .unload = udl_driver_unload,/* gem hooks */ - .gem_init_object = udl_gem_init_object, .gem_free_object = udl_gem_free_object, .gem_vm_ops = &udl_gem_vm_ops,drivers/gpu/drm/udl/udl_drv.h +0
-1@@ -115,7 +115,6 @@ int udl_dumb_create(struct drm_file *file_priv,int udl_gem_mmap (struct drm_file *file_priv,struct drm_device *dev,uint32_t handle,uint64_t *offset); -int udl_gem_init_object (struct drm_gem_object *obj);void udl_gem_free_object (struct drm_gem_object *gem_obj);struct udl_gem_object *udl_gem_alloc_object (struct drm_device *dev,size_t size);drivers/gpu/drm/udl/udl_gem.c +0
-7@@ -107,13 +107,6 @@ int udl_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf) } } -int udl_gem_init_object (struct drm_gem_object *obj) -{ -BUG (); - -return 0 ; -} -static int udl_gem_get_pages (struct udl_gem_object *obj,gfp_t gfpmask) {struct page **pages;include/drm/drmP.h +0
-6@@ -667,8 +667,6 @@ struct drm_gem_object {uint32_t pending_read_domains;uint32_t pending_write_domain; -void *driver_private; -/** * dma_buf - dma buf associated with this GEM object * @@ -922,7 +920,6 @@ struct drm_driver {* * Returns 0 on success. */ -int (*gem_init_object) (struct drm_gem_object *obj);void (*gem_free_object) (struct drm_gem_object *obj);int (*gem_open_object) (struct drm_gem_object *,struct drm_file *);void (*gem_close_object) (struct drm_gem_object *,struct drm_file *);@@ -1556,8 +1553,6 @@ int drm_gem_init(struct drm_device *dev);void drm_gem_destroy (struct drm_device *dev);void drm_gem_object_release (struct drm_gem_object *obj);void drm_gem_object_free (struct kref *kref); -struct drm_gem_object *drm_gem_object_alloc (struct drm_device *dev, -size_t size);int drm_gem_object_init (struct drm_device *dev,struct drm_gem_object *obj,size_t size); void drm_gem_private_object_init(struct drm_device *dev, --1.8.4
Dave Airlie
maintainerRe: [PATCH v2 2/2] drm: kill ->gem_init_object() and friends
Quoted 6 lines
Quoted 6 lines
All drivers embed gem-objects into their own buffer objects. There is no reason to keep
drm_gem_object_alloc(),gem->driver_privateand ->gem_init_object() anymore.New drivers are highly encouraged to do the same. There is no benefit in allocating gem-objects separately.
Merged both of these to -next.
Dave.