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>

1 files changed, 9 insertions, 2 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 6b11a75839e2..eaccd4bd12a4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -565,12 +565,13 @@ static int amdgpu_kick_out_firmware_fb(struct pci_dev *pdev)
         return 0;
 }
 
+
 static int amdgpu_pci_probe(struct pci_dev *pdev,
                             const struct pci_device_id *ent)
 {
         struct drm_device *dev;
         unsigned long flags = ent->driver_data;
-        int ret;
+        int ret, retry = 0;
 
         if ((flags & AMD_EXP_HW_SUPPORT) && !amdgpu_exp_hw_support) {
                 DRM_INFO("This hardware requires experimental hardware support.\n"
@@ -603,8 +604,14 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
 
         pci_set_drvdata(pdev, dev);
 
+retry_init:
         ret = drm_dev_register(dev, ent->driver_data);
-        if (ret)
+        if (ret == -EAGAIN && ++retry <= 3) {
+                DRM_INFO("retry init %d\n", retry);
+                /* Don't request EX mode too frequently which is attacking */
+                msleep(5000);
+                goto retry_init;
+        } else if (ret)
                 goto err_pci;
 
         return 0;