From: Neil Armstrong <narmstrong@baylibre.com>
To: robh@kernel.org, tomeu.vizoso@collabora.com,
steven.price@arm.com, alyssa.rosenzweig@collabora.com
Cc: dri-devel@lists.freedesktop.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org,
Neil Armstrong <narmstrong@baylibre.com>
Subject: [PATCH 3/5] drm/panfrost: add support for reset quirk
Date: Tue, 8 Sep 2020 17:18:51 +0200 [thread overview]
Message-ID: <20200908151853.4837-4-narmstrong@baylibre.com> (raw)
In-Reply-To: <20200908151853.4837-1-narmstrong@baylibre.com>
The T820, G31 & G52 GPUs integratewd by Amlogic in the respective GXM, G12A/SM1 & G12B
SoCs needs a quirk in the PWR registers at the GPU reset time.
This adds a callback in the device compatible struct of permit this.
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
drivers/gpu/drm/panfrost/panfrost_device.h | 3 +++
drivers/gpu/drm/panfrost/panfrost_gpu.c | 4 ++++
2 files changed, 7 insertions(+)
diff --git a/drivers/gpu/drm/panfrost/panfrost_device.h b/drivers/gpu/drm/panfrost/panfrost_device.h
index 2cf1a6a13af8..4c9cd5452ba5 100644
--- a/drivers/gpu/drm/panfrost/panfrost_device.h
+++ b/drivers/gpu/drm/panfrost/panfrost_device.h
@@ -73,6 +73,9 @@ struct panfrost_compatible {
/* IOMMU quirks flags */
unsigned long pgtbl_quirks;
+
+ /* Vendor implementation quirks at reset time callback */
+ void (*vendor_reset_quirk)(struct panfrost_device *pfdev);
};
struct panfrost_device {
diff --git a/drivers/gpu/drm/panfrost/panfrost_gpu.c b/drivers/gpu/drm/panfrost/panfrost_gpu.c
index e0f190e43813..c129aaf77790 100644
--- a/drivers/gpu/drm/panfrost/panfrost_gpu.c
+++ b/drivers/gpu/drm/panfrost/panfrost_gpu.c
@@ -62,6 +62,10 @@ int panfrost_gpu_soft_reset(struct panfrost_device *pfdev)
gpu_write(pfdev, GPU_INT_CLEAR, GPU_IRQ_RESET_COMPLETED);
gpu_write(pfdev, GPU_CMD, GPU_CMD_SOFT_RESET);
+ /* The Amlogic GPU integration needs quirks at this stage */
+ if (pfdev->comp->vendor_reset_quirk)
+ pfdev->comp->vendor_reset_quirk(pfdev);
+
ret = readl_relaxed_poll_timeout(pfdev->iomem + GPU_INT_RAWSTAT,
val, val & GPU_IRQ_RESET_COMPLETED, 100, 10000);
--
2.22.0
next prev parent reply other threads:[~2020-09-08 20:04 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-08 15:18 [PATCH 0/5] drm/panfrost: add Amlogic integration quirks Neil Armstrong
2020-09-08 15:18 ` [PATCH 1/5] iommu/io-pgtable-arm: Add BROKEN_NS quirk to disable shareability on ARM LPAE Neil Armstrong
2020-09-09 12:23 ` Steven Price
2020-09-09 12:27 ` Neil Armstrong
2020-09-08 15:18 ` [PATCH 2/5] drm/panfrost: add support specifying pgtbl quirks Neil Armstrong
2020-09-09 12:23 ` Steven Price
2020-09-08 15:18 ` Neil Armstrong [this message]
2020-09-09 12:23 ` [PATCH 3/5] drm/panfrost: add support for reset quirk Steven Price
2020-09-09 12:26 ` Neil Armstrong
2020-09-08 15:18 ` [PATCH 4/5] drm/panfrost: add amlogic reset quirk callback Neil Armstrong
2020-09-08 19:10 ` Alyssa Rosenzweig
2020-09-09 12:23 ` Steven Price
2020-09-09 12:27 ` Neil Armstrong
2020-09-08 15:18 ` [PATCH 5/5] drm/panfrost: add Amlogic GPU integration quirks Neil Armstrong
2020-09-08 19:11 ` Alyssa Rosenzweig
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=20200908151853.4837-4-narmstrong@baylibre.com \
--to=narmstrong@baylibre.com \
--cc=alyssa.rosenzweig@collabora.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh@kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox