Skip to contentSkip to conversation

drm/amdgpu: replace ih ip block for vega20 and arcturus

PATCH In review Alex Sierra 3 participants 3 messages Oct 31, 2020 – Nov 2, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdgpu: replace ih ip block for vega20 and arcturus

[Why]
Vega20 and Arcturus asics use oss 5.0 version.

[How]
Replace ih ip block by navi10 for vega20 and arcturus.

---
 drivers/gpu/drm/amd/amdgpu/soc15.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +11 -4
index f57c5f57efa8..fc5b11752931 100644
@@ -62,6 +62,7 @@
 #include "nbio_v7_0.h"
 #include "nbio_v7_4.h"
 #include "vega10_ih.h"
+#include "navi10_ih.h"
 #include "sdma_v4_0.h"
 #include "uvd_v7_0.h"
 #include "vce_v4_0.h"
@@ -734,9 +735,15 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
 				else
 					amdgpu_device_ip_block_add(adev, &psp_v3_1_ip_block);
 			}
-			amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);
+			if (adev->asic_type == CHIP_VEGA20)
+				amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block);
+			else
+				amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);
 		} else {
-			amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);
+			if (adev->asic_type == CHIP_VEGA20)
+				amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block);
+			else
+				amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);
 			if (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP)) {
 				if (adev->asic_type == CHIP_VEGA20)
 					amdgpu_device_ip_block_add(adev, &psp_v11_0_ip_block);
@@ -787,9 +794,9 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
 		if (amdgpu_sriov_vf(adev)) {
 			if (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP))
 				amdgpu_device_ip_block_add(adev, &psp_v11_0_ip_block);
-			amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);
+			amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block);
 		} else {
-			amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);
+			amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block);
 			if (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP))
 				amdgpu_device_ip_block_add(adev, &psp_v11_0_ip_block);
 		}
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Reviewed-by on v1 1/1
#1 lore raw

This was previously applied and reverted and should have been reapplied after some fixes in navi10_ih.c. Either we forgot to reapply it on amd-staging-drm-next or it got lost in a rebase. The patch is

Quoted 43 lines · Alex Sierra

[Why]
Vega20 and Arcturus asics use oss 5.0 version.

[How]
Replace ih ip block by navi10 for vega20 and arcturus.

---
  drivers/gpu/drm/amd/amdgpu/soc15.c | 15 +++++++++++----
  1 file changed, 11 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +9 -2
index f57c5f57efa8..fc5b11752931 100644
@@ -62,6 +62,7 @@
  #include "nbio_v7_0.h"
  #include "nbio_v7_4.h"
  #include "vega10_ih.h"
+#include "navi10_ih.h"
  #include "sdma_v4_0.h"
  #include "uvd_v7_0.h"
  #include "vce_v4_0.h"
@@ -734,9 +735,15 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
  				else
  					amdgpu_device_ip_block_add(adev, &psp_v3_1_ip_block);
  			}
-			amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);
+			if (adev->asic_type == CHIP_VEGA20)
+				amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block);
+			else
+				amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);
  		} else {
-			amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);
+			if (adev->asic_type == CHIP_VEGA20)
+				amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block);
+			else
+				amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);
  			if (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP)) {
  				if (adev->asic_type == CHIP_VEGA20)
  					amdgpu_device_ip_block_add(adev, &psp_v11_0_ip_block);
@@ -787,9 +794,9 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
  		if (amdgpu_sriov_vf(adev)) {

drivers/gpu/drm/amd/amdgpu/soc15.c int soc15_set_ip_blocks(struct amdgpu_device *adev) · line 802

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/soc15.c +2 -2
  			if (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP))
  				amdgpu_device_ip_block_add(adev, &psp_v11_0_ip_block);
-			amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);
+			amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block);
  		} else {
-			amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);
+			amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block);
  			if (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP))
  				amdgpu_device_ip_block_add(adev, &psp_v11_0_ip_block);
  		}

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#2 lore raw
In reply to Alex Sierra

[AMD Public Use]

It might be cleaner to just split out vega20 into a separate switch case in that function.

Alex

________________________________
From: amd-gfx <[email protected]> on behalf of Alex Sierra <[email protected]>
Sent: Friday, October 30, 2020 11:06 PM
To: [email protected] <[email protected]>
Cc: Sierra Guiza, Alejandro (Alex) <[email protected]>
Subject: [PATCH] drm/amdgpu: replace ih ip block for vega20 and arcturus

[Why]
Vega20 and Arcturus asics use oss 5.0 version.

[How]
Replace ih ip block by navi10 for vega20 and arcturus.

---
 drivers/gpu/drm/amd/amdgpu/soc15.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +11 -4
index f57c5f57efa8..fc5b11752931 100644
@@ -62,6 +62,7 @@
 #include "nbio_v7_0.h"
 #include "nbio_v7_4.h"
 #include "vega10_ih.h"
+#include "navi10_ih.h"
 #include "sdma_v4_0.h"
 #include "uvd_v7_0.h"
 #include "vce_v4_0.h"
@@ -734,9 +735,15 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
                                 else
                                         amdgpu_device_ip_block_add(adev, &psp_v3_1_ip_block);
                         }
-                       amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);
+                       if (adev->asic_type == CHIP_VEGA20)
+                               amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block);
+                       else
+                               amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);
                 } else {
-                       amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);
+                       if (adev->asic_type == CHIP_VEGA20)
+                               amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block);
+                       else
+                               amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);
                         if (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP)) {
                                 if (adev->asic_type == CHIP_VEGA20)
                                         amdgpu_device_ip_block_add(adev, &psp_v11_0_ip_block);
@@ -787,9 +794,9 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
                 if (amdgpu_sriov_vf(adev)) {
                         if (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP))
                                 amdgpu_device_ip_block_add(adev, &psp_v11_0_ip_block);
-                       amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);
+                       amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block);
                 } else {
-                       amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);
+                       amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block);
                         if (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP))
                                 amdgpu_device_ip_block_add(adev, &psp_v11_0_ip_block);
                 }

--
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=04%7C01%7Calexander.deucher%40amd.com%7C1f54f989cd9641c49c9708d87d4a000e%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637397104709391689%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=fe%2FU57bvUywZ57162F0sTzo%2FDaYGtX62J0MJf36Nxfo%3D&amp;reserved=0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx