This is a note to let you know that I've just added the patch titled drm/amd: Fix initialization for nbio 4.3.0 to the 6.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: drm-amd-fix-initialization-for-nbio-4.3.0.patch and it can be found in the queue-6.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 5048fa1ebf89d03cf0ceca13fab8f800399e9ee3 Mon Sep 17 00:00:00 2001 From: Mario Limonciello <mario.limonciello@xxxxxxx> Date: Mon, 30 Jan 2023 10:16:06 -0600 Subject: drm/amd: Fix initialization for nbio 4.3.0 From: Mario Limonciello <mario.limonciello@xxxxxxx> commit 5048fa1ebf89d03cf0ceca13fab8f800399e9ee3 upstream. A mistake has been made on some boards with NBIO 4.3.0 where some NBIO registers aren't properly set by the hardware. Ensure that they're set during initialization. Cc: Natikar Basavaraj <Basavaraj.Natikar@xxxxxxx> Tested-by: Satyanarayana ReddyTVN <Satyanarayana.ReddyTVN@xxxxxxx> Tested-by: Rutvij Gajjar <Rutvij.Gajjar@xxxxxxx> Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxx> Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx> Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> Cc: stable@xxxxxxxxxxxxxxx # 6.1.x Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c b/drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c index 15eb3658d70e..09fdcd20cb91 100644 --- a/drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c +++ b/drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c @@ -337,7 +337,13 @@ const struct nbio_hdp_flush_reg nbio_v4_3_hdp_flush_reg = { static void nbio_v4_3_init_registers(struct amdgpu_device *adev) { - return; + if (adev->ip_versions[NBIO_HWIP][0] == IP_VERSION(4, 3, 0)) { + uint32_t data; + + data = RREG32_SOC15(NBIO, 0, regRCC_DEV0_EPF2_STRAP2); + data &= ~RCC_DEV0_EPF2_STRAP2__STRAP_NO_SOFT_RESET_DEV0_F2_MASK; + WREG32_SOC15(NBIO, 0, regRCC_DEV0_EPF2_STRAP2, data); + } } static u32 nbio_v4_3_get_rom_offset(struct amdgpu_device *adev) -- 2.39.1 Patches currently in stable-queue which might be from mario.limonciello@xxxxxxx are queue-6.1/platform-x86-amd-pmf-fix-to-update-sps-thermals-when.patch queue-6.1/platform-x86-amd-pmf-fix-to-update-sps-default-pprof.patch queue-6.1/drm-amd-fix-initialization-for-nbio-4.3.0.patch queue-6.1/platform-x86-amd-pmf-update-to-auto-mode-limits-only.patch queue-6.1/platform-x86-amd-pmc-disable-irq1-wakeup-for-rn-czn.patch queue-6.1/platform-x86-amd-pmf-add-helper-routine-to-update-sp.patch queue-6.1/platform-x86-amd-pmf-add-helper-routine-to-check-ppr.patch