AMD-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Alex Deucher <alexdeucher@gmail.com>
To: amd-gfx@lists.freedesktop.org
Cc: Alex Deucher <alexander.deucher@amd.com>
Subject: [PATCH 2/5] drm/amdgpu/powerplay/psm: return an error in power state init
Date: Tue,  1 Dec 2020 12:44:10 -0500	[thread overview]
Message-ID: <20201201174413.643254-2-alexander.deucher@amd.com> (raw)
In-Reply-To: <20201201174413.643254-1-alexander.deucher@amd.com>

Rather than just silently dropping it.  Also fixes a set but
unused variable warning.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c | 7 +++++++
 1 file changed, 7 insertions(+)

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;
-- 
2.25.4

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

  reply	other threads:[~2020-12-01 17:44 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-01 17:44 [PATCH 1/5] drm/amdgpu/powerplay/vega10: handle error in getting pptable Alex Deucher
2020-12-01 17:44 ` Alex Deucher [this message]
2020-12-02  2:09   ` [PATCH 2/5] drm/amdgpu/powerplay/psm: return an error in power state init Quan, Evan
2020-12-01 17:44 ` [PATCH 3/5] drm/amdgpu/swsmu/vangogh: simplify sensor handling Alex Deucher
2020-12-02  2:09   ` Quan, Evan
2020-12-01 17:44 ` [PATCH 4/5] drm/amdgpu/swsmu/vangogh: use metrics table for voltages Alex Deucher
2020-12-02  2:13   ` Quan, Evan
2020-12-01 17:44 ` [PATCH 5/5] drm/amdgpu/swsmu/renoir: simplify sensor handling Alex Deucher
2020-12-02  2:14   ` Quan, Evan
2020-12-02  2:09 ` [PATCH 1/5] drm/amdgpu/powerplay/vega10: handle error in getting pptable Quan, Evan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201201174413.643254-2-alexander.deucher@amd.com \
    --to=alexdeucher@gmail.com \
    --cc=alexander.deucher@amd.com \
    --cc=amd-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox