* [PATCH 2/6] drm/amdgpu/nbio7.0: fix IP version check
2024-12-12 22:08 [PATCH 1/6] drm/amdgpu/nbio7.7: fix IP version check Alex Deucher
@ 2024-12-12 22:08 ` Alex Deucher
2024-12-12 22:08 ` [PATCH 3/6] drm/amdgpu/nbio7.11: " Alex Deucher
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Alex Deucher @ 2024-12-12 22:08 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher
Use the helper function rather than reading it directly.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c
index 49e953f86ced4..d1032e9992b49 100644
--- 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);
--
2.47.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 3/6] drm/amdgpu/nbio7.11: fix IP version check
2024-12-12 22:08 [PATCH 1/6] drm/amdgpu/nbio7.7: fix IP version check Alex Deucher
2024-12-12 22:08 ` [PATCH 2/6] drm/amdgpu/nbio7.0: " Alex Deucher
@ 2024-12-12 22:08 ` Alex Deucher
2024-12-12 22:08 ` [PATCH 4/6] drm/amdgpu/mmhub4.1: " Alex Deucher
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Alex Deucher @ 2024-12-12 22:08 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher
Use the helper function rather than reading it directly.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c
index 814ab59fdd4a3..41421da63a084 100644
--- 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(struct amdgpu_device *adev)
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):
--
2.47.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 4/6] drm/amdgpu/mmhub4.1: fix IP version check
2024-12-12 22:08 [PATCH 1/6] drm/amdgpu/nbio7.7: fix IP version check Alex Deucher
2024-12-12 22:08 ` [PATCH 2/6] drm/amdgpu/nbio7.0: " Alex Deucher
2024-12-12 22:08 ` [PATCH 3/6] drm/amdgpu/nbio7.11: " Alex Deucher
@ 2024-12-12 22:08 ` Alex Deucher
2024-12-12 22:08 ` [PATCH 5/6] drm/amdgpu/gfx12: " Alex Deucher
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Alex Deucher @ 2024-12-12 22:08 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher
Use the helper function rather than reading it directly.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/mmhub_v4_1_0.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v4_1_0.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v4_1_0.c
index 0fbc3be81f140..f2ab5001b4924 100644
--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v4_1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v4_1_0.c
@@ -108,7 +108,7 @@ mmhub_v4_1_0_print_l2_protection_fault_status(struct amdgpu_device *adev,
dev_err(adev->dev,
"MMVM_L2_PROTECTION_FAULT_STATUS_LO32:0x%08X\n",
status);
- switch (adev->ip_versions[MMHUB_HWIP][0]) {
+ switch (amdgpu_ip_version(adev, MMHUB_HWIP, 0)) {
case IP_VERSION(4, 1, 0):
mmhub_cid = mmhub_client_ids_v4_1_0[cid][rw];
break;
--
2.47.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 5/6] drm/amdgpu/gfx12: fix IP version check
2024-12-12 22:08 [PATCH 1/6] drm/amdgpu/nbio7.7: fix IP version check Alex Deucher
` (2 preceding siblings ...)
2024-12-12 22:08 ` [PATCH 4/6] drm/amdgpu/mmhub4.1: " Alex Deucher
@ 2024-12-12 22:08 ` Alex Deucher
2024-12-12 22:08 ` [PATCH 6/6] drm/amdgpu/smu14.0.2: " Alex Deucher
2024-12-13 1:19 ` [PATCH 1/6] drm/amdgpu/nbio7.7: " Wang, Yang(Kevin)
5 siblings, 0 replies; 7+ messages in thread
From: Alex Deucher @ 2024-12-12 22:08 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher
Use the helper function rather than reading it directly.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
index 035fc392526d3..fd23213df60e4 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
@@ -4169,7 +4169,7 @@ static int gfx_v12_0_set_clockgating_state(struct amdgpu_ip_block *ip_block,
if (amdgpu_sriov_vf(adev))
return 0;
- switch (adev->ip_versions[GC_HWIP][0]) {
+ switch (amdgpu_ip_version(adev, GC_HWIP, 0)) {
case IP_VERSION(12, 0, 0):
case IP_VERSION(12, 0, 1):
gfx_v12_0_update_gfx_clock_gating(adev,
--
2.47.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 6/6] drm/amdgpu/smu14.0.2: fix IP version check
2024-12-12 22:08 [PATCH 1/6] drm/amdgpu/nbio7.7: fix IP version check Alex Deucher
` (3 preceding siblings ...)
2024-12-12 22:08 ` [PATCH 5/6] drm/amdgpu/gfx12: " Alex Deucher
@ 2024-12-12 22:08 ` Alex Deucher
2024-12-13 1:19 ` [PATCH 1/6] drm/amdgpu/nbio7.7: " Wang, Yang(Kevin)
5 siblings, 0 replies; 7+ messages in thread
From: Alex Deucher @ 2024-12-12 22:08 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher
Use the helper function rather than reading it directly.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
index 6a565ce74d5b3..5cad09c5f2ff2 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
@@ -2096,7 +2096,7 @@ static int smu_v14_0_2_enable_gfx_features(struct smu_context *smu)
{
struct amdgpu_device *adev = smu->adev;
- if (adev->ip_versions[MP1_HWIP][0] == IP_VERSION(14, 0, 2))
+ if (amdgpu_ip_version(adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 2))
return smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_EnableAllSmuFeatures,
FEATURE_PWR_GFX, NULL);
else
--
2.47.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* RE: [PATCH 1/6] drm/amdgpu/nbio7.7: fix IP version check
2024-12-12 22:08 [PATCH 1/6] drm/amdgpu/nbio7.7: fix IP version check Alex Deucher
` (4 preceding siblings ...)
2024-12-12 22:08 ` [PATCH 6/6] drm/amdgpu/smu14.0.2: " Alex Deucher
@ 2024-12-13 1:19 ` Wang, Yang(Kevin)
5 siblings, 0 replies; 7+ messages in thread
From: Wang, Yang(Kevin) @ 2024-12-13 1:19 UTC (permalink / raw)
To: Deucher, Alexander, amd-gfx@lists.freedesktop.org; +Cc: Deucher, Alexander
[AMD Official Use Only - AMD Internal Distribution Only]
Series is
Reviewed-by: Yang Wang <kevinyang.wang@amd.com>
Best Regards,
Kevin
-----Original Message-----
From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Alex Deucher
Sent: Friday, December 13, 2024 06:09
To: amd-gfx@lists.freedesktop.org
Cc: Deucher, Alexander <Alexander.Deucher@amd.com>
Subject: [PATCH 1/6] drm/amdgpu/nbio7.7: fix IP version check
Use the helper function rather than reading it directly.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c
index 1ac730328516f..3fb6d2aa7e3b3 100644
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c
@@ -247,7 +247,7 @@ static void nbio_v7_7_init_registers(struct amdgpu_device *adev)
if (def != data)
WREG32_SOC15(NBIO, 0, regBIF0_PCIE_MST_CTRL_3, data);
- switch (adev->ip_versions[NBIO_HWIP][0]) {
+ switch (amdgpu_ip_version(adev, NBIO_HWIP, 0)) {
case IP_VERSION(7, 7, 0):
data = RREG32_SOC15(NBIO, 0, regRCC_DEV0_EPF5_STRAP4) & ~BIT(23);
WREG32_SOC15(NBIO, 0, regRCC_DEV0_EPF5_STRAP4, data);
--
2.47.1
^ permalink raw reply related [flat|nested] 7+ messages in thread