drm/amdgpu: enable SMU for cyan_skilfish

Enable SMU support for cyan_skilfish.

v2: Squash in fix (Alex)

Signed-off-by: Lang Yu <Lang.Yu@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
index 2b463c078aa8b972deacccd11b59879a31614304..436fb13e32f0e78dc4b7b850eb5cabc79488aae7 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/nv.c
+++ b/drivers/gpu/drm/amd/amdgpu/nv.c
@@ -897,16 +897,17 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)
                break;
        case CHIP_CYAN_SKILLFISH:
                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)
+               amdgpu_device_ip_block_add(adev, &gmc_v10_0_ip_block);
+               amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block);
+               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);
-                amdgpu_device_ip_block_add(adev, &gfx_v10_0_ip_block);
-                amdgpu_device_ip_block_add(adev, &sdma_v5_0_ip_block);
+               if (adev->enable_virtual_display || amdgpu_sriov_vf(adev))
+                       amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);
+               amdgpu_device_ip_block_add(adev, &gfx_v10_0_ip_block);
+               amdgpu_device_ip_block_add(adev, &sdma_v5_0_ip_block);
                break;
        default:
                return -EINVAL;

diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index ebe67214280851f11945546c88c9bf34d6f2cdaf..d68c78be9e98d91a88512a7b00a5ca40f8d618af 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -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;
        }