mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-04-11 00:09:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Xiang Liu
2025-02-19 12:21:59 +08:00
committed by Alex Deucher
parent 30eb41f5d1
commit 663a87763b
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/amd/amdgpu/amdgpu_cper.c
View File

@@ -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));

6
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
View File

@@ -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);