Commit 02eed83a authored by Dafna Hirschfeld's avatar Dafna Hirschfeld Committed by Alex Deucher
Browse files

drm/amdkfd: fixes for HMM mem allocation 



Fix err return value and reset pgmap->type after checking it.

Fixes: c83dee9b ("drm/amdkfd: add SPM support for SVM")
Reviewed-by: default avatarFelix Kuehling <felix.kuehling@amd.com>
Signed-off-by: default avatarDafna Hirschfeld <dhirschfeld@habana.ai>
Signed-off-by: default avatarFelix Kuehling <felix.kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7075893d

drivers/gpu/drm/amd/amdkfd/kfd_migrate.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

	}