summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2020-08-22 04:43:57 +0000
committerjsg <jsg@openbsd.org>2020-08-22 04:43:57 +0000
commitce496fa7c406fc28502a54960859497634721ed1 (patch)
tree150f9a06c5e28859f027deaa73668d79d270d364
parentdrm/amd/display: Improve DisplayPort monitor interop (diff)
downloadwireguard-openbsd-ce496fa7c406fc28502a54960859497634721ed1.tar.xz
wireguard-openbsd-ce496fa7c406fc28502a54960859497634721ed1.zip
drm/amdgpu/display bail early in dm_pp_get_static_clocks
From Alex Deucher c2013b737bbde32f302575e6a1b74eb21cd419ca in linux 5.7.y/5.7.16 376814f5fcf1aadda501d1413d56e8af85d19a97 in mainline linux
-rw-r--r--sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c
index a2e1a73f66b..7cee8070cb1 100644
--- a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c
+++ b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c
@@ -530,6 +530,8 @@ bool dm_pp_get_static_clocks(
&pp_clk_info);
else if (adev->smu.ppt_funcs)
ret = smu_get_current_clocks(&adev->smu, &pp_clk_info);
+ else
+ return false;
if (ret)
return false;