Commit 65a24000 authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher
Browse files

drm/amd: Fix initialization for nbio 7.5.1 



A mistake has been made in the BIOS for some ASICs with NBIO 7.5.1
where some NBIO registers aren't properly setup.

Ensure that they're set during initialization.

Tested-by: default avatarRichard Gong <richard.gong@amd.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org # 6.1.x
parent c76e483c

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

+5 −0
Original line number Diff line number Diff line
@@ -382,6 +382,11 @@ static void nbio_v7_2_init_registers(struct amdgpu_device *adev) 
		if (def != data)

			WREG32_PCIE_PORT(SOC15_REG_OFFSET(NBIO, 0, regBIF1_PCIE_MST_CTRL_3), data);

		break;

	case IP_VERSION(7, 5, 1):

		data = RREG32_SOC15(NBIO, 0, regRCC_DEV2_EPF0_STRAP2);

		data &= ~RCC_DEV2_EPF0_STRAP2__STRAP_NO_SOFT_RESET_DEV2_F0_MASK;

		WREG32_SOC15(NBIO, 0, regRCC_DEV2_EPF0_STRAP2, data);

		fallthrough;

	default:

		def = data = RREG32_PCIE_PORT(SOC15_REG_OFFSET(NBIO, 0, regPCIE_CONFIG_CNTL));

		data = REG_SET_FIELD(data, PCIE_CONFIG_CNTL,