From 120a6db47296ed56d821c5914f703c5d51bd416b Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Thu, 3 Dec 2020 16:55:00 +0800 Subject: drm/amdgpu: add smu ip block for yellow carp(V3) Yellow carp smu ip version: 13_0_1. V2: rename smu_v13_0 to smu_v13_0_1. V3: reuse smu_v13_0 with aldebaran. Signed-off-by: Aaron Liu Acked-by: Alex Deucher Reviewed-by: Huang Rui Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 1 - drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'drivers/gpu/drm/amd/pm') diff --git a/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h index bc55af477d1c..71adb9e76a95 100644 --- a/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +++ b/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h @@ -1275,7 +1275,6 @@ extern const struct amd_ip_funcs smu_ip_funcs; extern const struct amdgpu_ip_block_version smu_v11_0_ip_block; extern const struct amdgpu_ip_block_version smu_v12_0_ip_block; extern const struct amdgpu_ip_block_version smu_v13_0_ip_block; -extern const struct amdgpu_ip_block_version smu_v13_0_1_ip_block; bool is_support_sw_smu(struct amdgpu_device *adev); bool is_support_cclk_dpm(struct amdgpu_device *adev); diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c index 2a5c109c0d26..6a41f78ac376 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c @@ -35,6 +35,7 @@ #include "renoir_ppt.h" #include "vangogh_ppt.h" #include "aldebaran_ppt.h" +#include "yellow_carp_ppt.h" #include "amd_pcie.h" /* @@ -584,6 +585,9 @@ static int smu_set_funcs(struct amdgpu_device *adev) case CHIP_VANGOGH: vangogh_set_ppt_funcs(smu); break; + case CHIP_YELLOW_CARP: + yellow_carp_set_ppt_funcs(smu); + break; default: return -EINVAL; } -- cgit v1.2.3