diff options
author | Tao Zhou <tao.zhou1@amd.com> | 2019-09-05 19:16:19 +0800 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2019-09-16 10:06:03 -0500 |
commit | 86edcc7dba53995ea9448e535d7eb21dff5245d0 (patch) | |
tree | 345bdbb6c283e2481712cc9b07b7f8bf7a850741 /drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | |
parent | 1bd252c57b0b3780694b60a42b403d5fd8265780 (diff) | |
download | talos-op-linux-86edcc7dba53995ea9448e535d7eb21dff5245d0.tar.gz talos-op-linux-86edcc7dba53995ea9448e535d7eb21dff5245d0.zip |
drm/amdgpu: move umc late init from gmc to umc block
umc late init is umc specific, it's more suitable to be put in umc block
Signed-off-by: Tao Zhou <tao.zhou1@amd.com>
Reviewed-by: Guchun Chen <guchun.chen@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c index 0c46a0144f1b..167e916e40be 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c @@ -797,9 +797,11 @@ static int gmc_v9_0_ecc_late_init(void *handle) .cb = gmc_v9_0_process_ras_data_cb, }; - r = amdgpu_gmc_ras_late_init(adev, &umc_ih_info); - if (r) - return r; + if (adev->umc.funcs && adev->umc.funcs->ras_late_init) { + r = adev->umc.funcs->ras_late_init(adev, &umc_ih_info); + if (r) + return r; + } if (adev->mmhub_funcs && adev->mmhub_funcs->ras_late_init) { r = adev->mmhub_funcs->ras_late_init(adev); |