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>

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 31a32a79cfc20f7dfd8d1fb1ead3f7e626007d83..67d7da0b6fed5ff83efa645a7697b74e2a199c76 100644 (file)
--- 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;