diff options
author | Rex Zhu <Rex.Zhu@amd.com> | 2018-10-03 04:10:45 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-10-10 15:48:28 -0400 |
commit | 73f847dbab26cd9b962ce03e413612d7a2b2b47d (patch) | |
tree | fbe9a3078fcdbdc5153ae5e4d70deff5b4f7da24 /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
parent | 009d9ed6c4b7b84dbff8314d74233da9237a4560 (diff) |
drm/amdgpu: Refine function amdgpu_device_ip_late_init
1. only call late_init when hw_init successful,
so check status.hw instand of status.valid in late_init.
2. set status.late_initialized true if late_init was not implemented.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Rex Zhu <Rex.Zhu@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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 95095a8d2125..eda3d1e60ced 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |||
@@ -1723,7 +1723,7 @@ static int amdgpu_device_ip_late_init(struct amdgpu_device *adev) | |||
1723 | int i = 0, r; | 1723 | int i = 0, r; |
1724 | 1724 | ||
1725 | for (i = 0; i < adev->num_ip_blocks; i++) { | 1725 | for (i = 0; i < adev->num_ip_blocks; i++) { |
1726 | if (!adev->ip_blocks[i].status.valid) | 1726 | if (!adev->ip_blocks[i].status.hw) |
1727 | continue; | 1727 | continue; |
1728 | if (adev->ip_blocks[i].version->funcs->late_init) { | 1728 | if (adev->ip_blocks[i].version->funcs->late_init) { |
1729 | r = adev->ip_blocks[i].version->funcs->late_init((void *)adev); | 1729 | r = adev->ip_blocks[i].version->funcs->late_init((void *)adev); |
@@ -1732,8 +1732,8 @@ static int amdgpu_device_ip_late_init(struct amdgpu_device *adev) | |||
1732 | adev->ip_blocks[i].version->funcs->name, r); | 1732 | adev->ip_blocks[i].version->funcs->name, r); |
1733 | return r; | 1733 | return r; |
1734 | } | 1734 | } |
1735 | adev->ip_blocks[i].status.late_initialized = true; | ||
1736 | } | 1735 | } |
1736 | adev->ip_blocks[i].status.late_initialized = true; | ||
1737 | } | 1737 | } |
1738 | 1738 | ||
1739 | amdgpu_device_set_cg_state(adev, AMD_CG_STATE_GATE); | 1739 | amdgpu_device_set_cg_state(adev, AMD_CG_STATE_GATE); |