drm/amdkfd: Update CWSR grace period for GFX9.4.3
Subsystems (3)
PATCH 1/1 drm/amdkfd: Update CWSR grace period for GFX9.4.3
For GFX9.4.3, setup a reduced default CWSR grace period equal to 1000 cycles instead of 64000 cycles.
Signed-off-by Mukul Joshi <[email protected]>
Reviewed-by Felix Kuehling <[email protected]>
--- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 2 +- .../drm/amd/amdkfd/kfd_device_queue_manager.c | 22 ++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +1 -1
@@ -1109,7 +1109,7 @@ void kgd_gfx_v9_build_grace_period_packet_info(struct amdgpu_device *adev, *reg_data = wait_times;/* -* The CP cannont handle a 0 grace period input and will result in +* The CP cannot handle a 0 grace period input and will result in * an infinite grace period being set so set to 1 to prevent this. */ if (grace_period ==0 )
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +21 -1
@@ -1622,7 +1622,7 @@ static int initialize_cpsch(struct device_queue_manager *dqm)if (dqm->dev->kfd2kgd->get_iq_wait_times) dqm->dev->kfd2kgd->get_iq_wait_times (dqm->dev->adev, &dqm->wait_times, -0 ); +ffs (dqm->dev->xcc_mask) -1 );return 0 ; }
@@ -1664,6 +1664,26 @@ static int start_cpsch(struct device_queue_manager *dqm)if (!dqm->dev->kfd->shared_resources.enable_mes)execute_queues_cpsch (dqm,KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES ,0 ,USE_DEFAULT_GRACE_PERIOD ); + +/* Set CWSR grace period to 1x1000 cycle for GFX9.4.3 APU */ +if (amdgpu_emu_mode ==0 && dqm->dev->adev->gmc.is_app_apu && + (KFD_GC_VERSION (dqm->dev) ==IP_VERSION (9 ,4 ,3 ))) { +uint32_t reg_offset =0 ; +uint32_t grace_period =1 ; + + retval =pm_update_grace_period (&dqm->packet_mgr, + grace_period); +if (retval) +pr_err ("Setting grace timeout failed\n" ); +else if (dqm->dev->kfd2kgd->build_grace_period_packet_info) +/* Update dqm->wait_times maintained in software */ + dqm->dev->kfd2kgd->build_grace_period_packet_info ( + dqm->dev->adev, dqm->wait_times, + grace_period, ®_offset, + &dqm->wait_times, +ffs (dqm->dev->xcc_mask) -1 ); + } +dqm_unlock (dqm);return 0 ;
Signature · 1 line
2.35.1