diff options
| author | Monk Liu <Monk.Liu@amd.com> | 2017-02-09 11:55:49 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-03-29 23:52:54 -0400 |
| commit | e4f0fdcc9c95f415b6ac54d0d309021a17b9b2a8 (patch) | |
| tree | bf1897344c8be9726525d7e6d93d42c242eab08d /drivers/gpu/drm/amd/amdgpu | |
| parent | 2245b60f9c3f5047c581f93d5a2656a0c5988c0e (diff) | |
drm/amdgpu:use hw_init for sriov_gpu_reset
no suspend invoked so after VF FLR by host, we just
call hw_init to reinitialize IPs.
Signed-off-by: Monk Liu <Monk.Liu@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 2abb76ae1551..552452a654a5 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -1607,7 +1607,7 @@ int amdgpu_suspend(struct amdgpu_device *adev) return 0; } -static int amdgpu_sriov_resume_early(struct amdgpu_device *adev) +static int amdgpu_sriov_reinit_early(struct amdgpu_device *adev) { int i, r; @@ -1618,7 +1618,7 @@ static int amdgpu_sriov_resume_early(struct amdgpu_device *adev) if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_COMMON || adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GMC || adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_IH) - r = adev->ip_blocks[i].version->funcs->resume(adev); + r = adev->ip_blocks[i].version->funcs->hw_init(adev); if (r) { DRM_ERROR("resume of IP block <%s> failed %d\n", @@ -1630,7 +1630,7 @@ static int amdgpu_sriov_resume_early(struct amdgpu_device *adev) return 0; } -static int amdgpu_sriov_resume_late(struct amdgpu_device *adev) +static int amdgpu_sriov_reinit_late(struct amdgpu_device *adev) { int i, r; @@ -1643,7 +1643,7 @@ static int amdgpu_sriov_resume_late(struct amdgpu_device *adev) adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_IH ) continue; - r = adev->ip_blocks[i].version->funcs->resume(adev); + r = adev->ip_blocks[i].version->funcs->hw_init(adev); if (r) { DRM_ERROR("resume of IP block <%s> failed %d\n", adev->ip_blocks[i].version->funcs->name, r); @@ -2375,13 +2375,13 @@ int amdgpu_sriov_gpu_reset(struct amdgpu_device *adev, bool voluntary) /* Resume IP prior to SMC */ - amdgpu_sriov_resume_early(adev); + amdgpu_sriov_reinit_early(adev); /* we need recover gart prior to run SMC/CP/SDMA resume */ amdgpu_ttm_recover_gart(adev); /* now we are okay to resume SMC/CP/SDMA */ - amdgpu_sriov_resume_late(adev); + amdgpu_sriov_reinit_late(adev); amdgpu_irq_gpu_reset_resume_helper(adev); |