54 lines
1.8 KiB
Diff
54 lines
1.8 KiB
Diff
From be2d3e9d061552af6c50220ee7b7e76458a3080f Mon Sep 17 00:00:00 2001
|
|
From: Boris Brezillon <boris.brezillon@collabora.com>
|
|
Date: Thu, 25 Apr 2024 12:39:20 +0200
|
|
Subject: [PATCH] drm/panthor: Kill the faulty_slots variable in
|
|
panthor_sched_suspend()
|
|
|
|
We can use upd_ctx.timedout_mask directly, and the faulty_slots update
|
|
in the flush_caches_failed situation is never used.
|
|
|
|
Suggested-by: Suggested-by: Steven Price <steven.price@arm.com>
|
|
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
|
|
Reviewed-by: Steven Price <steven.price@arm.com>
|
|
Reviewed-by: Liviu Dudau <liviu.dudau@arm.com>
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/20240425103920.826458-1-boris.brezillon@collabora.com
|
|
---
|
|
drivers/gpu/drm/panthor/panthor_sched.c | 10 +++-------
|
|
1 file changed, 3 insertions(+), 7 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/panthor/panthor_sched.c
|
|
+++ b/drivers/gpu/drm/panthor/panthor_sched.c
|
|
@@ -2546,8 +2546,8 @@ void panthor_sched_suspend(struct pantho
|
|
{
|
|
struct panthor_scheduler *sched = ptdev->scheduler;
|
|
struct panthor_csg_slots_upd_ctx upd_ctx;
|
|
- u32 suspended_slots, faulty_slots;
|
|
struct panthor_group *group;
|
|
+ u32 suspended_slots;
|
|
u32 i;
|
|
|
|
mutex_lock(&sched->lock);
|
|
@@ -2566,10 +2566,9 @@ void panthor_sched_suspend(struct pantho
|
|
|
|
csgs_upd_ctx_apply_locked(ptdev, &upd_ctx);
|
|
suspended_slots &= ~upd_ctx.timedout_mask;
|
|
- faulty_slots = upd_ctx.timedout_mask;
|
|
|
|
- if (faulty_slots) {
|
|
- u32 slot_mask = faulty_slots;
|
|
+ if (upd_ctx.timedout_mask) {
|
|
+ u32 slot_mask = upd_ctx.timedout_mask;
|
|
|
|
drm_err(&ptdev->base, "CSG suspend failed, escalating to termination");
|
|
csgs_upd_ctx_init(&upd_ctx);
|
|
@@ -2620,9 +2619,6 @@ void panthor_sched_suspend(struct pantho
|
|
|
|
slot_mask &= ~BIT(csg_id);
|
|
}
|
|
-
|
|
- if (flush_caches_failed)
|
|
- faulty_slots |= suspended_slots;
|
|
}
|
|
|
|
for (i = 0; i < sched->csg_slot_count; i++) {
|