Skip to content

Commit 582bffc

Browse files
alexdeucheropsiff
authored andcommitted
drm/amdgpu: don't enable SMU on cyan skillfish
[ Upstream commit 94bd7bf ] Cyan skillfish uses different SMU firmware. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Sasha Levin <[email protected]> (cherry picked from commit 65240044398eb236f96225c6750a3af9e9b6617f) Signed-off-by: Wentao Guan <[email protected]>
1 parent 91c0021 commit 582bffc

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1819,13 +1819,16 @@ static int amdgpu_discovery_set_smu_ip_blocks(struct amdgpu_device *adev)
18191819
case IP_VERSION(11, 0, 5):
18201820
case IP_VERSION(11, 0, 9):
18211821
case IP_VERSION(11, 0, 7):
1822-
case IP_VERSION(11, 0, 8):
18231822
case IP_VERSION(11, 0, 11):
18241823
case IP_VERSION(11, 0, 12):
18251824
case IP_VERSION(11, 0, 13):
18261825
case IP_VERSION(11, 5, 0):
18271826
amdgpu_device_ip_block_add(adev, &smu_v11_0_ip_block);
18281827
break;
1828+
case IP_VERSION(11, 0, 8):
1829+
if (adev->apu_flags & AMD_APU_IS_CYAN_SKILLFISH2)
1830+
amdgpu_device_ip_block_add(adev, &smu_v11_0_ip_block);
1831+
break;
18291832
case IP_VERSION(12, 0, 0):
18301833
case IP_VERSION(12, 0, 1):
18311834
amdgpu_device_ip_block_add(adev, &smu_v12_0_ip_block);

0 commit comments

Comments
 (0)