diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2020-12-01 16:57:02 +0300 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2020-12-03 01:37:16 +0300 |
| commit | 902bc65de0b3d72c481b45cbac3e97ab8cb399c2 (patch) | |
| tree | 2140df39d4b455761732e445a49e3915cadf6673 /drivers/gpu/drm/amd/pm/powerplay | |
| parent | 9805e1adab1198a52db035901f872019ffdacc68 (diff) | |
| download | linux-902bc65de0b3d72c481b45cbac3e97ab8cb399c2.tar.xz | |
drm/amdgpu/powerplay/psm: return an error in power state init
Rather than just silently dropping it. Also fixes a set but
unused variable warning.
Reviewed-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/pm/powerplay')
| -rw-r--r-- | drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c index 31a32a79cfc2..67d7da0b6fed 100644 --- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c +++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c @@ -74,6 +74,13 @@ int psm_init_power_state_table(struct pp_hwmgr *hwmgr) for (i = 0; i < table_entries; i++) { result = hwmgr->hwmgr_func->get_pp_table_entry(hwmgr, i, state); + if (result) { + kfree(hwmgr->request_ps); + kfree(hwmgr->ps); + hwmgr->request_ps = NULL; + hwmgr->ps = NULL; + return -EINVAL; + } if (state->classification.flags & PP_StateClassificationFlag_Boot) { hwmgr->boot_ps = state; |