From 8ab43b4b982a8c7fa8fcfc4353cd8960d56d6f3a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 4 Jan 2023 12:41:47 +0100 Subject: [PATCH] 6.0-stable patches added patches: drm-amdgpu-skip-mes-for-s0ix-as-well-since-it-s-part-of-gfx.patch series --- ...-s0ix-as-well-since-it-s-part-of-gfx.patch | 39 +++++++++++++++++++ queue-6.0/series | 1 + 2 files changed, 40 insertions(+) create mode 100644 queue-6.0/drm-amdgpu-skip-mes-for-s0ix-as-well-since-it-s-part-of-gfx.patch create mode 100644 queue-6.0/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 index 00000000000..da3b7d4ac2e --- /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 +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 + +commit afa6646b1c5d3affd541f76bd7476e4b835a9174 upstream. + +It's also part of gfxoff. + +Cc: stable@vger.kernel.org # 6.0, 6.1 +Reviewed-by: Mario Limonciello +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman +--- + 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 index 00000000000..f70ea5ce168 --- /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 -- 2.47.3