git/linux-cryptodev-2.6
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git synced 2026-04-27 03:49:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/amdgpu: revise retry init to fully cleanup driver

Browse Source 
Retry at drm_dev_register instead of amdgpu_device_init.

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Pixel Ding <Pixel.Ding@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Pixel Ding
2017-11-08 11:03:14 +08:00
committed by Alex Deucher
parent baef9a196f
commit 1daee8b472
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
View File

@@ -84,7 +84,7 @@ done_free:
int amdgpu_driver_load_kms(struct drm_device *dev, unsigned long flags)
{
struct amdgpu_device *adev;
int r, acpi_status, retry = 0;
int r, acpi_status;
#ifdef CONFIG_DRM_AMDGPU_SI
if (!amdgpu_si_support) {
@@ -120,7 +120,6 @@ int amdgpu_driver_load_kms(struct drm_device *dev, unsigned long flags)
}
}
#endif
retry_init:
adev = kzalloc(sizeof(struct amdgpu_device), GFP_KERNEL);
if (adev == NULL) {
@@ -143,17 +142,7 @@ retry_init:
* VRAM allocation
*/
r = amdgpu_device_init(adev, dev, dev->pdev, flags);
if (r == -EAGAIN && ++retry <= 3) {
adev->virt.caps &= ~AMDGPU_SRIOV_CAPS_RUNTIME;
adev->virt.ops = NULL;
amdgpu_device_fini(adev);
kfree(adev);
dev->dev_private = NULL;
/* Don't request EX mode too frequently which is attacking */
msleep(5000);
dev_err(&dev->pdev->dev, "retry init %d\n", retry);
goto retry_init;
} else if (r) {
if (r) {
dev_err(&dev->pdev->dev, "Fatal error during GPU init\n");
goto out;
}