* [PATCH V1] accel/amdxdna: Move RPM resume into job run function
@ 2026-02-04 17:11 Lizhi Hou
2026-02-04 18:07 ` Mario Limonciello
0 siblings, 1 reply; 3+ messages in thread
From: Lizhi Hou @ 2026-02-04 17:11 UTC (permalink / raw)
To: ogabbay, quic_jhugo, dri-devel, maciej.falkowski
Cc: Lizhi Hou, linux-kernel, max.zhen, sonal.santan,
mario.limonciello
Currently, amdxdna_pm_resume_get() is called during job creation, and
amdxdna_pm_suspend_put() is called when the hardware notifies job
completion. If a job is canceled before it is run, no hardware
completion notification is generated, resulting in an unbalanced
runtime PM resume/suspend pair.
Fix this by moving amdxdna_pm_resume_get() to the job run path, ensuring
runtime PM is only resumed for jobs that are actually executed.
Fixes: 063db451832b ("accel/amdxdna: Enhance runtime power management")
Signed-off-by: Lizhi Hou <lizhi.hou@amd.com>
---
drivers/accel/amdxdna/aie2_ctx.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/drivers/accel/amdxdna/aie2_ctx.c b/drivers/accel/amdxdna/aie2_ctx.c
index fe8f9783a73c..37d05f2e986f 100644
--- a/drivers/accel/amdxdna/aie2_ctx.c
+++ b/drivers/accel/amdxdna/aie2_ctx.c
@@ -306,6 +306,10 @@ aie2_sched_job_run(struct drm_sched_job *sched_job)
kref_get(&job->refcnt);
fence = dma_fence_get(job->fence);
+ ret = amdxdna_pm_resume_get(hwctx->client->xdna);
+ if (ret)
+ goto out;
+
if (job->drv_cmd) {
switch (job->drv_cmd->opcode) {
case SYNC_DEBUG_BO:
@@ -332,6 +336,7 @@ aie2_sched_job_run(struct drm_sched_job *sched_job)
out:
if (ret) {
+ amdxdna_pm_suspend_put(hwctx->client->xdna);
dma_fence_put(job->fence);
aie2_job_put(job);
mmput(job->mm);
@@ -988,15 +993,11 @@ int aie2_cmd_submit(struct amdxdna_hwctx *hwctx, struct amdxdna_sched_job *job,
goto free_chain;
}
- ret = amdxdna_pm_resume_get(xdna);
- if (ret)
- goto cleanup_job;
-
retry:
ret = drm_gem_lock_reservations(job->bos, job->bo_cnt, &acquire_ctx);
if (ret) {
XDNA_WARN(xdna, "Failed to lock BOs, ret %d", ret);
- goto suspend_put;
+ goto cleanup_job;
}
for (i = 0; i < job->bo_cnt; i++) {
@@ -1004,7 +1005,7 @@ int aie2_cmd_submit(struct amdxdna_hwctx *hwctx, struct amdxdna_sched_job *job,
if (ret) {
XDNA_WARN(xdna, "Failed to reserve fences %d", ret);
drm_gem_unlock_reservations(job->bos, job->bo_cnt, &acquire_ctx);
- goto suspend_put;
+ goto cleanup_job;
}
}
@@ -1019,12 +1020,12 @@ int aie2_cmd_submit(struct amdxdna_hwctx *hwctx, struct amdxdna_sched_job *job,
msecs_to_jiffies(HMM_RANGE_DEFAULT_TIMEOUT);
} else if (time_after(jiffies, timeout)) {
ret = -ETIME;
- goto suspend_put;
+ goto cleanup_job;
}
ret = aie2_populate_range(abo);
if (ret)
- goto suspend_put;
+ goto cleanup_job;
goto retry;
}
}
@@ -1050,8 +1051,6 @@ int aie2_cmd_submit(struct amdxdna_hwctx *hwctx, struct amdxdna_sched_job *job,
return 0;
-suspend_put:
- amdxdna_pm_suspend_put(xdna);
cleanup_job:
drm_sched_job_cleanup(&job->base);
free_chain:
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH V1] accel/amdxdna: Move RPM resume into job run function
2026-02-04 17:11 [PATCH V1] accel/amdxdna: Move RPM resume into job run function Lizhi Hou
@ 2026-02-04 18:07 ` Mario Limonciello
2026-02-04 21:15 ` Lizhi Hou
0 siblings, 1 reply; 3+ messages in thread
From: Mario Limonciello @ 2026-02-04 18:07 UTC (permalink / raw)
To: Lizhi Hou, ogabbay, quic_jhugo, dri-devel, maciej.falkowski
Cc: linux-kernel, max.zhen, sonal.santan
On 2/4/26 11:11 AM, Lizhi Hou wrote:
> Currently, amdxdna_pm_resume_get() is called during job creation, and
> amdxdna_pm_suspend_put() is called when the hardware notifies job
> completion. If a job is canceled before it is run, no hardware
> completion notification is generated, resulting in an unbalanced
> runtime PM resume/suspend pair.
>
> Fix this by moving amdxdna_pm_resume_get() to the job run path, ensuring
> runtime PM is only resumed for jobs that are actually executed.
>
> Fixes: 063db451832b ("accel/amdxdna: Enhance runtime power management")
> Signed-off-by: Lizhi Hou <lizhi.hou@amd.com>
Reviewed-by: Mario Limonciello (AMD) <superm1@kernel.org>
> ---
> drivers/accel/amdxdna/aie2_ctx.c | 19 +++++++++----------
> 1 file changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/accel/amdxdna/aie2_ctx.c b/drivers/accel/amdxdna/aie2_ctx.c
> index fe8f9783a73c..37d05f2e986f 100644
> --- a/drivers/accel/amdxdna/aie2_ctx.c
> +++ b/drivers/accel/amdxdna/aie2_ctx.c
> @@ -306,6 +306,10 @@ aie2_sched_job_run(struct drm_sched_job *sched_job)
> kref_get(&job->refcnt);
> fence = dma_fence_get(job->fence);
>
> + ret = amdxdna_pm_resume_get(hwctx->client->xdna);
> + if (ret)
> + goto out;
> +
> if (job->drv_cmd) {
> switch (job->drv_cmd->opcode) {
> case SYNC_DEBUG_BO:
> @@ -332,6 +336,7 @@ aie2_sched_job_run(struct drm_sched_job *sched_job)
>
> out:
> if (ret) {
> + amdxdna_pm_suspend_put(hwctx->client->xdna);
> dma_fence_put(job->fence);
> aie2_job_put(job);
> mmput(job->mm);
> @@ -988,15 +993,11 @@ int aie2_cmd_submit(struct amdxdna_hwctx *hwctx, struct amdxdna_sched_job *job,
> goto free_chain;
> }
>
> - ret = amdxdna_pm_resume_get(xdna);
> - if (ret)
> - goto cleanup_job;
> -
> retry:
> ret = drm_gem_lock_reservations(job->bos, job->bo_cnt, &acquire_ctx);
> if (ret) {
> XDNA_WARN(xdna, "Failed to lock BOs, ret %d", ret);
> - goto suspend_put;
> + goto cleanup_job;
> }
>
> for (i = 0; i < job->bo_cnt; i++) {
> @@ -1004,7 +1005,7 @@ int aie2_cmd_submit(struct amdxdna_hwctx *hwctx, struct amdxdna_sched_job *job,
> if (ret) {
> XDNA_WARN(xdna, "Failed to reserve fences %d", ret);
> drm_gem_unlock_reservations(job->bos, job->bo_cnt, &acquire_ctx);
> - goto suspend_put;
> + goto cleanup_job;
> }
> }
>
> @@ -1019,12 +1020,12 @@ int aie2_cmd_submit(struct amdxdna_hwctx *hwctx, struct amdxdna_sched_job *job,
> msecs_to_jiffies(HMM_RANGE_DEFAULT_TIMEOUT);
> } else if (time_after(jiffies, timeout)) {
> ret = -ETIME;
> - goto suspend_put;
> + goto cleanup_job;
> }
>
> ret = aie2_populate_range(abo);
> if (ret)
> - goto suspend_put;
> + goto cleanup_job;
> goto retry;
> }
> }
> @@ -1050,8 +1051,6 @@ int aie2_cmd_submit(struct amdxdna_hwctx *hwctx, struct amdxdna_sched_job *job,
>
> return 0;
>
> -suspend_put:
> - amdxdna_pm_suspend_put(xdna);
> cleanup_job:
> drm_sched_job_cleanup(&job->base);
> free_chain:
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH V1] accel/amdxdna: Move RPM resume into job run function
2026-02-04 18:07 ` Mario Limonciello
@ 2026-02-04 21:15 ` Lizhi Hou
0 siblings, 0 replies; 3+ messages in thread
From: Lizhi Hou @ 2026-02-04 21:15 UTC (permalink / raw)
To: Mario Limonciello, ogabbay, quic_jhugo, dri-devel,
maciej.falkowski
Cc: linux-kernel, max.zhen, sonal.santan
Applied to drm-misc-next-fixes
On 2/4/26 10:07, Mario Limonciello wrote:
> On 2/4/26 11:11 AM, Lizhi Hou wrote:
>> Currently, amdxdna_pm_resume_get() is called during job creation, and
>> amdxdna_pm_suspend_put() is called when the hardware notifies job
>> completion. If a job is canceled before it is run, no hardware
>> completion notification is generated, resulting in an unbalanced
>> runtime PM resume/suspend pair.
>>
>> Fix this by moving amdxdna_pm_resume_get() to the job run path, ensuring
>> runtime PM is only resumed for jobs that are actually executed.
>>
>> Fixes: 063db451832b ("accel/amdxdna: Enhance runtime power management")
>> Signed-off-by: Lizhi Hou <lizhi.hou@amd.com>
> Reviewed-by: Mario Limonciello (AMD) <superm1@kernel.org>
>> ---
>> drivers/accel/amdxdna/aie2_ctx.c | 19 +++++++++----------
>> 1 file changed, 9 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/accel/amdxdna/aie2_ctx.c
>> b/drivers/accel/amdxdna/aie2_ctx.c
>> index fe8f9783a73c..37d05f2e986f 100644
>> --- a/drivers/accel/amdxdna/aie2_ctx.c
>> +++ b/drivers/accel/amdxdna/aie2_ctx.c
>> @@ -306,6 +306,10 @@ aie2_sched_job_run(struct drm_sched_job *sched_job)
>> kref_get(&job->refcnt);
>> fence = dma_fence_get(job->fence);
>> + ret = amdxdna_pm_resume_get(hwctx->client->xdna);
>> + if (ret)
>> + goto out;
>> +
>> if (job->drv_cmd) {
>> switch (job->drv_cmd->opcode) {
>> case SYNC_DEBUG_BO:
>> @@ -332,6 +336,7 @@ aie2_sched_job_run(struct drm_sched_job *sched_job)
>> out:
>> if (ret) {
>> + amdxdna_pm_suspend_put(hwctx->client->xdna);
>> dma_fence_put(job->fence);
>> aie2_job_put(job);
>> mmput(job->mm);
>> @@ -988,15 +993,11 @@ int aie2_cmd_submit(struct amdxdna_hwctx
>> *hwctx, struct amdxdna_sched_job *job,
>> goto free_chain;
>> }
>> - ret = amdxdna_pm_resume_get(xdna);
>> - if (ret)
>> - goto cleanup_job;
>> -
>> retry:
>> ret = drm_gem_lock_reservations(job->bos, job->bo_cnt,
>> &acquire_ctx);
>> if (ret) {
>> XDNA_WARN(xdna, "Failed to lock BOs, ret %d", ret);
>> - goto suspend_put;
>> + goto cleanup_job;
>> }
>> for (i = 0; i < job->bo_cnt; i++) {
>> @@ -1004,7 +1005,7 @@ int aie2_cmd_submit(struct amdxdna_hwctx
>> *hwctx, struct amdxdna_sched_job *job,
>> if (ret) {
>> XDNA_WARN(xdna, "Failed to reserve fences %d", ret);
>> drm_gem_unlock_reservations(job->bos, job->bo_cnt,
>> &acquire_ctx);
>> - goto suspend_put;
>> + goto cleanup_job;
>> }
>> }
>> @@ -1019,12 +1020,12 @@ int aie2_cmd_submit(struct amdxdna_hwctx
>> *hwctx, struct amdxdna_sched_job *job,
>> msecs_to_jiffies(HMM_RANGE_DEFAULT_TIMEOUT);
>> } else if (time_after(jiffies, timeout)) {
>> ret = -ETIME;
>> - goto suspend_put;
>> + goto cleanup_job;
>> }
>> ret = aie2_populate_range(abo);
>> if (ret)
>> - goto suspend_put;
>> + goto cleanup_job;
>> goto retry;
>> }
>> }
>> @@ -1050,8 +1051,6 @@ int aie2_cmd_submit(struct amdxdna_hwctx
>> *hwctx, struct amdxdna_sched_job *job,
>> return 0;
>> -suspend_put:
>> - amdxdna_pm_suspend_put(xdna);
>> cleanup_job:
>> drm_sched_job_cleanup(&job->base);
>> free_chain:
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-02-04 21:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-02-04 17:11 [PATCH V1] accel/amdxdna: Move RPM resume into job run function Lizhi Hou
2026-02-04 18:07 ` Mario Limonciello
2026-02-04 21:15 ` Lizhi Hou
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox