redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

drm/amdgpu: handle ras resume 

Suspend will put irq, so resume need get irq back.
And in the same time, skip other ras initialization.

Signed-off-by: xinhui pan <xinhui.pan@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
hifive-unleashed-5.2
xinhui pan 2019-03-07 10:46:54 +08:00 committed by Alex Deucher
parent 9b54d20176
commit acbbee015b
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
View File

@ -3549,6 +3549,9 @@ static int gfx_v9_0_ecc_late_init(void *handle)
return 0;
}
if (*ras_if)
goto resume;
*ras_if = kmalloc(sizeof(**ras_if), GFP_KERNEL);
if (!*ras_if)
return -ENOMEM;
@ -3573,7 +3576,7 @@ static int gfx_v9_0_ecc_late_init(void *handle)
r = amdgpu_ras_sysfs_create(adev, &fs_info);
if (r)
goto sysfs;
resume:
r = amdgpu_irq_get(adev, &adev->gfx.cp_ecc_error_irq, 0);
if (r)
goto irq;

5
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
View File

@ -927,6 +927,9 @@ static int gmc_v9_0_ecc_late_init(void *handle)
amdgpu_ras_feature_enable(adev, &ras_block, 0);
return 0;
}
/* handle resume path. */
if (*ras_if)
goto resume;
*ras_if = kmalloc(sizeof(**ras_if), GFP_KERNEL);
if (!*ras_if)
@ -952,7 +955,7 @@ static int gmc_v9_0_ecc_late_init(void *handle)
r = amdgpu_ras_sysfs_create(adev, &fs_info);
if (r)
goto sysfs;
resume:
r = amdgpu_irq_get(adev, &adev->gmc.ecc_irq, 0);
if (r)
goto irq;

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

@ -1522,6 +1522,10 @@ static int sdma_v4_0_late_init(void *handle)
return 0;
}
/* handle resume path. */
if (*ras_if)
goto resume;
*ras_if = kmalloc(sizeof(**ras_if), GFP_KERNEL);
if (!*ras_if)
return -ENOMEM;
@ -1546,7 +1550,7 @@ static int sdma_v4_0_late_init(void *handle)
r = amdgpu_ras_sysfs_create(adev, &fs_info);
if (r)
goto sysfs;
resume:
r = amdgpu_irq_get(adev, &adev->sdma.ecc_irq, AMDGPU_SDMA_IRQ_ECC0);
if (r)
goto irq;