diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2023-06-15 03:03:35 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2023-06-15 03:03:35 +0000 |
| commit | bf6b2b74db9c0f6eb3ac51e23c8877ea81b489f3 (patch) | |
| tree | e477571bec003a63535403405c6b03b4bc291d38 /sys | |
| parent | 148340cd0668068a2490d5ca9ae970751dbcfe90 (diff) | |
drm/amdgpu: drop gfx_v11_0_cp_ecc_error_irq_funcs
From Horatio Zhang
7b5a8a23acbc3ee50b23602b61db1563561faf84 in linux-6.1.y/6.1.30
720b47229a5b24061d1c2e29ddb6043a59178d79 in mainline linux
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/drm/amd/amdgpu/amdgpu_gfx.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_gfx.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_gfx.c index aacff489489..df5255c4a00 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_gfx.c +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_gfx.c @@ -685,9 +685,11 @@ int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *r if (r) return r; - r = amdgpu_irq_get(adev, &adev->gfx.cp_ecc_error_irq, 0); - if (r) - goto late_fini; + if (adev->gfx.cp_ecc_error_irq.funcs) { + r = amdgpu_irq_get(adev, &adev->gfx.cp_ecc_error_irq, 0); + if (r) + goto late_fini; + } } else { amdgpu_ras_feature_enable_on_boot(adev, ras_block, 0); } |