Skip to content

Commit

Permalink
drm/amdkfd/sriov:Put the pre and post reset in exclusive mode v2
Browse files Browse the repository at this point in the history
add amdgpu_amdkfd_pre_reset and amdgpu_amdkfd_post_reset inside amdgpu_device_reset_sriov.

Change-Id: Icf2839f0b620ce9d47d6414b6c32b9d06672f2ac
Signed-off-by: Wentao Lou <Wentao.Lou@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
  • Loading branch information
wentalou authored and changzhu committed Mar 15, 2019
1 parent ca32d47 commit c07301b
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -3269,6 +3269,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)
Expand All @@ -3288,6 +3290,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);
Expand Down

0 comments on commit c07301b

Please sign in to comment.