drm/amdgpu: switch to vega20 ih block for vega20/arcturus

replace navi10 ih block with vega20 ih block for
vega20 and arcturus

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Acked-by: Felix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: Dennis Li <Dennis.Li@amd.com>
Reviewed-by: Feifei Xu <Feifei.Xu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 8a23636ecc27ff8577997ce207733d7f240e7ecf..0d3def7269bb5dcbfad1eaa29a099edd6c479763 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -60,6 +60,7 @@
 #include "nbio_v7_0.h"
 #include "nbio_v7_4.h"
 #include "vega10_ih.h"
+#include "vega20_ih.h"
 #include "navi10_ih.h"
 #include "sdma_v4_0.h"
 #include "uvd_v7_0.h"
@@ -729,12 +730,12 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
                                        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);
+                               amdgpu_device_ip_block_add(adev, &vega20_ih_ip_block);
                        else
                                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);
+                               amdgpu_device_ip_block_add(adev, &vega20_ih_ip_block);
                        else
                                amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);
                        if (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP)) {
@@ -787,9 +788,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, &vega20_ih_ip_block);
                } else {
-                       amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block);
+                       amdgpu_device_ip_block_add(adev, &vega20_ih_ip_block);
                        if (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP))
                                amdgpu_device_ip_block_add(adev, &psp_v11_0_ip_block);
                }