From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E95C1FE45D; Wed, 25 Feb 2026 01:30:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771983037; cv=none; b=JVaHoZRRxHBu8UHvcPL/+dCQQHzmfAUF9Gb85QmXyOaDSzaGEdFLNRFF1J8nWPw6LqlHijpfo1RwIs/5+arrD/XFSM+VqVux4/8oC6t++2D4DM/RcaMgp3/T7KjRG5t33dZAG9deeuAu2Urk5YlhCzec8bY7I25UrR/h1G+FuAM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771983037; c=relaxed/simple; bh=f9FEO9eJkqckAclrccVktqL/SQrN5RdT/izDDB9/A8c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=s3HabyVT+KJhCn357FWFAH9xeLWROZ2lyzFw4BN6JTyHHe8m6KLQ5etzMOMmZZ6z+yAajy+sgPQ5R4++zua7ZpPtQqNfIfe4+WdXLCsMvI6lVzZtdBGjyrXR2R9UxZ/HMiUoioVDlC1vVHhNDVH9k1HofWm6Sxe/8Pwz7rWUCrg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=F7Iotk4h; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="F7Iotk4h" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 06207C116D0; Wed, 25 Feb 2026 01:30:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1771983037; bh=f9FEO9eJkqckAclrccVktqL/SQrN5RdT/izDDB9/A8c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F7Iotk4ht5bUi57C98KsuJZFVgdABpm3H2ZTnIQafew8yquiw38NGRJ2sTm8QrDal WskPNmrvamzb7yCZX98cBA5VEmby4w7l2lXuf8fK/Yv71OCZ+SviPdBkq1WRxrKuZW e2To6Dthe04+NKeYjGFOMDAKPSNU27HO+HHTXxzc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Chia-I Wu , Liviu Dudau , Sasha Levin Subject: [PATCH 6.19 200/781] drm/panthor: fix queue_reset_timeout_locked Date: Tue, 24 Feb 2026 17:15:09 -0800 Message-ID: <20260225012404.568119569@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260225012359.695468795@linuxfoundation.org> References: <20260225012359.695468795@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chia-I Wu [ Upstream commit ac5b392a8c355001c4c3f230a0e4b1f904e359ca ] 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 Signed-off-by: Liviu Dudau Link: https://patch.msgid.link/20251202174028.1600218-1-olvaffe@gmail.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/panthor/panthor_sched.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/panthor/panthor_sched.c b/drivers/gpu/drm/panthor/panthor_sched.c index f53fa51d51694..6ac4cec52f9e4 100644 --- a/drivers/gpu/drm/panthor/panthor_sched.c +++ b/drivers/gpu/drm/panthor/panthor_sched.c @@ -1072,18 +1072,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) { @@ -1100,6 +1088,18 @@ 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)) { + 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.51.0