Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amdgpu: do not register df_mca interrupt in certain config

df/mca ras is not managed by gpu driver when gpu
is connected to cpu through xgmi. gpu driver should
register x86 mca notifier for umc ras error
notification

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Dennis Li <Dennis.Li@amd.com>
Reviewed-by: John Clements <John.Clements@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Hawking Zhang and committed by
Alex Deucher
68d705dd 49070c4e

+4 -2
+4 -2
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
··· 653 653 adev->gmc.vm_fault.num_types = 1; 654 654 adev->gmc.vm_fault.funcs = &gmc_v9_0_irq_funcs; 655 655 656 - if (!amdgpu_sriov_vf(adev)) { 656 + if (!amdgpu_sriov_vf(adev) && 657 + !adev->gmc.xgmi.connected_to_cpu) { 657 658 adev->gmc.ecc_irq.num_types = 1; 658 659 adev->gmc.ecc_irq.funcs = &gmc_v9_0_ecc_funcs; 659 660 } ··· 1507 1506 if (r) 1508 1507 return r; 1509 1508 1510 - if (!amdgpu_sriov_vf(adev)) { 1509 + if (!amdgpu_sriov_vf(adev) && 1510 + !adev->gmc.xgmi.connected_to_cpu) { 1511 1511 /* interrupt sent to DF. */ 1512 1512 r = amdgpu_irq_add_id(adev, SOC15_IH_CLIENTID_DF, 0, 1513 1513 &adev->gmc.ecc_irq);