Skip to content

Commit f4fa4c9

Browse files
Timur Kristófalexdeucher
authored andcommitted
drm/amdgpu/iceland_ih: Enable soft IRQ handler ring
We are going to use the soft IRQ handler ring on GMC v8 to process interrupts from VM faults. Signed-off-by: Timur Kristóf <timur.kristof@gmail.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 45bef89 commit f4fa4c9

1 file changed

Lines changed: 10 additions & 0 deletions

File tree

drivers/gpu/drm/amd/amdgpu/iceland_ih.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,9 @@ static int iceland_ih_irq_init(struct amdgpu_device *adev)
157157
/* enable interrupts */
158158
iceland_ih_enable_interrupts(adev);
159159

160+
if (adev->irq.ih_soft.ring_size)
161+
adev->irq.ih_soft.enabled = true;
162+
160163
return 0;
161164
}
162165

@@ -194,6 +197,9 @@ static u32 iceland_ih_get_wptr(struct amdgpu_device *adev,
194197

195198
wptr = le32_to_cpu(*ih->wptr_cpu);
196199

200+
if (ih == &adev->irq.ih_soft)
201+
goto out;
202+
197203
if (!REG_GET_FIELD(wptr, IH_RB_WPTR, RB_OVERFLOW))
198204
goto out;
199205

@@ -296,6 +302,10 @@ static int iceland_ih_sw_init(struct amdgpu_ip_block *ip_block)
296302
if (r)
297303
return r;
298304

305+
r = amdgpu_ih_ring_init(adev, &adev->irq.ih_soft, IH_SW_RING_SIZE, true);
306+
if (r)
307+
return r;
308+
299309
r = amdgpu_irq_init(adev);
300310

301311
return r;

0 commit comments

Comments
 (0)