| From ac9ae6af78d71e1731cd1450c0e7c13b9edc15d1 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 9 Mar 2021 10:30:15 -0500 |
| Subject: drm/amdgpu : Fix asic reset regression issue introduce by |
| 8f211fe8ac7c4f |
| |
| From: shaoyunl <shaoyun.liu@amd.com> |
| |
| [ Upstream commit c8941550aa66b2a90f4b32c45d59e8571e33336e ] |
| |
| This recent change introduce SDMA interrupt info printing with irq->process function. |
| These functions do not require a set function to enable/disable the irq |
| |
| Signed-off-by: shaoyunl <shaoyun.liu@amd.com> |
| Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c |
| index afbbec82a289..9be945d8e72f 100644 |
| --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c |
| +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c |
| @@ -535,7 +535,7 @@ void amdgpu_irq_gpu_reset_resume_helper(struct amdgpu_device *adev) |
| for (j = 0; j < AMDGPU_MAX_IRQ_SRC_ID; ++j) { |
| struct amdgpu_irq_src *src = adev->irq.client[i].sources[j]; |
| |
| - if (!src) |
| + if (!src || !src->funcs || !src->funcs->set) |
| continue; |
| for (k = 0; k < src->num_types; k++) |
| amdgpu_irq_update(adev, src, k); |
| -- |
| 2.30.2 |
| |
