Commit c1059360 authored by Alex Sierra's avatar Alex Sierra Committed by Alex Deucher
Browse files

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.

Signed-off-by: default avatarAlex Sierra <alex.sierra@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent adc9da64

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

+11 −4
Original line number Diff line number Diff line
@@ -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,8 +735,14 @@ 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);

		} 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);

			if (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP)) {

				if (adev->asic_type == CHIP_VEGA20)
@@ -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);

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE