Skip to content

Commit a7f9d98

Browse files
superm1alexdeucher
authored andcommitted
drm/amd: Update strapping for NBIO 2.5.0
This helps to avoid a spurious PME event on hotplug to Azalia. Cc: Vijendar Mukunda <[email protected]> Reported-and-tested-by: [email protected] Closes: https://bugzilla.kernel.org/show_bug.cgi?id=215884 Tested-by: Gabriel Marcano <[email protected]> Acked-by: Alex Deucher <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mario Limonciello <[email protected]> Signed-off-by: Alex Deucher <[email protected]> (cherry picked from commit 3f6f237) Cc: [email protected]
1 parent 85230ee commit a7f9d98

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,19 @@ const struct nbio_hdp_flush_reg nbio_v7_0_hdp_flush_reg = {
271271
.ref_and_mask_sdma1 = GPU_HDP_FLUSH_DONE__SDMA1_MASK,
272272
};
273273

274+
#define regRCC_DEV0_EPF6_STRAP4 0xd304
275+
#define regRCC_DEV0_EPF6_STRAP4_BASE_IDX 5
276+
274277
static void nbio_v7_0_init_registers(struct amdgpu_device *adev)
275278
{
279+
uint32_t data;
280+
281+
switch (adev->ip_versions[NBIO_HWIP][0]) {
282+
case IP_VERSION(2, 5, 0):
283+
data = RREG32_SOC15(NBIO, 0, regRCC_DEV0_EPF6_STRAP4) & ~BIT(23);
284+
WREG32_SOC15(NBIO, 0, regRCC_DEV0_EPF6_STRAP4, data);
285+
break;
286+
}
276287
}
277288

278289
#define MMIO_REG_HOLE_OFFSET (0x80000 - PAGE_SIZE)

0 commit comments

Comments
 (0)