Merge tag 'amd-drm-next-5.8-2020-05-12' of git://people.freedesktop.org/~agd5f/linux...

[linux-block.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_vram_mgr.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
index 128a667ed8fa0d8aaa37c70c7a861fa6faf100f6..d399e58931705c9da41e1361be76041adb947ad2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
@@ -149,6 +149,15 @@ static DEVICE_ATTR(mem_info_vis_vram_used, S_IRUGO,
 static DEVICE_ATTR(mem_info_vram_vendor, S_IRUGO,
                   amdgpu_mem_info_vram_vendor, NULL);
 
+static const struct attribute *amdgpu_vram_mgr_attributes[] = {
+       &dev_attr_mem_info_vram_total.attr,
+       &dev_attr_mem_info_vis_vram_total.attr,
+       &dev_attr_mem_info_vram_used.attr,
+       &dev_attr_mem_info_vis_vram_used.attr,
+       &dev_attr_mem_info_vram_vendor.attr,
+       NULL
+};
+
 /**
  * amdgpu_vram_mgr_init - init VRAM manager and DRM MM
  *
@@ -173,31 +182,9 @@ static int amdgpu_vram_mgr_init(struct ttm_mem_type_manager *man,
        man->priv = mgr;
 
        /* Add the two VRAM-related sysfs files */
-       ret = device_create_file(adev->dev, &dev_attr_mem_info_vram_total);
-       if (ret) {
-               DRM_ERROR("Failed to create device file mem_info_vram_total\n");
-               return ret;
-       }
-       ret = device_create_file(adev->dev, &dev_attr_mem_info_vis_vram_total);
-       if (ret) {
-               DRM_ERROR("Failed to create device file mem_info_vis_vram_total\n");
-               return ret;
-       }
-       ret = device_create_file(adev->dev, &dev_attr_mem_info_vram_used);
-       if (ret) {
-               DRM_ERROR("Failed to create device file mem_info_vram_used\n");
-               return ret;
-       }
-       ret = device_create_file(adev->dev, &dev_attr_mem_info_vis_vram_used);
-       if (ret) {
-               DRM_ERROR("Failed to create device file mem_info_vis_vram_used\n");
-               return ret;
-       }
-       ret = device_create_file(adev->dev, &dev_attr_mem_info_vram_vendor);
-       if (ret) {
-               DRM_ERROR("Failed to create device file mem_info_vram_vendor\n");
-               return ret;
-       }
+       ret = sysfs_create_files(&adev->dev->kobj, amdgpu_vram_mgr_attributes);
+       if (ret)
+               DRM_ERROR("Failed to register sysfs\n");
 
        return 0;
 }
@@ -220,11 +207,7 @@ static int amdgpu_vram_mgr_fini(struct ttm_mem_type_manager *man)
        spin_unlock(&mgr->lock);
        kfree(mgr);
        man->priv = NULL;
-       device_remove_file(adev->dev, &dev_attr_mem_info_vram_total);
-       device_remove_file(adev->dev, &dev_attr_mem_info_vis_vram_total);
-       device_remove_file(adev->dev, &dev_attr_mem_info_vram_used);
-       device_remove_file(adev->dev, &dev_attr_mem_info_vis_vram_used);
-       device_remove_file(adev->dev, &dev_attr_mem_info_vram_vendor);
+       sysfs_remove_files(&adev->dev->kobj, amdgpu_vram_mgr_attributes);
        return 0;
 }