From: Boris Brezillon <boris.brezillon@collabora.com>
To: dri-devel@lists.freedesktop.org
Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>,
Steven Price <steven.price@arm.com>,
Rob Herring <robh+dt@kernel.org>,
Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>,
Boris Brezillon <boris.brezillon@collabora.com>,
Robin Murphy <robin.murphy@arm.com>
Subject: [PATCH v4 11/14] drm/panfrost: Reset the GPU when the AS_ACTIVE bit is stuck
Date: Mon, 28 Jun 2021 09:42:07 +0200 [thread overview]
Message-ID: <20210628074210.2695399-12-boris.brezillon@collabora.com> (raw)
In-Reply-To: <20210628074210.2695399-1-boris.brezillon@collabora.com>
Things are unlikely to resolve until we reset the GPU. Let's not wait
for other faults/timeout to happen to trigger this reset.
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Steven Price <steven.price@arm.com>
---
drivers/gpu/drm/panfrost/panfrost_mmu.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panfrost/panfrost_mmu.c
index 65e98c51cb66..5267c3a1f02f 100644
--- a/drivers/gpu/drm/panfrost/panfrost_mmu.c
+++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c
@@ -36,8 +36,11 @@ static int wait_ready(struct panfrost_device *pfdev, u32 as_nr)
ret = readl_relaxed_poll_timeout_atomic(pfdev->iomem + AS_STATUS(as_nr),
val, !(val & AS_STATUS_AS_ACTIVE), 10, 1000);
- if (ret)
+ if (ret) {
+ /* The GPU hung, let's trigger a reset */
+ panfrost_device_schedule_reset(pfdev);
dev_err(pfdev->dev, "AS_ACTIVE bit stuck\n");
+ }
return ret;
}
--
2.31.1
next prev parent reply other threads:[~2021-06-28 7:42 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-28 7:41 [PATCH v4 00/14] drm/panfrost: Misc improvements Boris Brezillon
2021-06-28 7:41 ` [PATCH v4 01/14] drm/sched: Allow using a dedicated workqueue for the timeout/fault tdr Boris Brezillon
2021-06-28 9:23 ` Steven Price
2021-06-28 9:57 ` Lucas Stach
2021-06-28 7:41 ` [PATCH v4 02/14] drm/panfrost: Make ->run_job() return an ERR_PTR() when appropriate Boris Brezillon
2021-06-28 7:41 ` [PATCH v4 03/14] drm/panfrost: Get rid of the unused JS_STATUS_EVENT_ACTIVE definition Boris Brezillon
2021-06-28 7:42 ` [PATCH v4 04/14] drm/panfrost: Drop the pfdev argument passed to panfrost_exception_name() Boris Brezillon
2021-06-28 7:42 ` [PATCH v4 05/14] drm/panfrost: Do the exception -> string translation using a table Boris Brezillon
2021-06-28 7:42 ` [PATCH v4 06/14] drm/panfrost: Expose a helper to trigger a GPU reset Boris Brezillon
2021-06-28 7:42 ` [PATCH v4 07/14] drm/panfrost: Use a threaded IRQ for job interrupts Boris Brezillon
2021-06-28 9:26 ` Steven Price
2021-06-28 9:39 ` Boris Brezillon
2021-06-28 7:42 ` [PATCH v4 08/14] drm/panfrost: Simplify the reset serialization logic Boris Brezillon
2021-06-28 9:45 ` Steven Price
2021-06-28 7:42 ` [PATCH v4 09/14] drm/panfrost: Make sure job interrupts are masked before resetting Boris Brezillon
2021-06-28 9:47 ` Steven Price
2021-06-28 7:42 ` [PATCH v4 10/14] drm/panfrost: Disable the AS on unhandled page faults Boris Brezillon
2021-06-28 7:42 ` Boris Brezillon [this message]
2021-06-28 7:42 ` [PATCH v4 12/14] drm/panfrost: Don't reset the GPU on job faults unless we really have to Boris Brezillon
2021-06-28 9:49 ` Steven Price
2021-06-28 7:42 ` [PATCH v4 13/14] drm/panfrost: Kill in-flight jobs on FD close Boris Brezillon
2021-06-28 10:04 ` Steven Price
2021-06-28 7:42 ` [PATCH v4 14/14] drm/panfrost: Queue jobs on the hardware Boris Brezillon
2021-06-28 13:35 ` Steven Price
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210628074210.2695399-12-boris.brezillon@collabora.com \
--to=boris.brezillon@collabora.com \
--cc=alyssa.rosenzweig@collabora.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=robh+dt@kernel.org \
--cc=robin.murphy@arm.com \
--cc=steven.price@arm.com \
--cc=tomeu.vizoso@collabora.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.