[PATCH 2/2] drm/amdgpu/display: properly guard the calls to swSMU functions

[Quan, Evan]

[AMD Official Use Only - Internal Distribution Only]

Series is reviewed-by: Evan Quan <evan.quan at amd.com>

-----Original Message-----
From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> On Behalf Of Alex Deucher
Sent: Thursday, June 18, 2020 9:49 AM
To: amd-gfx at lists.freedesktop.org
Cc: Deucher, Alexander <Alexander.Deucher at amd.com>
Subject: [PATCH 2/2] drm/amdgpu/display: properly guard the calls to swSMU functions

It's only applicable on newer asics.  We could end up here when using DC on older asics like SI or KV.

Bug: https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitlab.freedesktop.org%2Fdrm%2Famd%2F-%2Fissues%2F1170&data=02%7C01%7Cevan.quan%40amd.com%7Ce9d2077216f345d417b008d81329c3e6%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637280417436474816&sdata=TAK3jTKVwYZqZ1hReOfy9WVkAyitnhDRyOjo61ak6rs%3D&reserved=0
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c
index 7cee8070cb11..5c6a6ae48d39 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c
@@ -106,7 +106,7 @@ bool dm_pp_apply_display_requirements(
 adev->powerplay.pp_funcs->display_configuration_change(
 adev->powerplay.pp_handle,
 &adev->pm.pm_display_cfg);
-else
+else if (adev->smu.ppt_funcs)
 smu_display_configuration_change(smu,
  &adev->pm.pm_display_cfg);

@@ -592,7 +592,7 @@ void pp_rv_set_wm_ranges(struct pp_smu *pp,
 if (pp_funcs && pp_funcs->set_watermarks_for_clocks_ranges)
 pp_funcs->set_watermarks_for_clocks_ranges(pp_handle,
    &wm_with_clock_ranges);
-else
+else if (adev->smu.ppt_funcs)
 smu_set_watermarks_for_clock_ranges(&adev->smu,
 &wm_with_clock_ranges);
 }
--
2.25.4

_______________________________________________
amd-gfx mailing list
amd-gfx at lists.freedesktop.org
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Cevan.quan%40amd.com%7Ce9d2077216f345d417b008d81329c3e6%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637280417436474816&sdata=0ef8Irg9yht43Hmv4i1uTAGSJTTi5DPAoxte8S49fpk%3D&reserved=0