drm/amdkfd: Add an error print if SDMA RLC is not idle
Subsystems (3)
PATCH 1/3 drm/amdkfd: Add an error print if SDMA RLC is not idle
The message will be useful when troubleshooting the issues.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 8 ++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 8 ++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 8 ++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 8 ++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 8 ++++++-- 5 files changed, 30 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c +6 -2
@@ -124,8 +124,10 @@ static int kgd_hqd_sdma_load(struct kgd_dev *kgd, void *mqd, data =RREG32 (rlc_reg_offset + mmSDMA0_RLC0_CONTEXT_STATUS);if (data &SDMA0_RLC0_CONTEXT_STATUS__IDLE_MASK )break ; -if (time_after (jiffies, end_jiffies)) +if (time_after (jiffies, end_jiffies)) { +pr_err ("SDMA RLC not idle in %s\n" , __func__);return -ETIME ; + }usleep_range (500 ,1000 ); }
@@ -239,8 +241,10 @@ static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd, temp =RREG32 (rlc_reg_offset + mmSDMA0_RLC0_CONTEXT_STATUS);if (temp &SDMA0_RLC0_CONTEXT_STATUS__IDLE_MASK )break ; -if (time_after (jiffies, end_jiffies)) +if (time_after (jiffies, end_jiffies)) { +pr_err ("SDMA RLC not idle in %s\n" , __func__);return -ETIME ; + }usleep_range (500 ,1000 ); }
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c +6 -2
@@ -507,8 +507,10 @@ static int kgd_hqd_sdma_load(struct kgd_dev *kgd, void *mqd, data =RREG32 (rlc_reg_offset + mmSDMA0_RLC0_CONTEXT_STATUS);if (data &SDMA0_RLC0_CONTEXT_STATUS__IDLE_MASK )break ; -if (time_after (jiffies, end_jiffies)) +if (time_after (jiffies, end_jiffies)) { +pr_err ("SDMA RLC not idle in %s\n" , __func__);return -ETIME ; + }usleep_range (500 ,1000 ); }
@@ -752,8 +754,10 @@ static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd, temp =RREG32 (rlc_reg_offset + mmSDMA0_RLC0_CONTEXT_STATUS);if (temp &SDMA0_RLC0_CONTEXT_STATUS__IDLE_MASK )break ; -if (time_after (jiffies, end_jiffies)) +if (time_after (jiffies, end_jiffies)) { +pr_err ("SDMA RLC not idle in %s\n" , __func__);return -ETIME ; + }usleep_range (500 ,1000 ); }
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c +6 -2
@@ -427,8 +427,10 @@ static int kgd_hqd_sdma_load(struct kgd_dev *kgd, void *mqd, data =RREG32 (sdma_base_addr + mmSDMA0_RLC0_CONTEXT_STATUS);if (data &SDMA0_RLC0_CONTEXT_STATUS__IDLE_MASK )break ; -if (time_after (jiffies, end_jiffies)) +if (time_after (jiffies, end_jiffies)) { +pr_err ("SDMA RLC not idle in %s\n" , __func__);return -ETIME ; + }usleep_range (500 ,1000 ); }if (m->sdma_engine_id) {
@@ -660,8 +662,10 @@ static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd, temp =RREG32 (sdma_base_addr + mmSDMA0_RLC0_CONTEXT_STATUS);if (temp &SDMA0_RLC0_CONTEXT_STATUS__IDLE_MASK )break ; -if (time_after (jiffies, end_jiffies)) +if (time_after (jiffies, end_jiffies)) { +pr_err ("SDMA RLC not idle in %s\n" , __func__);return -ETIME ; + }usleep_range (500 ,1000 ); }
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c +6 -2
@@ -411,8 +411,10 @@ static int kgd_hqd_sdma_load(struct kgd_dev *kgd, void *mqd, data =RREG32 (sdma_base_addr + mmSDMA0_RLC0_CONTEXT_STATUS);if (data &SDMA0_RLC0_CONTEXT_STATUS__IDLE_MASK )break ; -if (time_after (jiffies, end_jiffies)) +if (time_after (jiffies, end_jiffies)) { +pr_err ("SDMA RLC not idle in %s\n" , __func__);return -ETIME ; + }usleep_range (500 ,1000 ); }if (m->sdma_engine_id) {
@@ -656,8 +658,10 @@ static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd, temp =RREG32 (sdma_base_addr + mmSDMA0_RLC0_CONTEXT_STATUS);if (temp &SDMA0_RLC0_CONTEXT_STATUS__IDLE_MASK )break ; -if (time_after (jiffies, end_jiffies)) +if (time_after (jiffies, end_jiffies)) { +pr_err ("SDMA RLC not idle in %s\n" , __func__);return -ETIME ; + }usleep_range (500 ,1000 ); }
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +6 -2
@@ -404,8 +404,10 @@ static int kgd_hqd_sdma_load(struct kgd_dev *kgd, void *mqd, data =RREG32 (rlc_reg_offset + mmSDMA0_RLC0_CONTEXT_STATUS);if (data &SDMA0_RLC0_CONTEXT_STATUS__IDLE_MASK )break ; -if (time_after (jiffies, end_jiffies)) +if (time_after (jiffies, end_jiffies)) { +pr_err ("SDMA RLC not idle in %s\n" , __func__);return -ETIME ; + }usleep_range (500 ,1000 ); }
@@ -591,8 +593,10 @@ static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd, temp =RREG32 (rlc_reg_offset + mmSDMA0_RLC0_CONTEXT_STATUS);if (temp &SDMA0_RLC0_CONTEXT_STATUS__IDLE_MASK )break ; -if (time_after (jiffies, end_jiffies)) +if (time_after (jiffies, end_jiffies)) { +pr_err ("SDMA RLC not idle in %s\n" , __func__);return -ETIME ; + }usleep_range (500 ,1000 ); }
Signature · 6 lines
2.17.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): [email protected]
PATCH 2/3 drm/amdkfd: Remove excessive print when reserving doorbells
The dozens of printing messages are compressed into 2 lines.
--- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_process.c +8 -4
@@ -693,6 +693,8 @@ static int init_doorbell_bitmap(struct qcm_process_device *qpd, struct kfd_dev *dev) {unsigned int i; +int range_start = dev->shared_resources.non_cp_doorbells_start; +int range_end = dev->shared_resources.non_cp_doorbells_end;if (!KFD_IS_SOC15 (dev->device_info->asic_family))return 0 ;
@@ -704,14 +706,16 @@ static int init_doorbell_bitmap(struct qcm_process_device *qpd,return -ENOMEM ;/* Mask out doorbells reserved for SDMA, IH, and VCN on SOC15. */ +pr_debug ("reserved doorbell 0x%03x - 0x%03x\n" , range_start, range_end); +pr_debug ("reserved doorbell 0x%03x - 0x%03x\n" , + range_start +KFD_QUEUE_DOORBELL_MIRROR_OFFSET , + range_end +KFD_QUEUE_DOORBELL_MIRROR_OFFSET ); +for (i =0 ; i <KFD_MAX_NUM_OF_QUEUES_PER_PROCESS /2 ; i++) { -if (i >= dev->shared_resources.non_cp_doorbells_start - && i <= dev->shared_resources.non_cp_doorbells_end) { +if (i >= range_start && i <= range_end) {set_bit (i, qpd->doorbell_bitmap);set_bit (i +KFD_QUEUE_DOORBELL_MIRROR_OFFSET , qpd->doorbell_bitmap); -pr_debug ("reserved doorbell 0x%03x and 0x%03x\n" , i, - i +KFD_QUEUE_DOORBELL_MIRROR_OFFSET ); } }
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/3 drm/amdkfd: Remove unnecessary pm_init() for non HWS mode
In reply to a message not in the archiveThe packet manager is not needed for non HWS mode except Hawaii, so only initialize it for Hawaii under non HWS mode. This will simplify debugging under non HWS mode for all new asics, because it eliminates one variable out of the equation in non HWS mode
--- drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +8 -2
@@ -902,12 +902,18 @@ static void uninitialize(struct device_queue_manager *dqm)static int start_nocpsch (struct device_queue_manager *dqm) {init_interrupts (dqm); -return pm_init (&dqm->packets, dqm); + +if (dqm->dev->device_info->asic_family ==CHIP_HAWAII ) +return pm_init (&dqm->packets, dqm); + +return 0 ; }static int stop_nocpsch (struct device_queue_manager *dqm) { -pm_uninit (&dqm->packets); +if (dqm->dev->device_info->asic_family ==CHIP_HAWAII ) +pm_uninit (&dqm->packets); +return 0 ; }
Signature · 6 lines
2.17.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): [email protected]
Deucher, Alexander
Reviewed-byRe: [PATCH 3/3] drm/amdkfd: Remove unnecessary pm_init() for non HWS mode
Series is:
________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Zhao, Yong <[email protected]>
Sent: Monday, September 23, 2019 12:30 AM
To: [email protected] <[email protected]>
Cc: Zhao, Yong <[email protected]>
Subject: [PATCH 3/3] drm/amdkfd: Remove unnecessary pm_init() for non HWS mode
The packet manager is not needed for non HWS mode except Hawaii, so only initialize it for Hawaii under non HWS mode. This will simplify debugging under non HWS mode for all new asics, because it eliminates one variable out of the equation in non HWS mode
--- drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +8 -2
@@ -902,12 +902,18 @@ static void uninitialize(struct device_queue_manager *dqm)static int start_nocpsch (struct device_queue_manager *dqm) {init_interrupts (dqm); -return pm_init (&dqm->packets, dqm); + +if (dqm->dev->device_info->asic_family ==CHIP_HAWAII ) +return pm_init (&dqm->packets, dqm); + +return 0 ; }static int stop_nocpsch (struct device_queue_manager *dqm) { -pm_uninit (&dqm->packets); +if (dqm->dev->device_info->asic_family ==CHIP_HAWAII ) +pm_uninit (&dqm->packets); +return 0 ; }
--
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