drm/amdgpu: add mes resume when do gfx post soft reset
authorjsg <jsg@openbsd.org>
Fri, 21 Apr 2023 03:42:20 +0000 (03:42 +0000)
committerjsg <jsg@openbsd.org>
Fri, 21 Apr 2023 03:42:20 +0000 (03:42 +0000)
From Tong Liu01
df27bcd0cf2b365d78f3875404de2ffb98651768 in linux-6.1.y/6.1.25
4eb0b49a0ad3e004a6a65b84efe37bc7e66d560f in mainline linux

sys/dev/pci/drm/amd/amdgpu/gfx_v11_0.c

index 46a82ed..e08d046 100644 (file)
@@ -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;
@@ -6068,6 +6076,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,