OSDN Git Service

drm/amdgpu: adjust the kfd reset sequence in reset sriov function
authorshaoyunl <shaoyun.liu@amd.com>
Tue, 30 Nov 2021 02:29:05 +0000 (21:29 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 1 Dec 2021 22:09:30 +0000 (17:09 -0500)
commit428890a3fec131521cc59aac0d3c48bde9d76b7b
treea85192d7635db64751e90e40239725a9b7126185
parent2da34b7bb59e1caa9a336e0e20a76b8b6a4abea2
drm/amdgpu: adjust the kfd reset sequence in reset sriov function

This change revert previous commits:
9f4f2c1a3524 ("drm/amd/amdgpu: fix the kfd pre_reset sequence in sriov")
271fd38ce56d ("drm/amdgpu: move kfd post_reset out of reset_sriov function")

This change moves the amdgpu_amdkfd_pre_reset to an earlier place
in amdgpu_device_reset_sriov, presumably to address the sequence issue
that the first patch was originally meant to fix.

Some register access(GRBM_GFX_CNTL) only be allowed on full access
mode. Move kfd_pre_reset and  kfd_post_reset back inside reset_sriov
function.

Fixes: 9f4f2c1a3524 ("drm/amd/amdgpu: fix the kfd pre_reset sequence in sriov")
Fixes: 271fd38ce56d ("drm/amdgpu: move kfd post_reset out of reset_sriov function")
Signed-off-by: shaoyunl <shaoyun.liu@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c