Re: [PATCH] drm/amdgpu: enable ih1 ih2 for Arcturus only

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Am 02.09.20 um 20:28 schrieb Felix Kuehling:
Am 2020-09-02 um 2:13 p.m. schrieb Alex Deucher:
On Wed, Sep 2, 2020 at 2:08 PM Alex Deucher <alexdeucher@xxxxxxxxx> wrote:
On Wed, Sep 2, 2020 at 1:01 PM Alex Sierra <alex.sierra@xxxxxxx> wrote:
Enable multi-ring ih1 and ih2 for Arcturus only.
For Navi10 family multi-ring has been disabled.
Apparently, having multi-ring enabled in Navi was causing
continus page fault interrupts.
Further investigation is needed to get to the root cause.
Related issue link:
https://gitlab.freedesktop.org/drm/amd/-/issues/1279

Before committing, let's verify that it fixes that issue.
Looking at the bug report, the OSS (presumably IH) block is causing a
write fault so I suspect arcturus may be affected by this as well.  We
should double check the ring sizes and allocations.
Alejandro has been doing a lot of testing on Arcturus and didn't run
into this problem. That's why I suggested only disabling the IH rings on
Navi10 for now. We need the extra rings on Arcturus for our HMM work.

I think we should further investigate this before applying any patches.

When Navi10 is affected it's likely that other Navi generations are as well since AFAIK the OSS hasn't changed much between generations.

Regards,
Christian.


Regards,
   Felix


Alex


Alex


Signed-off-by: Alex Sierra <alex.sierra@xxxxxxx>
---
  drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 30 ++++++++++++++++----------
  1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/navi10_ih.c b/drivers/gpu/drm/amd/amdgpu/navi10_ih.c
index 350f1bf063c6..4d73869870ab 100644
--- a/drivers/gpu/drm/amd/amdgpu/navi10_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/navi10_ih.c
@@ -306,7 +306,8 @@ static int navi10_ih_irq_init(struct amdgpu_device *adev)
         } else {
                 WREG32_SOC15(OSSSYS, 0, mmIH_RB_CNTL, ih_rb_cntl);
         }
-       navi10_ih_reroute_ih(adev);
+       if (adev->asic_type == CHIP_ARCTURUS)
+               navi10_ih_reroute_ih(adev);

         if (unlikely(adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT)) {
                 if (ih->use_bus_addr) {
@@ -668,19 +669,26 @@ static int navi10_ih_sw_init(void *handle)
         adev->irq.ih.use_doorbell = true;
         adev->irq.ih.doorbell_index = adev->doorbell_index.ih << 1;

-       r = amdgpu_ih_ring_init(adev, &adev->irq.ih1, PAGE_SIZE, true);
-       if (r)
-               return r;
+       adev->irq.ih1.ring_size = 0;
+       adev->irq.ih2.ring_size = 0;

-       adev->irq.ih1.use_doorbell = true;
-       adev->irq.ih1.doorbell_index = (adev->doorbell_index.ih + 1) << 1;
+       if (adev->asic_type == CHIP_ARCTURUS) {
+               r = amdgpu_ih_ring_init(adev, &adev->irq.ih1, PAGE_SIZE, true);
+               if (r)
+                       return r;

-       r = amdgpu_ih_ring_init(adev, &adev->irq.ih2, PAGE_SIZE, true);
-       if (r)
-               return r;
+               adev->irq.ih1.use_doorbell = true;
+               adev->irq.ih1.doorbell_index =
+                                       (adev->doorbell_index.ih + 1) << 1;
+
+               r = amdgpu_ih_ring_init(adev, &adev->irq.ih2, PAGE_SIZE, true);
+               if (r)
+                       return r;

-       adev->irq.ih2.use_doorbell = true;
-       adev->irq.ih2.doorbell_index = (adev->doorbell_index.ih + 2) << 1;
+               adev->irq.ih2.use_doorbell = true;
+               adev->irq.ih2.doorbell_index =
+                                       (adev->doorbell_index.ih + 2) << 1;
+       }

         r = amdgpu_irq_init(adev);

--
2.17.1

_______________________________________________
amd-gfx mailing list
amd-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
amd-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/amd-gfx




[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux