drm/amdgpu: fix MES GFX mask
Subsystems (2)
PATCH 1/1 drm/amdgpu: fix MES GFX mask
Current MES GFX mask prevents FW to enable oversubscription. This patch does the following:
- Fixes the mask values and adds a description for the same
- Removes the central mask setup and makes it IP specific, as it would be different when the number of pipes and queues are different.
Cc Christian König <[email protected]>
Cc Alex Deucher <[email protected]>
Signed-off-by Shashank Sharma <[email protected]>
Signed-off-by Arvind Yadav <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 3 --- drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 1 - drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 9 +++++++-- drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 9 +++++++-- 4 files changed, 14 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +0 -3
@@ -148,9 +148,6 @@ int amdgpu_mes_init(struct amdgpu_device *adev) adev->mes.compute_hqd_mask[i] =0xc ; } -for (i =0 ; i <AMDGPU_MES_MAX_GFX_PIPES ; i++) - adev->mes.gfx_hqd_mask[i] = i ?0 :0xfffffffe ; -for (i =0 ; i <AMDGPU_MES_MAX_SDMA_PIPES ; i++) {if (amdgpu_ip_version (adev,SDMA0_HWIP ,0 ) <IP_VERSION (6 ,0 ,0 ))
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h +0 -1
@@ -109,7 +109,6 @@ struct amdgpu_mes {uint32_t vmid_mask_gfxhub;uint32_t vmid_mask_mmhub;uint32_t compute_hqd_mask[AMDGPU_MES_MAX_COMPUTE_PIPES ]; -uint32_t gfx_hqd_mask[AMDGPU_MES_MAX_GFX_PIPES ];uint32_t sdma_hqd_mask[AMDGPU_MES_MAX_SDMA_PIPES ];uint32_t aggregated_doorbells[AMDGPU_MES_PRIORITY_NUM_LEVELS ];uint32_t sch_ctx_offs;
drivers/gpu/drm/amd/amdgpu/mes_v10_1.c +7 -2
@@ -290,8 +290,13 @@ static int mes_v10_1_set_hw_resources(struct amdgpu_mes *mes) mes_set_hw_res_pkt.compute_hqd_mask[i] = mes->compute_hqd_mask[i]; -for (i =0 ; i <MAX_GFX_PIPES ; i++) - mes_set_hw_res_pkt.gfx_hqd_mask[i] = mes->gfx_hqd_mask[i]; +/* +* GFX pipe 0 queue 0 is being used by kernel +* Set GFX pipe 0 queue 1 for MES scheduling +* GFX pipe 1 can't be used for MES due to HW limitation. +*/ + mes_set_hw_res_pkt.gfx_hqd_mask[0 ] =0x2 ; + mes_set_hw_res_pkt.gfx_hqd_mask[1 ] =0 ;for (i =0 ; i <MAX_SDMA_PIPES ; i++) mes_set_hw_res_pkt.sdma_hqd_mask[i] = mes->sdma_hqd_mask[i];
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +7 -2
@@ -384,8 +384,13 @@ static int mes_v11_0_set_hw_resources(struct amdgpu_mes *mes) mes_set_hw_res_pkt.compute_hqd_mask[i] = mes->compute_hqd_mask[i]; -for (i =0 ; i <MAX_GFX_PIPES ; i++) - mes_set_hw_res_pkt.gfx_hqd_mask[i] = mes->gfx_hqd_mask[i]; +/* +* GFX pipe 0 queue 0 is being used by kernel +* Set GFX pipe 0 queue 1 for MES scheduling +* GFX pipe 1 can't be used for MES due to HW limitation. +*/ + mes_set_hw_res_pkt.gfx_hqd_mask[0 ] =0x2 ; + mes_set_hw_res_pkt.gfx_hqd_mask[1 ] =0 ;for (i =0 ; i <MAX_SDMA_PIPES ; i++) mes_set_hw_res_pkt.sdma_hqd_mask[i] = mes->sdma_hqd_mask[i];
Signature · 1 line
2.43.2