diff options
| author | Pixel Ding <Pixel.Ding@amd.com> | 2017-11-08 11:03:14 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-12-06 12:47:18 -0500 |
| commit | 1daee8b472e896f477e490ca66e58d1f8f0f4e61 (patch) | |
| tree | 19d16782e0eab09d312a21e002947724cecbc775 /drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | |
| parent | baef9a196f00b30400443fd56455b8ed9a6a4173 (diff) | |
drm/amdgpu: revise retry init to fully cleanup driver
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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c index 9ed1bee0fd64..f55021ae788d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c @@ -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; } |