drm/amdgpu/nbio7.0: fix IP version check

alexdeucher · alexdeucher · commit 3abb660f9e18 · 2024-12-18T15:20:57.000-05:00
Use the helper function rather than reading it directly. Reviewed-by: Yang Wang <kevinyang.wang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 0ec43fb) Cc: stable@vger.kernel.org
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c
@@ -278,7 +278,7 @@ static void nbio_v7_0_init_registers(struct amdgpu_device *adev)
 {
 	uint32_t data;
 
-	switch (adev->ip_versions[NBIO_HWIP][0]) {
+	switch (amdgpu_ip_version(adev, 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);

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ static void nbio_v7_0_init_registers(struct amdgpu_device *adev)`
`278`	`278`	`{`
`279`	`279`	`uint32_t data;`
`280`	`280`
`281`		`- switch (adev->ip_versions[NBIO_HWIP][0]) {`
	`281`	`+ switch (amdgpu_ip_version(adev, NBIO_HWIP, 0)) {`
`282`	`282`	`case IP_VERSION(2, 5, 0):`
`283`	`283`	`data = RREG32_SOC15(NBIO, 0, regRCC_DEV0_EPF6_STRAP4) & ~BIT(23);`
`284`	`284`	`WREG32_SOC15(NBIO, 0, regRCC_DEV0_EPF6_STRAP4, data);`