[PATCH 6/6] drm/amdgpu: don't enable SMU on cyan skillfish

[Alex Deucher]

Cyan skillfish uses different SMU firmware.

Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index ae89dc9687435..55b8349a6953c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -2124,7 +2124,6 @@ static int amdgpu_discovery_set_smu_ip_blocks(struct 
amdgpu_device *adev)
        case IP_VERSION(11, 0, 5):
        case IP_VERSION(11, 0, 9):
        case IP_VERSION(11, 0, 7):
-       case IP_VERSION(11, 0, 8):
        case IP_VERSION(11, 0, 11):
        case IP_VERSION(11, 0, 12):
        case IP_VERSION(11, 0, 13):
@@ -2132,6 +2131,10 @@ static int amdgpu_discovery_set_smu_ip_blocks(struct 
amdgpu_device *adev)
        case IP_VERSION(11, 5, 2):
                amdgpu_device_ip_block_add(adev, &smu_v11_0_ip_block);
                break;
+       case IP_VERSION(11, 0, 8):
+               if (adev->apu_flags & AMD_APU_IS_CYAN_SKILLFISH2)
+                       amdgpu_device_ip_block_add(adev, &smu_v11_0_ip_block);
+               break;
        case IP_VERSION(12, 0, 0):
        case IP_VERSION(12, 0, 1):
                amdgpu_device_ip_block_add(adev, &smu_v12_0_ip_block);
-- 
2.50.0