Commit a29050c4 authored by Dave Airlie's avatar Dave Airlie

drm/amdgpu/ttm: remove man->bdev references.

Just store the device in the private so the link
can be removed from the manager
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200804025632.3868079-53-airlied@gmail.com
parent 7ee6c95e
...@@ -34,6 +34,7 @@ struct amdgpu_vram_mgr { ...@@ -34,6 +34,7 @@ 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;
}; };
static inline struct amdgpu_vram_mgr *to_vram_mgr(struct ttm_mem_type_manager *man) static inline struct amdgpu_vram_mgr *to_vram_mgr(struct ttm_mem_type_manager *man)
...@@ -196,6 +197,8 @@ int amdgpu_vram_mgr_init(struct amdgpu_device *adev) ...@@ -196,6 +197,8 @@ 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)
...@@ -323,8 +326,8 @@ static int amdgpu_vram_mgr_new(struct ttm_mem_type_manager *man, ...@@ -323,8 +326,8 @@ static int amdgpu_vram_mgr_new(struct ttm_mem_type_manager *man,
const struct ttm_place *place, const struct ttm_place *place,
struct ttm_mem_reg *mem) struct ttm_mem_reg *mem)
{ {
struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev);
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 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;
...@@ -441,8 +444,8 @@ static int amdgpu_vram_mgr_new(struct ttm_mem_type_manager *man, ...@@ -441,8 +444,8 @@ static int amdgpu_vram_mgr_new(struct ttm_mem_type_manager *man,
static void amdgpu_vram_mgr_del(struct ttm_mem_type_manager *man, static void amdgpu_vram_mgr_del(struct ttm_mem_type_manager *man,
struct ttm_mem_reg *mem) struct ttm_mem_reg *mem)
{ {
struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev);
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 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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment