drm/amdgpu: Check aca enabled inside cper init/fini func

Move code about checking aca enabled to the cper init/fini function
to make code clean.

Signed-off-by: Xiang Liu <xiang.liu@amd.com>
Reviewed-by: Tao Zhou <tao.zhou1@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cper.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cper.c
index 8805381e19b990a3562e745f35042626a4f55b18..20c474a328524d585734ef5ebd0517f90f847975 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cper.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cper.c
@@ -538,6 +538,9 @@ static int amdgpu_cper_ring_init(struct amdgpu_device *adev)
 
 int amdgpu_cper_init(struct amdgpu_device *adev)
 {
+       if (!amdgpu_aca_is_enabled(adev))
+               return 0;
+
        mutex_init(&adev->cper.cper_lock);
 
        adev->cper.enabled = true;
@@ -548,6 +551,9 @@ int amdgpu_cper_init(struct amdgpu_device *adev)
 
 int amdgpu_cper_fini(struct amdgpu_device *adev)
 {
+       if (!amdgpu_aca_is_enabled(adev))
+               return 0;
+
        adev->cper.enabled = false;
 
        amdgpu_ring_fini(&(adev->cper.ring_buf));

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 5aa0b40322911465872665d1d25411442562e0f0..38260ffac6ee05950d785928ca28c02fb9ed7e81 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -3091,8 +3091,7 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev)
 
        amdgpu_fru_get_product_info(adev);
 
-       if (amdgpu_aca_is_enabled(adev))
-               r = amdgpu_cper_init(adev);
+       r = amdgpu_cper_init(adev);
 
 init_failed:
 
@@ -3454,8 +3453,7 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev)
 {
        int i, r;
 
-       if (amdgpu_aca_is_enabled(adev))
-               amdgpu_cper_fini(adev);
+       amdgpu_cper_fini(adev);
 
        if (amdgpu_sriov_vf(adev) && adev->virt.ras_init_done)
                amdgpu_virt_release_ras_err_handler_data(adev);