Merge tag 'amd-drm-next-5.14-2021-06-02' of https://gitlab.freedesktop.org/agd5f...

[linux-2.6-microblaze.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_gtt_mgr.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
index 327da88..9ab3304 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
@@ -80,6 +80,16 @@ static DEVICE_ATTR(mem_info_gtt_total, S_IRUGO,
 static DEVICE_ATTR(mem_info_gtt_used, S_IRUGO,
                   amdgpu_mem_info_gtt_used_show, NULL);
 
+static struct attribute *amdgpu_gtt_mgr_attributes[] = {
+       &dev_attr_mem_info_gtt_total.attr,
+       &dev_attr_mem_info_gtt_used.attr,
+       NULL
+};
+
+const struct attribute_group amdgpu_gtt_mgr_attr_group = {
+       .attrs = amdgpu_gtt_mgr_attributes
+};
+
 /**
  * amdgpu_gtt_mgr_has_gart_addr - Check if mem has address space
  *
@@ -267,7 +277,6 @@ int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
        struct amdgpu_gtt_mgr *mgr = &adev->mman.gtt_mgr;
        struct ttm_resource_manager *man = &mgr->manager;
        uint64_t start, size;
-       int ret;
 
        man->use_tt = true;
        man->func = &amdgpu_gtt_mgr_func;
@@ -280,17 +289,6 @@ int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
        spin_lock_init(&mgr->lock);
        atomic64_set(&mgr->available, gtt_size >> PAGE_SHIFT);
 
-       ret = device_create_file(adev->dev, &dev_attr_mem_info_gtt_total);
-       if (ret) {
-               DRM_ERROR("Failed to create device file mem_info_gtt_total\n");
-               return ret;
-       }
-       ret = device_create_file(adev->dev, &dev_attr_mem_info_gtt_used);
-       if (ret) {
-               DRM_ERROR("Failed to create device file mem_info_gtt_used\n");
-               return ret;
-       }
-
        ttm_set_driver_manager(&adev->mman.bdev, TTM_PL_TT, &mgr->manager);
        ttm_resource_manager_set_used(man, true);
        return 0;
@@ -320,9 +318,6 @@ void amdgpu_gtt_mgr_fini(struct amdgpu_device *adev)
        drm_mm_takedown(&mgr->mm);
        spin_unlock(&mgr->lock);
 
-       device_remove_file(adev->dev, &dev_attr_mem_info_gtt_total);
-       device_remove_file(adev->dev, &dev_attr_mem_info_gtt_used);
-
        ttm_resource_manager_cleanup(man);
        ttm_set_driver_manager(&adev->mman.bdev, TTM_PL_TT, NULL);
 }