1 files changed, 10 insertions, 4 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index c2f414ffb2cc..31383e004947 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -216,7 +216,7 @@ module_param_named(exp_hw_support, amdgpu_exp_hw_support, int, 0444);
 MODULE_PARM_DESC(dc, "Display Core driver (1 = enable, 0 = disable, -1 = auto (default))");
 module_param_named(dc, amdgpu_dc, int, 0444);
 
-MODULE_PARM_DESC(dc, "Display Core Log Level (0 = minimal (default), 1 = chatty");
+MODULE_PARM_DESC(dc_log, "Display Core Log Level (0 = minimal (default), 1 = chatty");
 module_param_named(dc_log, amdgpu_dc_log, int, 0444);
 
 MODULE_PARM_DESC(sched_jobs, "the max number of jobs supported in the sw queue (default 32)");
@@ -306,7 +306,6 @@ MODULE_PARM_DESC(cik_support, "CIK support (1 = enabled (default), 0 = disabled)
 module_param_named(cik_support, amdgpu_cik_support, int, 0444);
 #endif
 
-
 static const struct pci_device_id pciidlist[] = {
 #ifdef  CONFIG_DRM_AMDGPU_SI
         {0x1002, 0x6780, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI},
@@ -566,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"
@@ -604,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;