Skip to content

Commit 2fdc99b

Browse files
timhuang-amdalexdeucher
authored andcommitted
drm/amd/pm: early return if disabling DPMS for GFX IP v11.5.2
This was intended to add support for GFX IP v11.5.2, but it needs to be applied to all GFX11 and subsequent APUs. Therefore the code should be revised to accommodate this. Signed-off-by: Tim Huang <[email protected]> Acked-by: Alex Deucher <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent b3fb79c commit 2fdc99b

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1924,20 +1924,12 @@ static int smu_disable_dpms(struct smu_context *smu)
19241924
}
19251925

19261926
/*
1927-
* For SMU 13.0.4/11 and 14.0.0, PMFW will handle the features disablement properly
1927+
* For GFX11 and subsequent APUs, PMFW will handle the features disablement properly
19281928
* for gpu reset and S0i3 cases. Driver involvement is unnecessary.
19291929
*/
1930-
if (amdgpu_in_reset(adev) || adev->in_s0ix) {
1931-
switch (amdgpu_ip_version(adev, MP1_HWIP, 0)) {
1932-
case IP_VERSION(13, 0, 4):
1933-
case IP_VERSION(13, 0, 11):
1934-
case IP_VERSION(14, 0, 0):
1935-
case IP_VERSION(14, 0, 1):
1936-
return 0;
1937-
default:
1938-
break;
1939-
}
1940-
}
1930+
if (IP_VERSION_MAJ(amdgpu_ip_version(adev, GC_HWIP, 0)) >= 11 &&
1931+
smu->is_apu && (amdgpu_in_reset(adev) || adev->in_s0ix))
1932+
return 0;
19411933

19421934
/*
19431935
* For gpu reset, runpm and hibernation through BACO,

0 commit comments

Comments
 (0)