[PATCH] Revert "drm/amdgpu: replace ih ip block for vega20 and arcturus"

[Alex Sierra]

This reverts commit 6237cb9febd7d61780d281e7141e12462c81cfb8.
Due to Loading driver failed at "*ERROR* ring sdma0 test failed" issue:
SWDEV-229211
---
 drivers/gpu/drm/amd/amdgpu/soc15.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c 
b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 9bd965e88bd9..a8c90d83a9ee 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -62,7 +62,6 @@
 #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"
@@ -732,15 +731,9 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
                                else
                                        amdgpu_device_ip_block_add(adev, 
&psp_v3_1_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);
+                       amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);
                } else {
-                       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);
+                       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);
@@ -791,9 +784,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, &navi10_ih_ip_block);
+                       amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);
                } else {
-                       amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block);
+                       amdgpu_device_ip_block_add(adev, &vega10_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
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx