[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <ced38713-6bda-4fa5-b2d4-776e2d6bcd9d@amd.com>
Date: Wed, 4 Feb 2026 12:06:07 -0600
From: Mario Limonciello <mario.limonciello@....com>
To: Lizhi Hou <lizhi.hou@....com>, ogabbay@...nel.org,
quic_jhugo@...cinc.com, dri-devel@...ts.freedesktop.org,
maciej.falkowski@...ux.intel.com
Cc: linux-kernel@...r.kernel.org, max.zhen@....com, sonal.santan@....com
Subject: Re: [PATCH V1] accel/amdxdna: Fix incorrect DPM level after
suspend/resume
On 2/4/26 11:10 AM, Lizhi Hou wrote:
> The suspend routine sets the DPM level to 0, which unintentionally
> overwrites the previously saved DPM level. As a result, the device always
> resumes with DPM level 0 instead of restoring the original value.
>
> Fix this by ensuring the suspend path does not overwrite the saved DPM
> level, allowing the correct DPM level to be restored during resume.
>
> Fixes: f4d7b8a6bc8c ("accel/amdxdna: Enhance power management settings")
> Signed-off-by: Lizhi Hou <lizhi.hou@....com>
Reviewed-by: Mario Limonciello (AMD) <superm1@...nel.org>
> ---
> drivers/accel/amdxdna/aie2_pm.c | 3 +++
> drivers/accel/amdxdna/aie2_smu.c | 2 --
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/accel/amdxdna/aie2_pm.c b/drivers/accel/amdxdna/aie2_pm.c
> index afcd6d4683e5..579b8be13b18 100644
> --- a/drivers/accel/amdxdna/aie2_pm.c
> +++ b/drivers/accel/amdxdna/aie2_pm.c
> @@ -36,6 +36,8 @@ int aie2_pm_set_dpm(struct amdxdna_dev_hdl *ndev, u32 dpm_level)
> return ret;
>
> ret = ndev->priv->hw_ops.set_dpm(ndev, dpm_level);
> + if (!ret)
> + ndev->dpm_level = dpm_level;
> amdxdna_pm_suspend_put(ndev->xdna);
>
> return ret;
> @@ -65,6 +67,7 @@ int aie2_pm_init(struct amdxdna_dev_hdl *ndev)
> ret = ndev->priv->hw_ops.set_dpm(ndev, ndev->max_dpm_level);
> if (ret)
> return ret;
> + ndev->dpm_level = ndev->max_dpm_level;
>
> ret = aie2_pm_set_clk_gating(ndev, AIE2_CLK_GATING_ENABLE);
> if (ret)
> diff --git a/drivers/accel/amdxdna/aie2_smu.c b/drivers/accel/amdxdna/aie2_smu.c
> index 2d195e41f83d..d8c31924e501 100644
> --- a/drivers/accel/amdxdna/aie2_smu.c
> +++ b/drivers/accel/amdxdna/aie2_smu.c
> @@ -84,7 +84,6 @@ int npu1_set_dpm(struct amdxdna_dev_hdl *ndev, u32 dpm_level)
> }
>
> ndev->hclk_freq = freq;
> - ndev->dpm_level = dpm_level;
> ndev->max_tops = 2 * ndev->total_col;
> ndev->curr_tops = ndev->max_tops * freq / 1028;
>
> @@ -114,7 +113,6 @@ int npu4_set_dpm(struct amdxdna_dev_hdl *ndev, u32 dpm_level)
>
> ndev->npuclk_freq = ndev->priv->dpm_clk_tbl[dpm_level].npuclk;
> ndev->hclk_freq = ndev->priv->dpm_clk_tbl[dpm_level].hclk;
> - ndev->dpm_level = dpm_level;
> ndev->max_tops = NPU4_DPM_TOPS(ndev, ndev->max_dpm_level);
> ndev->curr_tops = NPU4_DPM_TOPS(ndev, dpm_level);
>
Powered by blists - more mailing lists