drm/amdgpu: Set chicken bit for gfx_v12.1 xnack
Subsystems (3)
Alex Deucher
maintainerPATCH 1/3 drm/amdgpu: Set chicken bit for gfx_v12.1 xnack
From: Harish Kasiviswanathan <[email protected]>
For xnack on, set TCP_PERFCOUNTER_FILTER.COMPRESSION_ENABLE to 1 For xnack off, set TCP_PERFCOUNTER_FILTER.COMPRESSION_ENABLE to 0
--- drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c +15 -0
@@ -1475,6 +1475,19 @@ static void gfx_v12_1_get_tcc_info(struct amdgpu_device *adev) { } +static void gfx_v12_1_xcc_xnack_set_chicken_bits (struct amdgpu_device *adev,int xcc_id) +{ +/* NOTE: COMPRESSION_ENABLE is used a chicken bit to enable/disable xcc xnack */ +mutex_lock (&adev->srbm_mutex); +if (!adev->gmc.noretry) { +WREG32_FIELD15_PREREG (GC ,GET_INST (GC , xcc_id), +TCP_PERFCOUNTER_FILTER ,COMPRESSION_ENABLE ,0x1 ); + }else +WREG32_FIELD15_PREREG (GC ,GET_INST (GC , xcc_id), +TCP_PERFCOUNTER_FILTER ,COMPRESSION_ENABLE ,0x0 ); +mutex_unlock (&adev->srbm_mutex); +} +static void gfx_v12_1_xcc_constants_init (struct amdgpu_device *adev,int xcc_id) {
@@ -1502,6 +1515,8 @@ static void gfx_v12_1_xcc_constants_init(struct amdgpu_device *adev,mutex_unlock (&adev->srbm_mutex);gfx_v12_1_xcc_init_compute_vmid (adev, xcc_id); +gfx_v12_1_xcc_xnack_set_chicken_bits (adev, xcc_id); + }static void gfx_v12_1_constants_init (struct amdgpu_device *adev)
Signature · 1 line
2.53.0
Alex Deucher
maintainerPATCH 2/3 drm/amdgpu: Set default xnack mode for gfx_v12.1 A0/B0
From: Harish Kasiviswanathan <[email protected]>
For A0, default xnack mode is off
For BO, default xnack mode is on
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +3 -0
@@ -1004,6 +1004,9 @@ void amdgpu_gmc_noretry_set(struct amdgpu_device *adev) gc_ver ==IP_VERSION (9 ,5 ,0 ) || gc_ver >= IP_VERSION(10, 3, 0)); +/* For GFX12.1 B0, set xnack (retry) on as default */ +if (gc_ver ==IP_VERSION (12 ,1 ,0 ) && (adev->rev_id &0xf ) ==0x1 ) + noretry_default = false;if (!amdgpu_sriov_xnack_support (adev)) gmc->noretry =1 ;else
Signature · 1 line
2.53.0
Alex Deucher
maintainerPATCH 3/3 drm/amdkfd: Limit per-process xnack support for GFX12.1
In reply to Alex DeucherFrom: Harish Kasiviswanathan <[email protected]>
GFX12.1 doesn't support different processes with different xnack setting. Hence, xnack changes from its default setting needs driver reload with noretry module parameter.
However, if driver boots-up with xnack on and process sets xnack off, this condition is supported. In this case, only driver takes xnack off path whereas hardware / firmware considers xnack is on.
--- .../amdkfd/kfd_device_queue_manager_v12_1.c | 19 +++++++++++-------- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 +-- 2 files changed, 12 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v12_1.c +11 -8
@@ -54,6 +54,7 @@ static int update_qpd_v12_1(struct device_queue_manager *dqm,struct kfd_process_device *pdd;struct amdgpu_device *adev = dqm->dev->adev;struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_GFXHUB (0 )]; +bool xnack_enabled; pdd =qpd_to_pdd (qpd); qpd->vm_cntx_cntl = hub->vm_cntx_cntl;
@@ -71,16 +72,18 @@ static int update_qpd_v12_1(struct device_queue_manager *dqm, qpd->sh_mem_ape1_base =0 ; } -if (KFD_SUPPORT_XNACK_PER_PROCESS (dqm->dev)) { -if (!pdd->process->xnack_enabled) { - qpd->sh_mem_config |=1 <<SH_MEM_CONFIG__RETRY_DISABLE__SHIFT ; - qpd->vm_cntx_cntl &= + xnack_enabled =KFD_SUPPORT_XNACK_PER_PROCESS (dqm->dev) ? + pdd->process->xnack_enabled : + !pdd->dev->kfd->noretry; + +if (!xnack_enabled) { + qpd->sh_mem_config |=1 <<SH_MEM_CONFIG__RETRY_DISABLE__SHIFT ; + qpd->vm_cntx_cntl &= ~(1 <<GCVM_CONTEXT0_CNTL__RETRY_PERMISSION_OR_INVALID_PAGE_FAULT__SHIFT ); - }else { - qpd->sh_mem_config &= ~(1 <<SH_MEM_CONFIG__RETRY_DISABLE__SHIFT ); - qpd->vm_cntx_cntl |= + }else { + qpd->sh_mem_config &= ~(1 <<SH_MEM_CONFIG__RETRY_DISABLE__SHIFT ); + qpd->vm_cntx_cntl |= (1 <<GCVM_CONTEXT0_CNTL__RETRY_PERMISSION_OR_INVALID_PAGE_FAULT__SHIFT ); - } } qpd->sh_mem_bases =compute_sh_mem_bases_64bit (pdd);
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +1 -2
@@ -215,8 +215,7 @@ enum cache_policy { ((KFD_GC_VERSION (dev) ==IP_VERSION (9 ,4 ,2 )) || \ (KFD_GC_VERSION (dev) ==IP_VERSION (9 ,4 ,3 )) || \ (KFD_GC_VERSION (dev) ==IP_VERSION (9 ,4 ,4 )) || \ - (KFD_GC_VERSION (dev) ==IP_VERSION (9 ,5 ,0 )) || \ - (KFD_GC_VERSION(dev) == IP_VERSION(12, 1, 0))) + (KFD_GC_VERSION(dev) == IP_VERSION(9, 5, 0)))struct kfd_node ;
Signature · 1 line
2.53.0