From 7f03b148d51c2339625e414dffd5bd133fc2475e Mon Sep 17 00:00:00 2001 From: Hawking Zhang Date: Mon, 21 Dec 2020 11:46:58 +0800 Subject: [PATCH] drm/amdgpu: set ih soft ring enabled flag for vega and navi software ih ring is enabled in vega10 and navi ih block by default. Signed-off-by: Hawking Zhang Reviewed-by: Feifei Xu Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 3 +++ drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/navi10_ih.c b/drivers/gpu/drm/amd/amdgpu/navi10_ih.c index 580a325f08b4..04cc41b82661 100644 --- a/drivers/gpu/drm/amd/amdgpu/navi10_ih.c +++ b/drivers/gpu/drm/amd/amdgpu/navi10_ih.c @@ -370,6 +370,9 @@ static int navi10_ih_irq_init(struct amdgpu_device *adev) /* enable wptr force update for self int */ force_update_wptr_for_self_int(adev, 0, 8, true); + if (adev->irq.ih_soft.ring_size) + adev->irq.ih_soft.enabled = true; + return 0; } diff --git a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c index b1d94421c8d1..1581113477cf 100644 --- a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c +++ b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c @@ -307,6 +307,9 @@ static int vega10_ih_irq_init(struct amdgpu_device *adev) if (ret) return ret; + if (adev->irq.ih_soft.ring_size) + adev->irq.ih_soft.enabled = true; + return 0; } -- 2.11.0