[PATCH v4 10/14] dmr/amdgpu: Move some sysfs attrs creation to default_attr
Christian König
ckoenig.leichtzumerken at gmail.com
Tue Jan 19 08:53:26 UTC 2021
Am 18.01.21 um 22:01 schrieb Andrey Grodzovsky:
> This allows to remove explicit creation and destruction
> of those attrs and by this avoids warnings on device
> finilizing post physical device extraction.
>
> Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky at amd.com>
Acked-by: Christian König <christian.koenig at amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 17 +++++++++--------
> drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 13 +++++++++++++
> drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 25 ++++++++++---------------
> drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 14 +++++---------
> 4 files changed, 37 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c
> index 86add0f..0346e12 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c
> @@ -1953,6 +1953,15 @@ static ssize_t amdgpu_atombios_get_vbios_version(struct device *dev,
> static DEVICE_ATTR(vbios_version, 0444, amdgpu_atombios_get_vbios_version,
> NULL);
>
> +static struct attribute *amdgpu_vbios_version_attrs[] = {
> + &dev_attr_vbios_version.attr,
> + NULL
> +};
> +
> +const struct attribute_group amdgpu_vbios_version_attr_group = {
> + .attrs = amdgpu_vbios_version_attrs
> +};
> +
> /**
> * amdgpu_atombios_fini - free the driver info and callbacks for atombios
> *
> @@ -1972,7 +1981,6 @@ void amdgpu_atombios_fini(struct amdgpu_device *adev)
> adev->mode_info.atom_context = NULL;
> kfree(adev->mode_info.atom_card_info);
> adev->mode_info.atom_card_info = NULL;
> - device_remove_file(adev->dev, &dev_attr_vbios_version);
> }
>
> /**
> @@ -1989,7 +1997,6 @@ int amdgpu_atombios_init(struct amdgpu_device *adev)
> {
> struct card_info *atom_card_info =
> kzalloc(sizeof(struct card_info), GFP_KERNEL);
> - int ret;
>
> if (!atom_card_info)
> return -ENOMEM;
> @@ -2027,12 +2034,6 @@ int amdgpu_atombios_init(struct amdgpu_device *adev)
> amdgpu_atombios_allocate_fb_scratch(adev);
> }
>
> - ret = device_create_file(adev->dev, &dev_attr_vbios_version);
> - if (ret) {
> - DRM_ERROR("Failed to create device file for VBIOS version\n");
> - return ret;
> - }
> -
> return 0;
> }
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> index 9c0cd00..8fddd74 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> @@ -1587,6 +1587,18 @@ static struct pci_error_handlers amdgpu_pci_err_handler = {
> .resume = amdgpu_pci_resume,
> };
>
> +extern const struct attribute_group amdgpu_vram_mgr_attr_group;
> +extern const struct attribute_group amdgpu_gtt_mgr_attr_group;
> +extern const struct attribute_group amdgpu_vbios_version_attr_group;
> +
> +static const struct attribute_group *amdgpu_sysfs_groups[] = {
> + &amdgpu_vram_mgr_attr_group,
> + &amdgpu_gtt_mgr_attr_group,
> + &amdgpu_vbios_version_attr_group,
> + NULL,
> +};
> +
> +
> static struct pci_driver amdgpu_kms_pci_driver = {
> .name = DRIVER_NAME,
> .id_table = pciidlist,
> @@ -1595,6 +1607,7 @@ static struct pci_driver amdgpu_kms_pci_driver = {
> .shutdown = amdgpu_pci_shutdown,
> .driver.pm = &amdgpu_pm_ops,
> .err_handler = &amdgpu_pci_err_handler,
> + .driver.dev_groups = amdgpu_sysfs_groups,
> };
>
> static int __init amdgpu_init(void)
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
> index 8980329..3b7150e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
> @@ -77,6 +77,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
> +};
> +
> static const struct ttm_resource_manager_func amdgpu_gtt_mgr_func;
> /**
> * amdgpu_gtt_mgr_init - init GTT manager and DRM MM
> @@ -91,7 +101,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;
> @@ -104,17 +113,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;
> @@ -144,9 +142,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);
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> index d2de2a7..9158d11 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> @@ -154,7 +154,7 @@ 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[] = {
> +static 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,
> @@ -163,6 +163,10 @@ static const struct attribute *amdgpu_vram_mgr_attributes[] = {
> NULL
> };
>
> +const struct attribute_group amdgpu_vram_mgr_attr_group = {
> + .attrs = amdgpu_vram_mgr_attributes
> +};
> +
> static const struct ttm_resource_manager_func amdgpu_vram_mgr_func;
>
> /**
> @@ -176,7 +180,6 @@ int amdgpu_vram_mgr_init(struct amdgpu_device *adev)
> {
> struct amdgpu_vram_mgr *mgr = &adev->mman.vram_mgr;
> struct ttm_resource_manager *man = &mgr->manager;
> - int ret;
>
> ttm_resource_manager_init(man, adev->gmc.real_vram_size >> PAGE_SHIFT);
>
> @@ -187,11 +190,6 @@ int amdgpu_vram_mgr_init(struct amdgpu_device *adev)
> INIT_LIST_HEAD(&mgr->reservations_pending);
> INIT_LIST_HEAD(&mgr->reserved_pages);
>
> - /* Add the two VRAM-related sysfs files */
> - ret = sysfs_create_files(&adev->dev->kobj, amdgpu_vram_mgr_attributes);
> - if (ret)
> - DRM_ERROR("Failed to register sysfs\n");
> -
> ttm_set_driver_manager(&adev->mman.bdev, TTM_PL_VRAM, &mgr->manager);
> ttm_resource_manager_set_used(man, true);
> return 0;
> @@ -229,8 +227,6 @@ void amdgpu_vram_mgr_fini(struct amdgpu_device *adev)
> drm_mm_takedown(&mgr->mm);
> spin_unlock(&mgr->lock);
>
> - sysfs_remove_files(&adev->dev->kobj, amdgpu_vram_mgr_attributes);
> -
> ttm_resource_manager_cleanup(man);
> ttm_set_driver_manager(&adev->mman.bdev, TTM_PL_VRAM, NULL);
> }
More information about the amd-gfx
mailing list