drm/amdgpu: dequeue mes scheduler during fini
Subsystems (2)
PATCH v3 1/1 drm/amdgpu: dequeue mes scheduler during fini
[Why]
If mes is not dequeued during fini, mes will be in an uncleaned state during reload, then mes couldn't receive some commands which leads to reload failure.
[How]
Perform MES dequeue via MMIO after all the unmap jobs are done by mes and before kiq fini.
v3: Move the dequeue operation inside kiq_hw_fini.
--- drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 42 ++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +39 -3
@@ -1151,6 +1151,42 @@ static int mes_v11_0_sw_fini(void *handle)return 0 ; } +static void mes_v11_0_kiq_dequeue_sched (struct amdgpu_device *adev) +{ +uint32_t data; +int i; + +mutex_lock (&adev->srbm_mutex); +soc21_grbm_select (adev,3 ,AMDGPU_MES_SCHED_PIPE ,0 ,0 ); + +/* disable the queue if it's active */ +if (RREG32_SOC15 (GC ,0 , regCP_HQD_ACTIVE) &1 ) { +WREG32_SOC15 (GC ,0 , regCP_HQD_DEQUEUE_REQUEST,1 ); +for (i =0 ; i < adev->usec_timeout; i++) { +if (!(RREG32_SOC15 (GC ,0 , regCP_HQD_ACTIVE) &1 )) +break ; +udelay (1 ); + } + } + data =RREG32_SOC15 (GC ,0 , regCP_HQD_PQ_DOORBELL_CONTROL); + data =REG_SET_FIELD (data,CP_HQD_PQ_DOORBELL_CONTROL , +DOORBELL_EN ,0 ); + data =REG_SET_FIELD (data,CP_HQD_PQ_DOORBELL_CONTROL , +DOORBELL_HIT ,1 ); +WREG32_SOC15 (GC ,0 , regCP_HQD_PQ_DOORBELL_CONTROL, data); + +WREG32_SOC15 (GC ,0 , regCP_HQD_PQ_DOORBELL_CONTROL,0 ); + +WREG32_SOC15 (GC ,0 , regCP_HQD_PQ_WPTR_LO,0 ); +WREG32_SOC15 (GC ,0 , regCP_HQD_PQ_WPTR_HI,0 ); +WREG32_SOC15 (GC ,0 , regCP_HQD_PQ_RPTR,0 ); + +soc21_grbm_select (adev,0 ,0 ,0 ,0 ); +mutex_unlock (&adev->srbm_mutex); + + adev->mes.ring.sched.ready = false; +} +static void mes_v11_0_kiq_setting (struct amdgpu_ring *ring) {uint32_t tmp;
@@ -1202,6 +1238,9 @@ static int mes_v11_0_kiq_hw_init(struct amdgpu_device *adev)static int mes_v11_0_kiq_hw_fini (struct amdgpu_device *adev) { +if (adev->mes.ring.sched.ready) +mes_v11_0_kiq_dequeue_sched (adev); +mes_v11_0_enable (adev, false);return 0 ; }
@@ -1257,9 +1296,6 @@ static int mes_v11_0_hw_init(void *handle)static int mes_v11_0_hw_fini (void *handle) { -struct amdgpu_device *adev = (struct amdgpu_device *)handle; - - adev->mes.ring.sched.ready = false;return 0 ; }
Signature · 1 line
2.25.1
[AMD Official Use Only - General]
Regards,
Jack
________________________________
From: amd-gfx <[email protected]> on behalf of YuBiao Wang <[email protected]>
Sent: Tuesday, 18 October 2022 13:37
To: [email protected] <[email protected]>
Cc: Wang, YuBiao <[email protected]>; Grodzovsky, Andrey <[email protected]>; Xiao, Jack <[email protected]>; Xu, Feifei <[email protected]>; Chen, Horace <[email protected]>; Wang, Yang(Kevin) <[email protected]>; Tuikov, Luben <[email protected]>; Deucher, Alexander <[email protected]>; Quan, Evan <[email protected]>; Koenig, Christian <[email protected]>; Liu, Monk <[email protected]>; Zhang, Hawking <[email protected]>
Subject: [PATCH v3] drm/amdgpu: dequeue mes scheduler during fini
[Why]
If mes is not dequeued during fini, mes will be in an uncleaned state during reload, then mes couldn't receive some commands which leads to reload failure.
[How]
Perform MES dequeue via MMIO after all the unmap jobs are done by mes and before kiq fini.
v3: Move the dequeue operation inside kiq_hw_fini.
--- drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 42 ++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +39 -3
@@ -1151,6 +1151,42 @@ static int mes_v11_0_sw_fini(void *handle)return 0 ; } +static void mes_v11_0_kiq_dequeue_sched (struct amdgpu_device *adev) +{ +uint32_t data; +int i; + +mutex_lock (&adev->srbm_mutex); +soc21_grbm_select (adev,3 ,AMDGPU_MES_SCHED_PIPE ,0 ,0 ); + +/* disable the queue if it's active */ +if (RREG32_SOC15 (GC ,0 , regCP_HQD_ACTIVE) &1 ) { +WREG32_SOC15 (GC ,0 , regCP_HQD_DEQUEUE_REQUEST,1 ); +for (i =0 ; i < adev->usec_timeout; i++) { +if (!(RREG32_SOC15 (GC ,0 , regCP_HQD_ACTIVE) &1 )) +break ; +udelay (1 ); + } + } + data =RREG32_SOC15 (GC ,0 , regCP_HQD_PQ_DOORBELL_CONTROL); + data =REG_SET_FIELD (data,CP_HQD_PQ_DOORBELL_CONTROL , +DOORBELL_EN ,0 ); + data =REG_SET_FIELD (data,CP_HQD_PQ_DOORBELL_CONTROL , +DOORBELL_HIT ,1 ); +WREG32_SOC15 (GC ,0 , regCP_HQD_PQ_DOORBELL_CONTROL, data); + +WREG32_SOC15 (GC ,0 , regCP_HQD_PQ_DOORBELL_CONTROL,0 ); + +WREG32_SOC15 (GC ,0 , regCP_HQD_PQ_WPTR_LO,0 ); +WREG32_SOC15 (GC ,0 , regCP_HQD_PQ_WPTR_HI,0 ); +WREG32_SOC15 (GC ,0 , regCP_HQD_PQ_RPTR,0 ); + +soc21_grbm_select (adev,0 ,0 ,0 ,0 ); +mutex_unlock (&adev->srbm_mutex); + + adev->mes.ring.sched.ready = false; +} +static void mes_v11_0_kiq_setting (struct amdgpu_ring *ring) {uint32_t tmp;
@@ -1202,6 +1238,9 @@ static int mes_v11_0_kiq_hw_init(struct amdgpu_device *adev)static int mes_v11_0_kiq_hw_fini (struct amdgpu_device *adev) { +if (adev->mes.ring.sched.ready) +mes_v11_0_kiq_dequeue_sched (adev); +mes_v11_0_enable (adev, false);return 0 ; }
@@ -1257,9 +1296,6 @@ static int mes_v11_0_hw_init(void *handle)static int mes_v11_0_hw_fini (void *handle) { -struct amdgpu_device *adev = (struct amdgpu_device *)handle; - - adev->mes.ring.sched.ready = false;return 0 ; }
--
2.25.1