From: jsg <jsg@openbsd.org>
Date: Fri, 16 Jun 2023 00:52:40 +0000 (+0000)
Subject: drm/amd/amdgpu: limit one queue per gang
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=281cd0f43ef22691395bddfca6c9a17823e58ff2;p=openbsd

drm/amd/amdgpu: limit one queue per gang

From Jack Xiao
f3078be2febb77ed484ed59ff86ce15f49c65ddb in linux-6.1.y/6.1.31
5ee33d905f89c18d4b33da6e5eefdae6060502df in mainline linux
---

diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_mes.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_mes.c
index 9bbd7cd61e7..ce199de94ad 100644
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_mes.c
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_mes.c
@@ -1328,12 +1328,9 @@ int amdgpu_mes_self_test(struct amdgpu_device *adev)
 	struct amdgpu_mes_ctx_data ctx_data = {0};
 	struct amdgpu_ring *added_rings[AMDGPU_MES_CTX_MAX_RINGS] = { NULL };
 	int gang_ids[3] = {0};
-	int queue_types[][2] = { { AMDGPU_RING_TYPE_GFX,
-				   AMDGPU_MES_CTX_MAX_GFX_RINGS},
-				 { AMDGPU_RING_TYPE_COMPUTE,
-				   AMDGPU_MES_CTX_MAX_COMPUTE_RINGS},
-				 { AMDGPU_RING_TYPE_SDMA,
-				   AMDGPU_MES_CTX_MAX_SDMA_RINGS } };
+	int queue_types[][2] = { { AMDGPU_RING_TYPE_GFX, 1 },
+				 { AMDGPU_RING_TYPE_COMPUTE, 1 },
+				 { AMDGPU_RING_TYPE_SDMA, 1} };
 	int i, r, pasid, k = 0;
 
 	pasid = amdgpu_pasid_alloc(16);