xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/ttm: use a static ttm_mem_global instance

Browse Source 
As the name says we only need one global instance of ttm_mem_global.

Drop all the driver initialization and just use a single exported
instance which is initialized during BO global initialization.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König
2018-10-19 13:49:05 +02:00
committed by Alex Deucher
parent 7e07834c12
commit 27eb1fa913
29 changed files with 32 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
View File

@@ -49,7 +49,6 @@ struct hibmc_drm_private {
bool mode_config_initialized;
/* ttm */
struct drm_global_reference mem_global_ref;
struct ttm_bo_global_ref bo_global_ref;
struct ttm_bo_device bdev;
bool initialized;

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

@@ -29,34 +29,10 @@ hibmc_bdev(struct ttm_bo_device *bd)
return container_of(bd, struct hibmc_drm_private, bdev);
}
static int
hibmc_ttm_mem_global_init(struct drm_global_reference *ref)
{
return ttm_mem_global_init(ref->object);
}
static void
hibmc_ttm_mem_global_release(struct drm_global_reference *ref)
{
ttm_mem_global_release(ref->object);
}
static int hibmc_ttm_global_init(struct hibmc_drm_private *hibmc)
{
int ret;
hibmc->mem_global_ref.global_type = DRM_GLOBAL_TTM_MEM;
hibmc->mem_global_ref.size = sizeof(struct ttm_mem_global);
hibmc->mem_global_ref.init = &hibmc_ttm_mem_global_init;
hibmc->mem_global_ref.release = &hibmc_ttm_mem_global_release;
ret = drm_global_item_ref(&hibmc->mem_global_ref);
if (ret) {
DRM_ERROR("could not get ref on ttm global: %d\n", ret);
return ret;
}
hibmc->bo_global_ref.mem_glob =
hibmc->mem_global_ref.object;
hibmc->bo_global_ref.ref.global_type = DRM_GLOBAL_TTM_BO;
hibmc->bo_global_ref.ref.size = sizeof(struct ttm_bo_global);
hibmc->bo_global_ref.ref.init = &ttm_bo_global_ref_init;
@@ -64,7 +40,6 @@ static int hibmc_ttm_global_init(struct hibmc_drm_private *hibmc)
ret = drm_global_item_ref(&hibmc->bo_global_ref.ref);
if (ret) {
DRM_ERROR("failed setting up TTM BO subsystem: %d\n", ret);
drm_global_item_unref(&hibmc->mem_global_ref);
return ret;
}
return 0;
@@ -73,9 +48,11 @@ static int hibmc_ttm_global_init(struct hibmc_drm_private *hibmc)
static void
hibmc_ttm_global_release(struct hibmc_drm_private *hibmc)
{
if (hibmc->bo_global_ref.ref.release == NULL)
return;
drm_global_item_unref(&hibmc->bo_global_ref.ref);
drm_global_item_unref(&hibmc->mem_global_ref);
hibmc->mem_global_ref.release = NULL;
hibmc->bo_global_ref.ref.release = NULL;
}
static void hibmc_bo_ttm_destroy(struct ttm_buffer_object *tbo)