| From 8c1ecc7197a88c6ae62de56e1c0887f220712a32 Mon Sep 17 00:00:00 2001 |
| From: Alex Deucher <alexander.deucher@amd.com> |
| Date: Thu, 12 Dec 2024 17:00:07 -0500 |
| Subject: drm/amdgpu/nbio7.11: fix IP version check |
| |
| From: Alex Deucher <alexander.deucher@amd.com> |
| |
| commit 8c1ecc7197a88c6ae62de56e1c0887f220712a32 upstream. |
| |
| 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 2c8eeaaa0fe5841ccf07a0eb51b1426f34ef39f7) |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c |
| +++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c |
| @@ -275,7 +275,7 @@ static void nbio_v7_11_init_registers(st |
| if (def != data) |
| WREG32_SOC15(NBIO, 0, regBIF_BIF256_CI256_RC3X4_USB4_PCIE_MST_CTRL_3, data); |
| |
| - switch (adev->ip_versions[NBIO_HWIP][0]) { |
| + switch (amdgpu_ip_version(adev, NBIO_HWIP, 0)) { |
| case IP_VERSION(7, 11, 0): |
| case IP_VERSION(7, 11, 1): |
| case IP_VERSION(7, 11, 2): |