From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 28 May 2023 14:04:07 +0000 (+0100)
Subject: 6.1-stable patches
X-Git-Tag: review~43
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df9dea7c77456cd05c2dcbd5165c465a5e3186c0;p=thirdparty%2Fkernel%2Fstable-queue.git

6.1-stable patches

added patches:
	drm-amd-amdgpu-limit-one-queue-per-gang.patch
---

diff --git a/queue-6.1/drm-amd-amdgpu-limit-one-queue-per-gang.patch b/queue-6.1/drm-amd-amdgpu-limit-one-queue-per-gang.patch
new file mode 100644
index 00000000000..527ce76a4e9
--- /dev/null
+++ b/queue-6.1/drm-amd-amdgpu-limit-one-queue-per-gang.patch
@@ -0,0 +1,39 @@
+From 5ee33d905f89c18d4b33da6e5eefdae6060502df Mon Sep 17 00:00:00 2001
+From: Jack Xiao <Jack.Xiao@amd.com>
+Date: Wed, 22 Mar 2023 09:31:16 +0800
+Subject: drm/amd/amdgpu: limit one queue per gang
+
+From: Jack Xiao <Jack.Xiao@amd.com>
+
+commit 5ee33d905f89c18d4b33da6e5eefdae6060502df upstream.
+
+Limit one queue per gang in mes self test,
+due to mes schq fw change.
+
+Signed-off-by: Jack Xiao <Jack.Xiao@amd.com>
+Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Cc: Mario Limonciello <mario.limonciello@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c |    9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
+@@ -1328,12 +1328,9 @@ int amdgpu_mes_self_test(struct amdgpu_d
+ 	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);
diff --git a/queue-6.1/series b/queue-6.1/series
index 528a3266516..4226e2fbb17 100644
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -48,3 +48,4 @@ binder-add-lockless-binder_alloc_-set-get-_vma.patch
 binder-fix-uaf-caused-by-faulty-buffer-cleanup.patch
 binder-fix-uaf-of-alloc-vma-in-race-with-munmap.patch
 selftests-memfd-fix-unknown-type-name-build-failure.patch
+drm-amd-amdgpu-limit-one-queue-per-gang.patch