Skip to content

Commit

Permalink
drm/amd: Update strapping for NBIO 2.5.0
Browse files Browse the repository at this point in the history
This helps to avoid a spurious PME event on hotplug to Azalia.

Cc: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
Reported-and-tested-by: ionut_n2001@yahoo.com
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=215884
Tested-by: Gabriel Marcano <gabemarcano@yahoo.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Link: https://lore.kernel.org/r/20241211024414.7840-1-mario.limonciello@amd.com
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 3f6f237)
Cc: stable@vger.kernel.org
  • Loading branch information
superm1 authored and alexdeucher committed Dec 18, 2024
1 parent 85230ee commit a7f9d98
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,19 @@ const struct nbio_hdp_flush_reg nbio_v7_0_hdp_flush_reg = {
.ref_and_mask_sdma1 = GPU_HDP_FLUSH_DONE__SDMA1_MASK,
};

#define regRCC_DEV0_EPF6_STRAP4 0xd304
#define regRCC_DEV0_EPF6_STRAP4_BASE_IDX 5

static void nbio_v7_0_init_registers(struct amdgpu_device *adev)
{
uint32_t data;

switch (adev->ip_versions[NBIO_HWIP][0]) {
case IP_VERSION(2, 5, 0):
data = RREG32_SOC15(NBIO, 0, regRCC_DEV0_EPF6_STRAP4) & ~BIT(23);
WREG32_SOC15(NBIO, 0, regRCC_DEV0_EPF6_STRAP4, data);
break;
}
}

#define MMIO_REG_HOLE_OFFSET (0x80000 - PAGE_SIZE)
Expand Down

0 comments on commit a7f9d98

Please sign in to comment.