Commit 40b832aa authored by Mukul Joshi's avatar Mukul Joshi Committed by Alex Deucher
Browse files

drm/amdgpu: Enable IH CAM on GFX9.4.3 



This patch enables IH CAM on GFX9.4.3 ASIC.

Signed-off-by: default avatarMukul Joshi <mukul.joshi@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3cde9117

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

+2 −2
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static void nbio_v7_9_ih_doorbell_range(struct amdgpu_device *adev, 
		ih_doorbell_range = REG_SET_FIELD(ih_doorbell_range,

				DOORBELL0_CTRL_ENTRY_0,

				BIF_DOORBELL0_RANGE_SIZE_ENTRY,

				0x4);

				0x8);



		ih_doorbell_ctrl = REG_SET_FIELD(ih_doorbell_ctrl,

				S2A_DOORBELL_ENTRY_1_CTRL,
@@ -278,7 +278,7 @@ static void nbio_v7_9_ih_doorbell_range(struct amdgpu_device *adev, 
				S2A_DOORBELL_PORT1_RANGE_OFFSET, 0);

		ih_doorbell_ctrl = REG_SET_FIELD(ih_doorbell_ctrl,

				S2A_DOORBELL_ENTRY_1_CTRL,

				S2A_DOORBELL_PORT1_RANGE_SIZE, 0x4);

				S2A_DOORBELL_PORT1_RANGE_SIZE, 0x8);

		ih_doorbell_ctrl = REG_SET_FIELD(ih_doorbell_ctrl,

				S2A_DOORBELL_ENTRY_1_CTRL,

				S2A_DOORBELL_PORT1_AWADDR_31_28_VALUE, 0);

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

+2 −1
Original line number Diff line number Diff line
@@ -334,7 +334,8 @@ static int vega20_ih_irq_init(struct amdgpu_device *adev) 
		vega20_setup_retry_doorbell(adev->irq.retry_cam_doorbell_index));



	/* Enable IH Retry CAM */

	if (adev->ip_versions[OSSSYS_HWIP][0] == IP_VERSION(4, 4, 0))

	if (adev->ip_versions[OSSSYS_HWIP][0] == IP_VERSION(4, 4, 0) ||

	    adev->ip_versions[OSSSYS_HWIP][0] == IP_VERSION(4, 4, 2))

		WREG32_FIELD15(OSSSYS, 0, IH_RETRY_INT_CAM_CNTL_ALDEBARAN,

			       ENABLE, 1);

	else