diff options
author | Emily Deng <Emily.Deng@amd.com> | 2018-09-10 05:51:31 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-09-10 23:45:42 -0400 |
commit | 39186aefac362ba3df65a953290ebd025d0c2bf0 (patch) | |
tree | 99919da3e0ecfefa20600f96ed6cafcaa97243fc /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
parent | fbbf794cbd4872cc4e894ab236d45c97b98008ea (diff) |
drm/amdgpu: move PSP init prior to IH in gpu reset
since we use PSP to program IH regs now
Signed-off-by: Monk Liu <Monk.Liu@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Emily Deng <Emily.Deng@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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 93476b8c2e72..acfc63e68b08 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |||
@@ -1957,6 +1957,7 @@ static int amdgpu_device_ip_reinit_early_sriov(struct amdgpu_device *adev) | |||
1957 | static enum amd_ip_block_type ip_order[] = { | 1957 | static enum amd_ip_block_type ip_order[] = { |
1958 | AMD_IP_BLOCK_TYPE_GMC, | 1958 | AMD_IP_BLOCK_TYPE_GMC, |
1959 | AMD_IP_BLOCK_TYPE_COMMON, | 1959 | AMD_IP_BLOCK_TYPE_COMMON, |
1960 | AMD_IP_BLOCK_TYPE_PSP, | ||
1960 | AMD_IP_BLOCK_TYPE_IH, | 1961 | AMD_IP_BLOCK_TYPE_IH, |
1961 | }; | 1962 | }; |
1962 | 1963 | ||
@@ -1987,7 +1988,6 @@ static int amdgpu_device_ip_reinit_late_sriov(struct amdgpu_device *adev) | |||
1987 | 1988 | ||
1988 | static enum amd_ip_block_type ip_order[] = { | 1989 | static enum amd_ip_block_type ip_order[] = { |
1989 | AMD_IP_BLOCK_TYPE_SMC, | 1990 | AMD_IP_BLOCK_TYPE_SMC, |
1990 | AMD_IP_BLOCK_TYPE_PSP, | ||
1991 | AMD_IP_BLOCK_TYPE_DCE, | 1991 | AMD_IP_BLOCK_TYPE_DCE, |
1992 | AMD_IP_BLOCK_TYPE_GFX, | 1992 | AMD_IP_BLOCK_TYPE_GFX, |
1993 | AMD_IP_BLOCK_TYPE_SDMA, | 1993 | AMD_IP_BLOCK_TYPE_SDMA, |