6.0-stable patches

added patches:
	drm-amdgpu-skip-mes-for-s0ix-as-well-since-it-s-part-of-gfx.patch
	series

diff --git a/queue-6.0/drm-amdgpu-skip-mes-for-s0ix-as-well-since-it-s-part-of-gfx.patch b/queue-6.0/drm-amdgpu-skip-mes-for-s0ix-as-well-since-it-s-part-of-gfx.patch
new file mode 100644 (file)
index 0000000..da3b7d4
--- /dev/null
+++ b/queue-6.0/drm-amdgpu-skip-mes-for-s0ix-as-well-since-it-s-part-of-gfx.patch
@@ -0,0 +1,39 @@
+From afa6646b1c5d3affd541f76bd7476e4b835a9174 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Fri, 16 Dec 2022 11:42:20 -0500
+Subject: drm/amdgpu: skip MES for S0ix as well since it's part of GFX
+
+From: Alex Deucher <alexander.deucher@amd.com>
+
+commit afa6646b1c5d3affd541f76bd7476e4b835a9174 upstream.
+
+It's also part of gfxoff.
+
+Cc: stable@vger.kernel.org # 6.0, 6.1
+Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+@@ -2998,14 +2998,15 @@ static int amdgpu_device_ip_suspend_phas
+                       continue;
+               }
+ 
+-              /* skip suspend of gfx and psp for S0ix
++              /* skip suspend of gfx/mes and psp for S0ix
+                * gfx is in gfxoff state, so on resume it will exit gfxoff just
+                * like at runtime. PSP is also part of the always on hardware
+                * so no need to suspend it.
+                */
+               if (adev->in_s0ix &&
+                   (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_PSP ||
+-                   adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GFX))
++                   adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GFX ||
++                   adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_MES))
+                       continue;
+ 
+               /* XXX handle errors */

diff --git a/queue-6.0/series b/queue-6.0/series
new file mode 100644 (file)
index 0000000..f70ea5c
--- /dev/null
+++ b/queue-6.0/series
@@ -0,0 +1 @@
+drm-amdgpu-skip-mes-for-s0ix-as-well-since-it-s-part-of-gfx.patch