Commit abb6fccb authored by Alex Sierra's avatar Alex Sierra Committed by Alex Deucher
Browse files

drm/amdgpu: enable ih1 ih2 for Arcturus only 

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



Signed-off-by: default avatarAlex Sierra <alex.sierra@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1545fbf9

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

+19 −11
Original line number Diff line number Diff line
@@ -306,6 +306,7 @@ static int navi10_ih_irq_init(struct amdgpu_device *adev) 
	} else {

		WREG32_SOC15(OSSSYS, 0, mmIH_RB_CNTL, ih_rb_cntl);

	}

	if (adev->irq.ih1.ring_size)

		navi10_ih_reroute_ih(adev);



	if (unlikely(adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT)) {
@@ -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;



	adev->irq.ih1.ring_size = 0;

	adev->irq.ih2.ring_size = 0;



	if (adev->asic_type < CHIP_NAVI10) {

		r = amdgpu_ih_ring_init(adev, &adev->irq.ih1, PAGE_SIZE, true);

		if (r)

			return r;



		adev->irq.ih1.use_doorbell = true;

	adev->irq.ih1.doorbell_index = (adev->doorbell_index.ih + 1) << 1;

		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.doorbell_index =

					(adev->doorbell_index.ih + 2) << 1;

	}



	r = amdgpu_irq_init(adev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE