drm/nouveau: Introduce GEM object functions
GEM object functions deprecate several similar callback interfaces in struct drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in nouveau. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Acked-by: Christian König <christian.koenig@amd.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200923102159.24084-11-tzimmermann@suse.de
This commit is contained in:
parent
3c9edd9c85
commit
ed853f6c3f
|
@ -1207,16 +1207,7 @@ driver_stub = {
|
|||
|
||||
.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
|
||||
.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
|
||||
.gem_prime_pin = nouveau_gem_prime_pin,
|
||||
.gem_prime_unpin = nouveau_gem_prime_unpin,
|
||||
.gem_prime_get_sg_table = nouveau_gem_prime_get_sg_table,
|
||||
.gem_prime_import_sg_table = nouveau_gem_prime_import_sg_table,
|
||||
.gem_prime_vmap = nouveau_gem_prime_vmap,
|
||||
.gem_prime_vunmap = nouveau_gem_prime_vunmap,
|
||||
|
||||
.gem_free_object_unlocked = nouveau_gem_object_del,
|
||||
.gem_open_object = nouveau_gem_object_open,
|
||||
.gem_close_object = nouveau_gem_object_close,
|
||||
|
||||
.dumb_create = nouveau_display_dumb_create,
|
||||
.dumb_map_offset = nouveau_display_dumb_map_offset,
|
||||
|
|
|
@ -169,6 +169,17 @@ nouveau_gem_object_close(struct drm_gem_object *gem, struct drm_file *file_priv)
|
|||
ttm_bo_unreserve(&nvbo->bo);
|
||||
}
|
||||
|
||||
const struct drm_gem_object_funcs nouveau_gem_object_funcs = {
|
||||
.free = nouveau_gem_object_del,
|
||||
.open = nouveau_gem_object_open,
|
||||
.close = nouveau_gem_object_close,
|
||||
.pin = nouveau_gem_prime_pin,
|
||||
.unpin = nouveau_gem_prime_unpin,
|
||||
.get_sg_table = nouveau_gem_prime_get_sg_table,
|
||||
.vmap = nouveau_gem_prime_vmap,
|
||||
.vunmap = nouveau_gem_prime_vunmap,
|
||||
};
|
||||
|
||||
int
|
||||
nouveau_gem_new(struct nouveau_cli *cli, u64 size, int align, uint32_t domain,
|
||||
uint32_t tile_mode, uint32_t tile_flags,
|
||||
|
@ -186,6 +197,8 @@ nouveau_gem_new(struct nouveau_cli *cli, u64 size, int align, uint32_t domain,
|
|||
if (IS_ERR(nvbo))
|
||||
return PTR_ERR(nvbo);
|
||||
|
||||
nvbo->bo.base.funcs = &nouveau_gem_object_funcs;
|
||||
|
||||
/* 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(drm->dev, &nvbo->bo.base, size);
|
||||
|
|
|
@ -5,6 +5,8 @@
|
|||
#include "nouveau_drv.h"
|
||||
#include "nouveau_bo.h"
|
||||
|
||||
extern const struct drm_gem_object_funcs nouveau_gem_object_funcs;
|
||||
|
||||
static inline struct nouveau_bo *
|
||||
nouveau_gem_object(struct drm_gem_object *gem)
|
||||
{
|
||||
|
|
|
@ -77,6 +77,8 @@ struct drm_gem_object *nouveau_gem_prime_import_sg_table(struct drm_device *dev,
|
|||
|
||||
nvbo->valid_domains = NOUVEAU_GEM_DOMAIN_GART;
|
||||
|
||||
nvbo->bo.base.funcs = &nouveau_gem_object_funcs;
|
||||
|
||||
/* 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->bo.base, size);
|
||||
|
|
Loading…
Reference in New Issue