diff options
| author | Wentao Lou <Wentao.Lou@amd.com> | 2019-03-13 18:01:42 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2019-03-20 23:39:47 -0500 |
| commit | f81e8d532a4f383f8efe72173d5f757d3320fc79 (patch) | |
| tree | f9c4eeb0e711c57f8bf82ec1c7fab5a50cd70ba7 /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
| parent | 1791e54f0121ad9733c5b8f42cd7d1604e4f07a5 (diff) | |
| download | kernel_replicant_linux-f81e8d532a4f383f8efe72173d5f757d3320fc79.tar.gz kernel_replicant_linux-f81e8d532a4f383f8efe72173d5f757d3320fc79.tar.bz2 kernel_replicant_linux-f81e8d532a4f383f8efe72173d5f757d3320fc79.zip | |
drm/amdkfd/sriov:Put the pre and post reset in exclusive mode v2
add amdgpu_amdkfd_pre_reset and amdgpu_amdkfd_post_reset inside amdgpu_device_reset_sriov.
Signed-off-by: Wentao Lou <Wentao.Lou@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 69d74c0a5cbe..05f508a9641a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -3234,6 +3234,8 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev, if (r) return r; + amdgpu_amdkfd_pre_reset(adev); + /* Resume IP prior to SMC */ r = amdgpu_device_ip_reinit_early_sriov(adev); if (r) @@ -3253,6 +3255,7 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev, amdgpu_irq_gpu_reset_resume_helper(adev); r = amdgpu_ib_ring_tests(adev); + amdgpu_amdkfd_post_reset(adev); error: amdgpu_virt_init_data_exchange(adev); |