5 files changed, 35 insertions, 7 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 54f71565e6cc..46f250c80a31 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -92,7 +92,7 @@ extern unsigned amdgpu_cg_mask;
 extern unsigned amdgpu_pg_mask;
 extern char *amdgpu_disable_cu;
 extern int amdgpu_sclk_deep_sleep_en;
-extern int amdgpu_virtual_display;
+extern char *amdgpu_virtual_display;
 
 #define AMDGPU_WAIT_IDLE_TIMEOUT_IN_MS          3000
 #define AMDGPU_MAX_USEC_TIMEOUT                 100000  /* 100 ms */
@@ -2072,6 +2072,7 @@ struct amdgpu_device {
         atomic_t                        gpu_reset_counter;
 
         /* display */
+        bool                            enable_virtual_display;
         struct amdgpu_mode_info         mode_info;
         struct work_struct              hotplug_work;
         struct amdgpu_irq_src           crtc_irq;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 4bf9bd96a46e..3751d262de68 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -46,6 +46,7 @@
 #endif
 #include "vi.h"
 #include "bif/bif_4_1_d.h"
+#include <linux/pci.h>
 
 static int amdgpu_debugfs_regs_init(struct amdgpu_device *adev);
 static void amdgpu_debugfs_regs_cleanup(struct amdgpu_device *adev);
@@ -1181,11 +1182,37 @@ int amdgpu_ip_block_version_cmp(struct amdgpu_device *adev,
         return 1;
 }
 
+static void amdgpu_whether_enable_virtual_display(struct amdgpu_device *adev)
+{
+        adev->enable_virtual_display = false;
+
+        if (amdgpu_virtual_display) {
+                struct drm_device *ddev = adev->ddev;
+                const char *pci_address_name = pci_name(ddev->pdev);
+                char *pciaddstr, *pciaddstr_tmp, *pciaddname;
+
+                pciaddstr = kstrdup(amdgpu_virtual_display, GFP_KERNEL);
+                pciaddstr_tmp = pciaddstr;
+                while ((pciaddname = strsep(&pciaddstr_tmp, ";"))) {
+                        if (!strcmp(pci_address_name, pciaddname)) {
+                                adev->enable_virtual_display = true;
+                                break;
+                        }
+                }
+
+                DRM_INFO("virtual display string:%s, %s:virtual_display:%d\n",
+                                 amdgpu_virtual_display, pci_address_name,
+                                 adev->enable_virtual_display);
+
+                kfree(pciaddstr);
+        }
+}
+
 static int amdgpu_early_init(struct amdgpu_device *adev)
 {
         int i, r;
 
-        DRM_INFO("virtual display enabled:%d\n", amdgpu_virtual_display);
+        amdgpu_whether_enable_virtual_display(adev);
 
         switch (adev->asic_type) {
         case CHIP_TOPAZ:
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 421dbbfd5e1b..58b1db82f589 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -90,7 +90,7 @@ unsigned amdgpu_pcie_lane_cap = 0;
 unsigned amdgpu_cg_mask = 0xffffffff;
 unsigned amdgpu_pg_mask = 0xffffffff;
 char *amdgpu_disable_cu = NULL;
-int amdgpu_virtual_display = 0;
+char *amdgpu_virtual_display = NULL;
 
 MODULE_PARM_DESC(vramlimit, "Restrict VRAM for testing, in megabytes");
 module_param_named(vramlimit, amdgpu_vram_limit, int, 0600);
@@ -190,8 +190,8 @@ module_param_named(pg_mask, amdgpu_pg_mask, uint, 0444);
 MODULE_PARM_DESC(disable_cu, "Disable CUs (se.sh.cu,...)");
 module_param_named(disable_cu, amdgpu_disable_cu, charp, 0444);
 
-MODULE_PARM_DESC(virtual_display, "enable virtual display (0 = disable virtual display)");
-module_param_named(virtual_display, amdgpu_virtual_display, int, 0444);
+MODULE_PARM_DESC(virtual_display, "Enable virtual display feature (the virtual_display will be set like xxxx:xx:xx.x;xxxx:xx:xx.x)");
+module_param_named(virtual_display, amdgpu_virtual_display, charp, 0444);
 
 static const struct pci_device_id pciidlist[] = {
 #ifdef CONFIG_DRM_AMDGPU_CIK
diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c
index e539b28dbef7..825de800b798 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik.c
@@ -2323,7 +2323,7 @@ static const struct amdgpu_ip_block_version kaveri_ip_blocks_vd[] =
 
 int cik_set_ip_blocks(struct amdgpu_device *adev)
 {
-        if (amdgpu_virtual_display) {
+        if (adev->enable_virtual_display) {
                 switch (adev->asic_type) {
                 case CHIP_BONAIRE:
                         adev->ip_blocks = bonaire_ip_blocks_vd;
diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
index 69c2f8175e68..f2e8aa1a0dbd 100644
--- a/drivers/gpu/drm/amd/amdgpu/vi.c
+++ b/drivers/gpu/drm/amd/amdgpu/vi.c
@@ -1441,7 +1441,7 @@ static const struct amdgpu_ip_block_version cz_ip_blocks_vd[] =
 
 int vi_set_ip_blocks(struct amdgpu_device *adev)
 {
-        if (amdgpu_virtual_display) {
+        if (adev->enable_virtual_display) {
                 switch (adev->asic_type) {
                 case CHIP_TOPAZ:
                         adev->ip_blocks = topaz_ip_blocks_vd;