From: Jack Xiao Date: Mon, 7 Aug 2023 07:55:25 +0000 (+0800) Subject: drm/amdgpu/gfx12: recalculate available compute rings to use X-Git-Tag: io_uring-6.11-20240722~49^2~25^2~437 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=36b2ce477528964dd0fd7b8ae735d4dc185a1bb2;p=linux-block.git drm/amdgpu/gfx12: recalculate available compute rings to use Recalculate the number of compute rings to use based on the gfx hardware configuration. As needed reserve half of compute rings for mes, kgd can't use up all compute rings. Signed-off-by: Jack Xiao Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c index f3f8601d6e18..06244d97c283 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c @@ -1103,6 +1103,7 @@ static int gfx_v12_0_rlc_backdoor_autoload_enable(struct amdgpu_device *adev) static int gfx_v12_0_sw_init(void *handle) { int i, j, k, r, ring_id = 0; + unsigned num_compute_rings; int xcc_id = 0; struct amdgpu_device *adev = (struct amdgpu_device *)handle; @@ -1126,6 +1127,12 @@ static int gfx_v12_0_sw_init(void *handle) break; } + /* recalculate compute rings to use based on hardware configuration */ + num_compute_rings = (adev->gfx.mec.num_pipe_per_mec * + adev->gfx.mec.num_queue_per_pipe) / 2; + adev->gfx.num_compute_rings = min(adev->gfx.num_compute_rings, + num_compute_rings); + /* EOP Event */ r = amdgpu_irq_add_id(adev, SOC21_IH_CLIENTID_GRBM_CP, GFX_11_0_0__SRCID__CP_EOP_INTERRUPT,