drm/amdgpu/powerplay/psm: return an error in power state init
authorAlex Deucher <alexander.deucher@amd.com>
Tue, 1 Dec 2020 13:57:02 +0000 (08:57 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 2 Dec 2020 22:37:16 +0000 (17:37 -0500)
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>
drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c

index 31a32a7..67d7da0 100644 (file)
@@ -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;