Skip to contentSkip to conversation

drm/amdgpu: Change the virtual_display type from int to char*.

PATCH Superseded Emily Deng 2 participants 3 messages Aug 9, 2016 2 messages not in the archive

Subsystems (2)

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Emily Deng

author
#0 lore raw

PATCH 1/1 drm/amdgpu: Change the virtual_display type from int to char*.

For virtual display feature, as there may be mutiple GPUs, for user could choose whiche GPU need to enable this feature, change the type of virtual_display from int to char*. The variable will be set like this virtual_display="xx:xx.x;xx:xx.x;".

---
 drivers/gpu/drm/amd/amdgpu/amdgpu.h        |  3 ++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 30 +++++++++++++++++++++++++++++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c    |  6 +++---
 drivers/gpu/drm/amd/amdgpu/cik.c           |  2 +-
 drivers/gpu/drm/amd/amdgpu/vi.c            |  2 +-
 5 files changed, 36 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 -1
index c309eaf..b6bed4e 100644
@@ -93,7 +93,7 @@ extern unsigned amdgpu_pcie_lane_cap;
 extern unsigned amdgpu_cg_mask;
 extern unsigned amdgpu_pg_mask;
 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 */
@@ -2142,6 +2142,7 @@ struct amdgpu_device {
 	struct kfd_dev          *kfd;
 
 	struct amdgpu_virtualization virtualization;
+	int enable_virtual_display;
 };
 
 bool amdgpu_device_is_px(struct drm_device *dev);
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +29 -1
index 68cce12..bcc6b3d 100644
@@ -47,6 +47,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);
@@ -1182,11 +1183,38 @@ 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 = 0;
+
+	if (amdgpu_virtual_display) {
+		char pci_address_name[8];
+		char *pciaddstr, *pciaddstr_tmp, *pciaddname;
+		struct drm_device *ddev = adev->ddev;
+
+		sprintf(pci_address_name, "%02x:%02x.%d", ddev->pdev->bus->number,
+			PCI_SLOT(ddev->pdev->devfn), PCI_FUNC(ddev->pdev->devfn));
+
+		pciaddstr = kstrdup(amdgpu_virtual_display, GFP_KERNEL);
+		pciaddstr_tmp = pciaddstr;
+		while ((pciaddname = strsep(&pciaddstr_tmp, ";"))) {
+			if (!strncmp(pci_address_name, pciaddname, sizeof(pci_address_name))) {
+				adev->enable_virtual_display = 1;
+				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:
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +3 -3
index 7007cf7..4202602 100644
@@ -90,7 +90,7 @@ unsigned amdgpu_pcie_gen_cap = 0;
 unsigned amdgpu_pcie_lane_cap = 0;
 unsigned amdgpu_cg_mask = 0xffffffff;
 unsigned amdgpu_pg_mask = 0xffffffff;
-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(cg_mask, amdgpu_cg_mask, uint, 0444);
 MODULE_PARM_DESC(pg_mask, "Powergating flags mask (0 = disable power gating)");
 module_param_named(pg_mask, amdgpu_pg_mask, uint, 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 xx:xx.x;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
drivers/gpu/drm/amd/amdgpu/cik.c +1 -1
index 4b48bcd..c97d700 100644
@@ -2464,7 +2464,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) {
 		amdgpu_dal = 0;
 		adev->mode_info.vsync_timer_enabled = AMDGPU_IRQ_STATE_DISABLE;
 		switch (adev->asic_type) {
drivers/gpu/drm/amd/amdgpu/vi.c +1 -1
index 4afa053..1e973b5 100644
@@ -1676,7 +1676,7 @@ static const struct amdgpu_ip_block_version fiji_ip_blocks_dal[] =
 
 int vi_set_ip_blocks(struct amdgpu_device *adev)
 {
-	if (amdgpu_virtual_display) {
+	if (adev->enable_virtual_display) {
 		amdgpu_dal = 0;
 		adev->mode_info.vsync_timer_enabled = AMDGPU_IRQ_STATE_DISABLE;
 		switch (adev->asic_type) {
Signature · 6 lines
1.9.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 1470721439-1736-1-git-send-email-Emily.Deng-5C7GfCeVMHo@public.gmane.org

#2 lore raw
Quoted 6 lines · Emily Deng

For virtual display feature, as there may be mutiple GPUs, for user could choose whiche GPU need to enable this feature, change the type of virtual_display from int to char*. The variable will be set like this virtual_display="xx:xx.x;xx:xx.x;".

When sending updated patches, it's nice to include a changelog describing what changed between revisions. This can be added either in the commit log itself or after the --- marker in the e-mail generated by git format-patch.

Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -0
@@ -1182,11 +1183,38 @@ int amdgpu_ip_block_version_cmp(struct amdgpu_device *adev,
 	return 1;
 }
 
+static void amdgpu_whether_enable_virtual_display(struct amdgpu_device *adev)

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c int amdgpu_ip_block_version_cmp(struct amdgpu_device *adev, · line 1196

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +10 -0
+{
+	adev->enable_virtual_display = 0;
+
+	if (amdgpu_virtual_display) {
+		char pci_address_name[8];
+		char *pciaddstr, *pciaddstr_tmp, *pciaddname;
+		struct drm_device *ddev = adev->ddev;
+
+		sprintf(pci_address_name, "%02x:%02x.%d", ddev->pdev->bus->number,
+			PCI_SLOT(ddev->pdev->devfn), PCI_FUNC(ddev->pdev->devfn));

Some systems have multiple PCI domains. The domain number needs to be included, before the bus number.

OTOH I'm not sure the PCI function number needs to be included. Do we ever do anything with a non-0 PCI function?

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c int amdgpu_ip_block_version_cmp(struct amdgpu_device *adev, · line 1201

Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +4 -0
+		pciaddstr = kstrdup(amdgpu_virtual_display, GFP_KERNEL);
+		pciaddstr_tmp = pciaddstr;
+		while ((pciaddname = strsep(&pciaddstr_tmp, ";"))) {
+			if (!strncmp(pci_address_name, pciaddname, sizeof(pci_address_name))) {

Please use strcmp instead of strncmp here, otherwise it will match different strings which contain the PCI address as a prefix.

Other than that, looks good to me.

Signature · 6 lines
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): f4846dde-df26-d16b-f4cf-a2604c4b5422-otUistvHUpPR7s880joybQ@public.gmane.org

#4 lore raw
Quoted 28 lines

-----Original Message-----
From: Michel Dänzer [mailto:[email protected]]
Sent: Tuesday, August 09, 2016 2:29 PM
To: Deng, Emily <[email protected]>
Cc: [email protected]
Subject: Re: [PATCH] drm/amdgpu: Change the virtual_display type from int to char*.

Quoted 6 lines · Emily Deng

For virtual display feature, as there may be mutiple GPUs, for user could choose whiche GPU need to enable this feature, change the type of virtual_display from int to char*. The variable will be set like this virtual_display="xx:xx.x;xx:xx.x;".

When sending updated patches, it's nice to include a changelog describing what changed between revisions. This can be added either in the commit log itself or after the --- marker in the e-mail generated by git format-patch.

Review int amdgpu_ip_block_version_cmp(struct

Quoted 1 line
(quoted diff) +0 -0
@@ -1182,11 +1183,38 @@ int amdgpu_ip_block_version_cmp(struct

amdgpu_device *adev,

Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0 -0
 	return 1;
 }
 
Quoted 16 lines

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c int amdgpu_ip_block_version_cmp(struct amdgpu_device *adev,

Quoted 13 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +11 -0
+static void amdgpu_whether_enable_virtual_display(struct
+amdgpu_device *adev) {
+	adev->enable_virtual_display = 0;
+
+	if (amdgpu_virtual_display) {
+		char pci_address_name[8];
+		char *pciaddstr, *pciaddstr_tmp, *pciaddname;
+		struct drm_device *ddev = adev->ddev;
+
+		sprintf(pci_address_name, "%02x:%02x.%d", ddev->pdev-
 bus->number,
+			PCI_SLOT(ddev->pdev->devfn), PCI_FUNC(ddev-
 pdev->devfn));

Some systems have multiple PCI domains. The domain number needs to be included, before the bus number.

[[EmilyD]] Ok, I will add.

Quoted 4 lines

OTOH I'm not sure the PCI function number needs to be included. Do we ever do anything with a non-0 PCI function?

[[EmilyD]] Yes, for SRIOV case, the PCI function may be non-0.

Quoted 10 lines

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c int amdgpu_ip_block_version_cmp(struct amdgpu_device *adev,

Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +5 -0
+		pciaddstr = kstrdup(amdgpu_virtual_display, GFP_KERNEL);
+		pciaddstr_tmp = pciaddstr;
+		while ((pciaddname = strsep(&pciaddstr_tmp, ";"))) {
+			if (!strncmp(pci_address_name, pciaddname,
+sizeof(pci_address_name))) {

Please use strcmp instead of strncmp here, otherwise it will match different strings which contain the PCI address as a prefix.

[[EmilyD]] Ok, I will modify it.

Quoted 7 lines

Other than that, looks good to me.

--
Earthling Michel Dänzer | http://www.amd.com
Libre software enthusiast | Mesa and X developer

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx