drm/amdgpu: don't enable SMU on cyan skillfish

[ Upstream commit 94bd7bf2c920998b4c756bc8a54fd3dbdf7e4360 ]

Cyan skillfish uses different SMU firmware.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index e814da2b14225bc64961d6c6dff7e3f1e26d683d..dd7b2b796427ccdae0c42814f66f95fa543ef16f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -2126,7 +2126,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):
@@ -2134,6 +2133,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);