Skip to contentSkip to conversation

drm/amdkfd: Adjust three dmesg printings during initialization

PATCH In review Yong Zhao 2 participants 5 messages Apr 17, 2020

Subsystems (3)
lore
Share & tools
lore

Yong Zhao

author
#0 lore raw

PATCH 1/3 drm/amdkfd: Adjust three dmesg printings during initialization

Delete two printings which are not very useful, and change one from pr_info() to pr_debug().

---
 drivers/gpu/drm/amd/amdkfd/kfd_crat.c     | 2 +-
 drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_crat.c +1 -1
index de9f68d5c312..1009a3b8dcc2 100644
@@ -502,7 +502,7 @@ int kfd_parse_crat_table(void *crat_image, struct list_head *device_list,
 	num_nodes = crat_table->num_domains;
 	image_len = crat_table->length;
 
-	pr_info("Parsing CRAT table with %d nodes\n", num_nodes);
+	pr_debug("Parsing CRAT table with %d nodes\n", num_nodes);
 
 	for (node_id = 0; node_id < num_nodes; node_id++) {
 		top_dev = kfd_create_topology_device(device_list);
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +0 -2
index 5db42814dd51..46dcf74ee2e0 100644
@@ -787,7 +787,6 @@ static int kfd_topology_update_sysfs(void)
 {
 	int ret;
 
-	pr_info("Creating topology SYSFS entries\n");
 	if (!sys_props.kobj_topology) {
 		sys_props.kobj_topology =
 				kfd_alloc_struct(sys_props.kobj_topology);
@@ -1048,7 +1047,6 @@ int kfd_topology_init(void)
 		sys_props.generation_count++;
 		kfd_update_system_properties();
 		kfd_debug_print_topology();
-		pr_info("Finished initializing topology\n");
 	} else
 		pr_err("Failed to update topology in sysfs ret=%d\n", ret);
 
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
author
#1 lore raw

PATCH 2/3 drm/amdgpu: Adjust the SDMA doorbell info printing

Add more detail while turning off the printing by default, because it is very useful.

---
 drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 2 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +1 -1
index 352cd9632770..c0ca9a8229e1 100644
@@ -1851,7 +1851,7 @@ static int sdma_v4_0_sw_init(void *handle)
 		ring->ring_obj = NULL;
 		ring->use_doorbell = true;
 
-		DRM_INFO("use_doorbell being set to: [%s]\n",
+		DRM_DEBUG("SDMA %d use_doorbell being set to: [%s]\n", i,
 				ring->use_doorbell?"true":"false");
 
 		/* doorbell size is 2 dwords, get DWORD offset */
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +1 -1
index f7b2bcf3f293..764f455ada75 100644
@@ -1260,7 +1260,7 @@ static int sdma_v5_0_sw_init(void *handle)
 		ring->ring_obj = NULL;
 		ring->use_doorbell = true;
 
-		DRM_INFO("use_doorbell being set to: [%s]\n",
+		DRM_DEBUG("SDMA %d use_doorbell being set to: [%s]\n", i,
 				ring->use_doorbell?"true":"false");
 
 		ring->doorbell_index = (i == 0) ?
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
author
#2 lore raw

PATCH 3/3 drm/amdgpu: Print CU information by default during initialization

In reply to Yong Zhao

This is convenient for multiple teams to obtain the information.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -1
index 71ea56e220ae..92b7a1ff1dc1 100644
@@ -3170,7 +3170,7 @@ int amdgpu_device_init(struct amdgpu_device *adev,
 		goto failed;
 	}
 
-	DRM_DEBUG("SE %d, SH per SE %d, CU per SH %d, active_cu_number %d\n",
+	DRM_INFO("SE %d, SH per SE %d, CU per SH %d, active_cu_number %d\n",
 			adev->gfx.config.max_shader_engines,
 			adev->gfx.config.max_sh_per_se,
 			adev->gfx.config.max_cu_per_sh,
Signature · 6 lines
2.17.1

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

Re: [PATCH 3/3] drm/amdgpu: Print CU information by default during initialization

Quoted 13 lines · Yong Zhao

This is convenient for multiple teams to obtain the information.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0 -0
index 71ea56e220ae..92b7a1ff1dc1 100644

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

Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -1
@@ -3170,7 +3170,7 @@ int amdgpu_device_init(struct amdgpu_device *adev,
                goto failed;
        }
 
-       DRM_DEBUG("SE %d, SH per SE %d, CU per SH %d, active_cu_number %d\n",
+       DRM_INFO("SE %d, SH per SE %d, CU per SH %d, active_cu_number %d\n",

While you are at it, replace this with pr_info or dev_info. The output is more useful with multiple devices in a system.

Alex

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0 -1
                        adev->gfx.config.max_shader_engines,
                        adev->gfx.config.max_sh_per_se,
                        adev->gfx.config.max_cu_per_sh,
--

2.17.1

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

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

Reviewed-by on v1 1/3
#4 lore raw
In reply to Yong Zhao

Patches 1, 2 are:

Quoted 46 lines · Yong Zhao

Delete two printings which are not very useful, and change one from pr_info() to pr_debug().

---
 drivers/gpu/drm/amd/amdkfd/kfd_crat.c     | 2 +-
 drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_crat.c +1 -1
index de9f68d5c312..1009a3b8dcc2 100644
@@ -502,7 +502,7 @@ int kfd_parse_crat_table(void *crat_image, struct list_head *device_list,
        num_nodes = crat_table->num_domains;
        image_len = crat_table->length;
 
-       pr_info("Parsing CRAT table with %d nodes\n", num_nodes);
+       pr_debug("Parsing CRAT table with %d nodes\n", num_nodes);
 
        for (node_id = 0; node_id < num_nodes; node_id++) {
                top_dev = kfd_create_topology_device(device_list);
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +0 -3
index 5db42814dd51..46dcf74ee2e0 100644
@@ -787,7 +787,6 @@ static int kfd_topology_update_sysfs(void)
 {
        int ret;
 
-       pr_info("Creating topology SYSFS entries\n");
        if (!sys_props.kobj_topology) {
                sys_props.kobj_topology =
                                kfd_alloc_struct(sys_props.kobj_topology);
@@ -1048,7 +1047,6 @@ int kfd_topology_init(void)
                sys_props.generation_count++;
                kfd_update_system_properties();
                kfd_debug_print_topology();
-               pr_info("Finished initializing topology\n");
        } else
                pr_err("Failed to update topology in sysfs ret=%d\n", ret);
 
--

2.17.1

Quoted 4 lines

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

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