diff --git a/patches.kernel.org/6.2.12-096-drm-amdgpu-add-mes-resume-when-do-gfx-post-sof.patch b/patches.kernel.org/6.2.12-096-drm-amdgpu-add-mes-resume-when-do-gfx-post-sof.patch new file mode 100644 index 0000000..3d4b138 --- /dev/null +++ b/patches.kernel.org/6.2.12-096-drm-amdgpu-add-mes-resume-when-do-gfx-post-sof.patch @@ -0,0 +1,56 @@ +From: Tong Liu01 +Date: Wed, 15 Mar 2023 15:24:22 +0800 +Subject: [PATCH] drm/amdgpu: add mes resume when do gfx post soft reset +References: bsc#1012628 +Patch-mainline: 6.2.12 +Git-commit: 4eb0b49a0ad3e004a6a65b84efe37bc7e66d560f + +[ Upstream commit 4eb0b49a0ad3e004a6a65b84efe37bc7e66d560f ] + +[why] +when gfx do soft reset, mes will also do reset, if mes is not +resumed when do recover from soft reset, mes is unable to respond +in later sequence + +[how] +resume mes when do gfx post soft reset + +Signed-off-by: Tong Liu01 +Acked-by: Alex Deucher +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +Signed-off-by: Jiri Slaby +--- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +index 66eb102c..c748d92c 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +@@ -4625,6 +4625,14 @@ static bool gfx_v11_0_check_soft_reset(void *handle) + return false; + } + ++static int gfx_v11_0_post_soft_reset(void *handle) ++{ ++ /** ++ * GFX soft reset will impact MES, need resume MES when do GFX soft reset ++ */ ++ return amdgpu_mes_resume((struct amdgpu_device *)handle); ++} ++ + static uint64_t gfx_v11_0_get_gpu_clock_counter(struct amdgpu_device *adev) + { + uint64_t clock; +@@ -6096,6 +6104,7 @@ static const struct amd_ip_funcs gfx_v11_0_ip_funcs = { + .wait_for_idle = gfx_v11_0_wait_for_idle, + .soft_reset = gfx_v11_0_soft_reset, + .check_soft_reset = gfx_v11_0_check_soft_reset, ++ .post_soft_reset = gfx_v11_0_post_soft_reset, + .set_clockgating_state = gfx_v11_0_set_clockgating_state, + .set_powergating_state = gfx_v11_0_set_powergating_state, + .get_clockgating_state = gfx_v11_0_get_clockgating_state, +-- +2.35.3 + diff --git a/series.conf b/series.conf index 8f3d86e..e00f8c4 100644 --- a/series.conf +++ b/series.conf @@ -2323,6 +2323,7 @@ patches.kernel.org/6.2.12-093-nvme-send-Identify-with-CNS-06h-only-to-I-O-co.patch patches.kernel.org/6.2.12-094-wifi-iwlwifi-mvm-fix-mvmtxq-stopped-handling.patch patches.kernel.org/6.2.12-095-wifi-iwlwifi-mvm-protect-TXQ-list-manipulation.patch + patches.kernel.org/6.2.12-096-drm-amdgpu-add-mes-resume-when-do-gfx-post-sof.patch ######################################################## # Build fixes that apply to the vanilla kernel too.