drm/amd: Fix initialization for nbio 4.3.0

superm1 · alexdeucher · commit 5048fa1ebf89 · 2023-02-01T22:45:51.000-05:00
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 &lt;Basavaraj.Natikar@amd.com&gt;
Tested-by: Satyanarayana ReddyTVN &lt;Satyanarayana.ReddyTVN@amd.com&gt;
Tested-by: Rutvij Gajjar &lt;Rutvij.Gajjar@amd.com&gt;
Signed-off-by: Mario Limonciello &lt;mario.limonciello@amd.com&gt;
Reviewed-by: Alex Deucher &lt;alexander.deucher@amd.com&gt;
Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt;
Cc: stable@vger.kernel.org # 6.1.x
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,13 @@ const struct nbio_hdp_flush_reg nbio_v4_3_hdp_flush_reg = {`
`337`	`337`
`338`	`338`	`static void nbio_v4_3_init_registers(struct amdgpu_device *adev)`
`339`	`339`	`{`
`340`		`- return;`
	`340`	`+ if (adev->ip_versions[NBIO_HWIP][0] == IP_VERSION(4, 3, 0)) {`
	`341`	`+ uint32_t data;`
	`342`	`+`
	`343`	`+ data = RREG32_SOC15(NBIO, 0, regRCC_DEV0_EPF2_STRAP2);`
	`344`	`+ data &= ~RCC_DEV0_EPF2_STRAP2__STRAP_NO_SOFT_RESET_DEV0_F2_MASK;`
	`345`	`+ WREG32_SOC15(NBIO, 0, regRCC_DEV0_EPF2_STRAP2, data);`
	`346`	`+ }`
`341`	`347`	`}`
`342`	`348`
`343`	`349`	`static u32 nbio_v4_3_get_rom_offset(struct amdgpu_device *adev)`