Commit 320a2e0c authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher
Browse files

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: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: default avatarDennis Li <Dennis.Li@amd.com>
Reviewed-by: default avatarFeifei Xu <Feifei.Xu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 726e5b37

drivers/gpu/drm/amd/amdgpu/soc15.c

+5 −4
Original line number Diff line number Diff line
@@ -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);

		}