leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/vram: use embedded gem object

Browse Source 
Drop drm_gem_object from drm_gem_vram_object, use the
ttm_buffer_object.base instead.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: http://patchwork.freedesktop.org/patch/msgid/20190805140119.7337-3-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann
2019-08-05 16:01:04 +02:00
parent 8eb8833e7e
commit 0e580c6d7d
5 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/ast/ast_main.c
View File

@@ -554,6 +554,6 @@ int ast_gem_create(struct drm_device *dev,
DRM_ERROR("failed to allocate GEM object\n"); DRM_ERROR("failed to allocate GEM object\n");
return ret; return ret;
} }
*obj = &gbo->gem; *obj = &gbo->bo.base;
return 0; return 0;
} }

18
drivers/gpu/drm/drm_gem_vram_helper.c
View File

@@ -26,7 +26,7 @@ static void drm_gem_vram_cleanup(struct drm_gem_vram_object *gbo)
* TTM buffer object in 'bo' has already been cleaned * TTM buffer object in 'bo' has already been cleaned
* up; only release the GEM object. * up; only release the GEM object.
*/ */
drm_gem_object_release(&gbo->gem); drm_gem_object_release(&gbo->bo.base);
} }
static void drm_gem_vram_destroy(struct drm_gem_vram_object *gbo) static void drm_gem_vram_destroy(struct drm_gem_vram_object *gbo)
@@ -82,10 +82,10 @@ static int drm_gem_vram_init(struct drm_device *dev,
int ret; int ret;
size_t acc_size; size_t acc_size;
if (!gbo->gem.funcs) if (!gbo->bo.base.funcs)
gbo->gem.funcs = &drm_gem_vram_object_funcs; gbo->bo.base.funcs = &drm_gem_vram_object_funcs;
ret = drm_gem_object_init(dev, &gbo->gem, size); ret = drm_gem_object_init(dev, &gbo->bo.base, size);
if (ret) if (ret)
return ret; return ret;
@@ -103,7 +103,7 @@ static int drm_gem_vram_init(struct drm_device *dev,
return 0; return 0;
err_drm_gem_object_release: err_drm_gem_object_release:
drm_gem_object_release(&gbo->gem); drm_gem_object_release(&gbo->bo.base);
return ret; return ret;
} }
@@ -383,11 +383,11 @@ int drm_gem_vram_fill_create_dumb(struct drm_file *file,
if (IS_ERR(gbo)) if (IS_ERR(gbo))
return PTR_ERR(gbo); return PTR_ERR(gbo);
ret = drm_gem_handle_create(file, &gbo->gem, &handle); ret = drm_gem_handle_create(file, &gbo->bo.base, &handle);
if (ret) if (ret)
goto err_drm_gem_object_put_unlocked; goto err_drm_gem_object_put_unlocked;
drm_gem_object_put_unlocked(&gbo->gem); drm_gem_object_put_unlocked(&gbo->bo.base);
args->pitch = pitch; args->pitch = pitch;
args->size = size; args->size = size;
@@ -396,7 +396,7 @@ int drm_gem_vram_fill_create_dumb(struct drm_file *file,
return 0; return 0;
err_drm_gem_object_put_unlocked: err_drm_gem_object_put_unlocked:
drm_gem_object_put_unlocked(&gbo->gem); drm_gem_object_put_unlocked(&gbo->bo.base);
return ret; return ret;
} }
EXPORT_SYMBOL(drm_gem_vram_fill_create_dumb); EXPORT_SYMBOL(drm_gem_vram_fill_create_dumb);
@@ -446,7 +446,7 @@ int drm_gem_vram_bo_driver_verify_access(struct ttm_buffer_object *bo,
{ {
struct drm_gem_vram_object *gbo = drm_gem_vram_of_bo(bo); struct drm_gem_vram_object *gbo = drm_gem_vram_of_bo(bo);
return drm_vma_node_verify_access(&gbo->gem.vma_node, return drm_vma_node_verify_access(&gbo->bo.base.vma_node,
filp->private_data); filp->private_data);
} }
EXPORT_SYMBOL(drm_gem_vram_bo_driver_verify_access); EXPORT_SYMBOL(drm_gem_vram_bo_driver_verify_access);

2
drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
View File

@@ -66,7 +66,7 @@ int hibmc_gem_create(struct drm_device *dev, u32 size, bool iskernel,
DRM_ERROR("failed to allocate GEM object: %d\n", ret); DRM_ERROR("failed to allocate GEM object: %d\n", ret);
return ret; return ret;
} }
*obj = &gbo->gem; *obj = &gbo->bo.base;
return 0; return 0;
} }

2
drivers/gpu/drm/vboxvideo/vbox_main.c
View File

@@ -292,7 +292,7 @@ int vbox_gem_create(struct vbox_private *vbox,
return ret; return ret;
} }
*obj = &gbo->gem; *obj = &gbo->bo.base;
return 0; return 0;
} }

3
include/drm/drm_gem_vram_helper.h
View File

@@ -36,7 +36,6 @@ struct vm_area_struct;
* video memory becomes scarce. * video memory becomes scarce.
*/ */
struct drm_gem_vram_object { struct drm_gem_vram_object {
struct drm_gem_object gem;
struct ttm_buffer_object bo; struct ttm_buffer_object bo;
struct ttm_bo_kmap_obj kmap; struct ttm_bo_kmap_obj kmap;
@@ -68,7 +67,7 @@ static inline struct drm_gem_vram_object *drm_gem_vram_of_bo(
static inline struct drm_gem_vram_object *drm_gem_vram_of_gem( static inline struct drm_gem_vram_object *drm_gem_vram_of_gem(
struct drm_gem_object *gem) struct drm_gem_object *gem)
{ {
return container_of(gem, struct drm_gem_vram_object, gem); return container_of(gem, struct drm_gem_vram_object, bo.base);
} }
struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev, struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev,