Commit 641df099 authored by Lang Yu's avatar Lang Yu Committed by Alex Deucher
Browse files

drm/amdgpu: enable SMU for cyan_skilfish 



Enable SMU support for cyan_skilfish.

v2: Squash in fix (Alex)

Signed-off-by: default avatarLang Yu <Lang.Yu@amd.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 61ad757d

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

+9 −8
Original line number Diff line number Diff line
@@ -899,9 +899,10 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) 
		amdgpu_device_ip_block_add(adev, &nv_common_ip_block);

		amdgpu_device_ip_block_add(adev, &gmc_v10_0_ip_block);

		amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block);

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

			if (adev->apu_flags & AMD_APU_IS_CYAN_SKILLFISH2)

		if (adev->apu_flags & AMD_APU_IS_CYAN_SKILLFISH2) {

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

				amdgpu_device_ip_block_add(adev, &psp_v11_0_8_ip_block);

			amdgpu_device_ip_block_add(adev, &smu_v11_0_ip_block);

		}

		if (adev->enable_virtual_display || amdgpu_sriov_vf(adev))

			amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c

+4 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include "vangogh_ppt.h"

#include "aldebaran_ppt.h"

#include "yellow_carp_ppt.h"

#include "cyan_skillfish_ppt.h"

#include "amd_pcie.h"



/*
@@ -588,6 +589,9 @@ static int smu_set_funcs(struct amdgpu_device *adev) 
	case CHIP_YELLOW_CARP:

		yellow_carp_set_ppt_funcs(smu);

		break;

	case CHIP_CYAN_SKILLFISH:

		cyan_skillfish_set_ppt_funcs(smu);

		break;

	default:

		return -EINVAL;

	}