Commit 1884734a authored by pding's avatar pding Committed by Alex Deucher
Browse files

drm/amdkfd: initialise kfd inside amdgpu_device_init 



Also finalize kfd inside amdgpu_device_fini. kfd device_init needs
SRIOV exclusive accessing. Try to gather exclusive accessing to
reduce time consuming.

Signed-off-by: default avatarpding <Pixel.Ding@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 40575732

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+4 −0
Original line number Diff line number Diff line
@@ -1693,6 +1693,8 @@ static int amdgpu_early_init(struct amdgpu_device *adev) 
	if (r)

		return r;



	amdgpu_amdkfd_device_probe(adev);



	if (amdgpu_sriov_vf(adev)) {

		r = amdgpu_virt_request_full_gpu(adev, true);

		if (r)
@@ -1787,6 +1789,7 @@ static int amdgpu_init(struct amdgpu_device *adev) 
		adev->ip_blocks[i].status.hw = true;

	}



	amdgpu_amdkfd_device_init(adev);

	return 0;

}
@@ -1854,6 +1857,7 @@ static int amdgpu_fini(struct amdgpu_device *adev) 
{

	int i, r;



	amdgpu_amdkfd_device_fini(adev);

	/* need to disable SMC first */

	for (i = 0; i < adev->num_ip_blocks; i++) {

		if (!adev->ip_blocks[i].status.hw)

drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c

+0 −5
Original line number Diff line number Diff line
@@ -63,8 +63,6 @@ void amdgpu_driver_unload_kms(struct drm_device *dev) 
		pm_runtime_forbid(dev->dev);

	}



	amdgpu_amdkfd_device_fini(adev);



	amdgpu_acpi_fini(adev);



	amdgpu_device_fini(adev);
@@ -170,9 +168,6 @@ retry_init: 
				"Error during ACPI methods call\n");

	}



	amdgpu_amdkfd_device_probe(adev);

	amdgpu_amdkfd_device_init(adev);



	if (amdgpu_device_is_px(dev)) {

		pm_runtime_use_autosuspend(dev->dev);

		pm_runtime_set_autosuspend_delay(dev->dev, 5000);

CRA Git | Maintained and supported by SUSTech CRA and CCSE