From e8355dd77cf5e6f934a78d6d6e5eac8ff0717c6d Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Apr 19 2024 16:31:11 +0000 Subject: drm/amdgpu: always force full reset for SOC21 (stable-fixes). --- diff --git a/patches.suse/drm-amdgpu-always-force-full-reset-for-SOC21.patch b/patches.suse/drm-amdgpu-always-force-full-reset-for-SOC21.patch new file mode 100644 index 0000000..a284370 --- /dev/null +++ b/patches.suse/drm-amdgpu-always-force-full-reset-for-SOC21.patch @@ -0,0 +1,33 @@ +From 65ff8092e4802f96d87d3d7cde146961f5228265 Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Sat, 23 Mar 2024 20:46:53 -0400 +Subject: [PATCH] drm/amdgpu: always force full reset for SOC21 +Git-commit: 65ff8092e4802f96d87d3d7cde146961f5228265 +Patch-mainline: v6.9-rc4 +References: stable-fixes + +There are cases where soft reset seems to succeed, but +does not, so always use mode1/2 for now. + +Reviewed-by: Harish Kasiviswanathan +Signed-off-by: Alex Deucher +Cc: stable@vger.kernel.org +Acked-by: Takashi Iwai + +--- + drivers/gpu/drm/amd/amdgpu/soc21.c | 2 -- + 1 file changed, 2 deletions(-) + +--- a/drivers/gpu/drm/amd/amdgpu/soc21.c ++++ b/drivers/gpu/drm/amd/amdgpu/soc21.c +@@ -460,10 +460,8 @@ static bool soc21_need_full_reset(struct + { + switch (adev->ip_versions[GC_HWIP][0]) { + case IP_VERSION(11, 0, 0): +- return amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__UMC); + case IP_VERSION(11, 0, 2): + case IP_VERSION(11, 0, 3): +- return false; + default: + return true; + } diff --git a/series.conf b/series.conf index 005ac5d..2d5227f 100644 --- a/series.conf +++ b/series.conf @@ -46298,6 +46298,7 @@ patches.suse/drm-i915-Disable-port-sync-when-bigjoiner-is-used.patch patches.suse/drm-i915-vrr-Disable-VRR-when-using-bigjoiner.patch patches.suse/drm-amdkfd-Reset-GPU-on-queue-preemption-failure.patch + patches.suse/drm-amdgpu-always-force-full-reset-for-SOC21.patch patches.suse/iommu-vt-d-Allocate-local-memory-for-page-request-qu.patch # out-of-tree patches