diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-06-26 15:23:15 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-06-26 15:23:23 +0200 |
| commit | a15b51375684c2bfa6017bb185139477e7a3b96c (patch) | |
| tree | 6a4d7b4e7f09b858782cf2e5c0601d9f778cab15 /drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | |
| parent | e94f1f96f108ba96c0ed8bf3fbdd8ee6a6703880 (diff) | |
| parent | 4e0871333661d2ec0ed3dc00a945c2160eccae77 (diff) | |
Merge branch 'for-next' into for-linus
Pull the 6.5-devel branch for upstreaming.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c index 9d3a0542c996..f3f541ba0aca 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c @@ -687,9 +687,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); } |