diff options
| author |  Dafna Hirschfeld <dhirschfeld@habana.ai>
| 2024-01-07 15:07:00 +0200 |
|---|---|---|
| committer |  Alex Deucher <alexander.deucher@amd.com>
| 2024-01-15 18:30:46 -0500 |
| commit | 02eed83abc1395a1207591aafad9bcfc5cb1abcb (patch) | |
| tree | 10b2da177482998b22a95f5e5a458422ccbd82d4 /drivers/gpu/drm/amd/amdkfd | |
| parent | drm/amd/display: cleanup inconsistent indenting in amdgpu_dm_color (diff) | |
| download | linux-02eed83abc1395a1207591aafad9bcfc5cb1abcb.tar.gz linux-02eed83abc1395a1207591aafad9bcfc5cb1abcb.tar.bz2 linux-02eed83abc1395a1207591aafad9bcfc5cb1abcb.zip | |
drm/amdkfd: fixes for HMM mem allocation
Fix err return value and reset pgmap->type after checking it.
Fixes: c83dee9b6394 ("drm/amdkfd: add SPM support for SVM")
Reviewed-by: Felix Kuehling <felix.kuehling@amd.com>
Signed-off-by: Dafna Hirschfeld <dhirschfeld@habana.ai>
Signed-off-by: Felix Kuehling <felix.kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdkfd')
| -rw-r--r-- | drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c index d630100b9e91..f856901055d3 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c @@ -1026,7 +1026,7 @@ int kgd2kfd_init_zone_device(struct amdgpu_device *adev) } else { res = devm_request_free_mem_region(adev->dev, &iomem_resource, size); if (IS_ERR(res)) - return -ENOMEM; + return PTR_ERR(res); pgmap->range.start = res->start; pgmap->range.end = res->end; pgmap->type = MEMORY_DEVICE_PRIVATE; @@ -1042,10 +1042,10 @@ int kgd2kfd_init_zone_device(struct amdgpu_device *adev) r = devm_memremap_pages(adev->dev, pgmap); if (IS_ERR(r)) { pr_err("failed to register HMM device memory\n"); - /* Disable SVM support capability */ - pgmap->type = 0; if (pgmap->type == MEMORY_DEVICE_PRIVATE) devm_release_mem_region(adev->dev, res->start, resource_size(res)); + /* Disable SVM support capability */ + pgmap->type = 0; return PTR_ERR(r); } |