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

drm/amdgpu/ttm: drop the adev link from vram mgr

Browse Source 
There is no need for that now since it's embedded.

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200806233459.4057784-3-airlied@gmail.com
This commit is contained in:
Dave Airlie 2020-08-07 09:18:17 +10:00
parent 4f297b9c82
commit 373627930f
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
View File

@ -47,7 +47,6 @@ struct amdgpu_vram_mgr {
spinlock_t lock; spinlock_t lock;
atomic64_t usage; atomic64_t usage;
atomic64_t vis_usage; atomic64_t vis_usage;
struct amdgpu_device *adev;
}; };
struct amdgpu_gtt_mgr { struct amdgpu_gtt_mgr {

11
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
View File

@ -33,6 +33,11 @@ static inline struct amdgpu_vram_mgr *to_vram_mgr(struct ttm_resource_manager *m
return container_of(man, struct amdgpu_vram_mgr, manager); return container_of(man, struct amdgpu_vram_mgr, manager);
} }
static inline struct amdgpu_device *to_amdgpu_device(struct amdgpu_vram_mgr *mgr)
{
return container_of(mgr, struct amdgpu_device, mman.vram_mgr);
}
/** /**
* DOC: mem_info_vram_total * DOC: mem_info_vram_total
* *
@ -182,8 +187,6 @@ int amdgpu_vram_mgr_init(struct amdgpu_device *adev)
drm_mm_init(&mgr->mm, 0, man->size); drm_mm_init(&mgr->mm, 0, man->size);
spin_lock_init(&mgr->lock); spin_lock_init(&mgr->lock);
mgr->adev = adev;
/* Add the two VRAM-related sysfs files */ /* Add the two VRAM-related sysfs files */
ret = sysfs_create_files(&adev->dev->kobj, amdgpu_vram_mgr_attributes); ret = sysfs_create_files(&adev->dev->kobj, amdgpu_vram_mgr_attributes);
if (ret) if (ret)
@ -311,7 +314,7 @@ static int amdgpu_vram_mgr_new(struct ttm_resource_manager *man,
struct ttm_resource *mem) struct ttm_resource *mem)
{ {
struct amdgpu_vram_mgr *mgr = to_vram_mgr(man); struct amdgpu_vram_mgr *mgr = to_vram_mgr(man);
struct amdgpu_device *adev = mgr->adev; struct amdgpu_device *adev = to_amdgpu_device(mgr);
struct drm_mm *mm = &mgr->mm; struct drm_mm *mm = &mgr->mm;
struct drm_mm_node *nodes; struct drm_mm_node *nodes;
enum drm_mm_insert_mode mode; enum drm_mm_insert_mode mode;
@ -429,7 +432,7 @@ static void amdgpu_vram_mgr_del(struct ttm_resource_manager *man,
struct ttm_resource *mem) struct ttm_resource *mem)
{ {
struct amdgpu_vram_mgr *mgr = to_vram_mgr(man); struct amdgpu_vram_mgr *mgr = to_vram_mgr(man);
struct amdgpu_device *adev = mgr->adev; struct amdgpu_device *adev = to_amdgpu_device(mgr);
struct drm_mm_node *nodes = mem->mm_node; struct drm_mm_node *nodes = mem->mm_node;
uint64_t usage = 0, vis_usage = 0; uint64_t usage = 0, vis_usage = 0;
unsigned pages = mem->num_pages; unsigned pages = mem->num_pages;