diff options
author | Christian König <christian.koenig@amd.com> | 2020-11-03 14:22:50 +0100 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2020-11-24 12:06:55 -0500 |
commit | d4581f7dfbe1f115b9f72f80a7f1febb52940bbd (patch) | |
tree | 891dd1f70c7186fd5a2d87fff85f4612b4042aa4 /drivers/gpu/drm/amd/amdgpu/navi10_ih.c | |
parent | drm/amdgpu: make sure retry faults are handled in a work item on Vega (diff) | |
download | linux-dev-d4581f7dfbe1f115b9f72f80a7f1febb52940bbd.tar.xz linux-dev-d4581f7dfbe1f115b9f72f80a7f1febb52940bbd.zip |
drm/amdgpu: enabled software IH ring for Navi
Felix pointed out that we need this for Navi as well.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/navi10_ih.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/navi10_ih.c b/drivers/gpu/drm/amd/amdgpu/navi10_ih.c index 837769fcb35b..ce0a02a4b5d9 100644 --- a/drivers/gpu/drm/amd/amdgpu/navi10_ih.c +++ b/drivers/gpu/drm/amd/amdgpu/navi10_ih.c @@ -136,6 +136,9 @@ static void navi10_ih_enable_interrupts(struct amdgpu_device *adev) } adev->irq.ih2.enabled = true; } + + if (adev->irq.ih_soft.ring_size) + adev->irq.ih_soft.enabled = true; } /** @@ -695,6 +698,10 @@ static int navi10_ih_sw_init(void *handle) (adev->doorbell_index.ih + 2) << 1; } + r = amdgpu_ih_ring_init(adev, &adev->irq.ih_soft, PAGE_SIZE, true); + if (r) + return r; + r = amdgpu_irq_init(adev); return r; |