1. Patchew
  2. linux
  3. View series

[PATCH v2] drm/panthor: fix queue_reset_timeout_locked

Chia-I Wu posted 1 patch 2 weeks, 2 days ago 
drivers/gpu/drm/panthor/panthor_sched.c | 26 +++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
[PATCH v2] drm/panthor: fix queue_reset_timeout_locked
Posted by Chia-I Wu 2 weeks, 2 days ago 
queue_check_job_completion calls queue_reset_timeout_locked to reset the
timeout when progress is made. We want the reset to happen when the
timeout is running, not when it is suspended.

Fixes: 345c5b7cc0f85 ("drm/panthor: Make the timeout per-queue instead of per-job")
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>

---
v2: reset queue->timeout.remaining when suspended (Boris)
---
 drivers/gpu/drm/panthor/panthor_sched.c | 26 +++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/panthor/panthor_sched.c b/drivers/gpu/drm/panthor/panthor_sched.c
index 389d508b3848e..95ae42168ce18 100644
--- a/drivers/gpu/drm/panthor/panthor_sched.c
+++ b/drivers/gpu/drm/panthor/panthor_sched.c
@@ -1052,18 +1052,6 @@ group_is_idle(struct panthor_group *group)
 	return hweight32(inactive_queues) == group->queue_count;
 }
 
-static void
-queue_reset_timeout_locked(struct panthor_queue *queue)
-{
-	lockdep_assert_held(&queue->fence_ctx.lock);
-
-	if (queue->timeout.remaining != MAX_SCHEDULE_TIMEOUT) {
-		mod_delayed_work(queue->scheduler.timeout_wq,
-				 &queue->timeout.work,
-				 msecs_to_jiffies(JOB_TIMEOUT_MS));
-	}
-}
-
 static bool
 group_can_run(struct panthor_group *group)
 {
@@ -1080,6 +1068,20 @@ queue_timeout_is_suspended(struct panthor_queue *queue)
 	return queue->timeout.remaining != MAX_SCHEDULE_TIMEOUT;
 }
 
+static void
+queue_reset_timeout_locked(struct panthor_queue *queue)
+{
+	lockdep_assert_held(&queue->fence_ctx.lock);
+
+	if (queue_timeout_is_suspended(queue)) {
+		queue->timeout.remaining = msecs_to_jiffies(JOB_TIMEOUT_MS);
+	} else {
+		mod_delayed_work(queue->scheduler.timeout_wq,
+				 &queue->timeout.work,
+				 msecs_to_jiffies(JOB_TIMEOUT_MS));
+	}
+}
+
 static void
 queue_suspend_timeout_locked(struct panthor_queue *queue)
 {
-- 
2.52.0.158.g65b55ccf14-goog
Re: [PATCH v2] drm/panthor: fix queue_reset_timeout_locked
Posted by Liviu Dudau 2 weeks, 2 days ago 
On Tue, Dec 02, 2025 at 01:31:02PM -0800, Chia-I Wu wrote:
> queue_check_job_completion calls queue_reset_timeout_locked to reset the
> timeout when progress is made. We want the reset to happen when the
> timeout is running, not when it is suspended.
> 
> Fixes: 345c5b7cc0f85 ("drm/panthor: Make the timeout per-queue instead of per-job")
> Signed-off-by: Chia-I Wu <olvaffe@gmail.com>

Reviewed-by: Liviu Dudau <liviu.dudau@arm.com>

Best regards,
Liviu

> 
> ---
> v2: reset queue->timeout.remaining when suspended (Boris)
> ---
>  drivers/gpu/drm/panthor/panthor_sched.c | 26 +++++++++++++------------
>  1 file changed, 14 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/gpu/drm/panthor/panthor_sched.c b/drivers/gpu/drm/panthor/panthor_sched.c
> index 389d508b3848e..95ae42168ce18 100644
> --- a/drivers/gpu/drm/panthor/panthor_sched.c
> +++ b/drivers/gpu/drm/panthor/panthor_sched.c
> @@ -1052,18 +1052,6 @@ group_is_idle(struct panthor_group *group)
>  	return hweight32(inactive_queues) == group->queue_count;
>  }
>  
> -static void
> -queue_reset_timeout_locked(struct panthor_queue *queue)
> -{
> -	lockdep_assert_held(&queue->fence_ctx.lock);
> -
> -	if (queue->timeout.remaining != MAX_SCHEDULE_TIMEOUT) {
> -		mod_delayed_work(queue->scheduler.timeout_wq,
> -				 &queue->timeout.work,
> -				 msecs_to_jiffies(JOB_TIMEOUT_MS));
> -	}
> -}
> -
>  static bool
>  group_can_run(struct panthor_group *group)
>  {
> @@ -1080,6 +1068,20 @@ queue_timeout_is_suspended(struct panthor_queue *queue)
>  	return queue->timeout.remaining != MAX_SCHEDULE_TIMEOUT;
>  }
>  
> +static void
> +queue_reset_timeout_locked(struct panthor_queue *queue)
> +{
> +	lockdep_assert_held(&queue->fence_ctx.lock);
> +
> +	if (queue_timeout_is_suspended(queue)) {
> +		queue->timeout.remaining = msecs_to_jiffies(JOB_TIMEOUT_MS);
> +	} else {
> +		mod_delayed_work(queue->scheduler.timeout_wq,
> +				 &queue->timeout.work,
> +				 msecs_to_jiffies(JOB_TIMEOUT_MS));
> +	}
> +}
> +
>  static void
>  queue_suspend_timeout_locked(struct panthor_queue *queue)
>  {
> -- 
> 2.52.0.158.g65b55ccf14-goog
>
Re: [PATCH v2] drm/panthor: fix queue_reset_timeout_locked
Posted by Boris Brezillon 2 weeks, 2 days ago 
On Tue,  2 Dec 2025 13:31:02 -0800
Chia-I Wu <olvaffe@gmail.com> wrote:

> queue_check_job_completion calls queue_reset_timeout_locked to reset the
> timeout when progress is made. We want the reset to happen when the
> timeout is running, not when it is suspended.
> 
> Fixes: 345c5b7cc0f85 ("drm/panthor: Make the timeout per-queue instead of per-job")
> Signed-off-by: Chia-I Wu <olvaffe@gmail.com>

Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>

> 
> ---
> v2: reset queue->timeout.remaining when suspended (Boris)
> ---
>  drivers/gpu/drm/panthor/panthor_sched.c | 26 +++++++++++++------------
>  1 file changed, 14 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/gpu/drm/panthor/panthor_sched.c b/drivers/gpu/drm/panthor/panthor_sched.c
> index 389d508b3848e..95ae42168ce18 100644
> --- a/drivers/gpu/drm/panthor/panthor_sched.c
> +++ b/drivers/gpu/drm/panthor/panthor_sched.c
> @@ -1052,18 +1052,6 @@ group_is_idle(struct panthor_group *group)
>  	return hweight32(inactive_queues) == group->queue_count;
>  }
>  
> -static void
> -queue_reset_timeout_locked(struct panthor_queue *queue)
> -{
> -	lockdep_assert_held(&queue->fence_ctx.lock);
> -
> -	if (queue->timeout.remaining != MAX_SCHEDULE_TIMEOUT) {
> -		mod_delayed_work(queue->scheduler.timeout_wq,
> -				 &queue->timeout.work,
> -				 msecs_to_jiffies(JOB_TIMEOUT_MS));
> -	}
> -}
> -
>  static bool
>  group_can_run(struct panthor_group *group)
>  {
> @@ -1080,6 +1068,20 @@ queue_timeout_is_suspended(struct panthor_queue *queue)
>  	return queue->timeout.remaining != MAX_SCHEDULE_TIMEOUT;
>  }
>  
> +static void
> +queue_reset_timeout_locked(struct panthor_queue *queue)
> +{
> +	lockdep_assert_held(&queue->fence_ctx.lock);
> +
> +	if (queue_timeout_is_suspended(queue)) {
> +		queue->timeout.remaining = msecs_to_jiffies(JOB_TIMEOUT_MS);
> +	} else {
> +		mod_delayed_work(queue->scheduler.timeout_wq,
> +				 &queue->timeout.work,
> +				 msecs_to_jiffies(JOB_TIMEOUT_MS));
> +	}
> +}
> +
>  static void
>  queue_suspend_timeout_locked(struct panthor_queue *queue)
>  {

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.