* [PATCH v6 1/4] dt-bindings: gpu: mali-bifrost: Add Mediatek MT8183
2021-01-05 0:11 [PATCH v6 0/4] drm/panfrost: Add support for mt8183 GPU Nicolas Boichat
@ 2021-01-05 0:11 ` Nicolas Boichat
2021-01-05 0:11 ` [PATCH v6 3/4] drm/panfrost: devfreq: Disable devfreq when num_supplies > 1 Nicolas Boichat
2021-01-05 0:11 ` [PATCH v6 4/4] drm/panfrost: Add mt8183-mali compatible string Nicolas Boichat
2 siblings, 0 replies; 9+ messages in thread
From: Nicolas Boichat @ 2021-01-05 0:11 UTC (permalink / raw)
To: Rob Herring, Steven Price, Alyssa Rosenzweig
Cc: devicetree, Nicolas Boichat, fshao, David Airlie, linux-kernel,
Rob Herring, boris.brezillon, linux-mediatek, dri-devel, hsinyi,
Matthias Brugger, hoegsberg, linux-arm-kernel
Define a compatible string for the Mali Bifrost GPU found in
Mediatek's MT8183 SoCs.
Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
---
Changes in v6:
- Rebased, actually tested with recent mesa driver.
- No change
Changes in v5:
- Rename "2d" power domain to "core2"
Changes in v4:
- Add power-domain-names description
(kept Alyssa's reviewed-by as the change is minor)
Changes in v3:
- No change
.../bindings/gpu/arm,mali-bifrost.yaml | 25 +++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml b/Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml
index 184492162e7e..71b613ee5bd7 100644
--- a/Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml
+++ b/Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml
@@ -17,6 +17,7 @@ properties:
items:
- enum:
- amlogic,meson-g12a-mali
+ - mediatek,mt8183-mali
- realtek,rtd1619-mali
- rockchip,px30-mali
- const: arm,mali-bifrost # Mali Bifrost GPU model/revision is fully discoverable
@@ -87,6 +88,30 @@ allOf:
then:
required:
- resets
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: mediatek,mt8183-mali
+ then:
+ properties:
+ sram-supply: true
+ power-domains:
+ description:
+ List of phandle and PM domain specifier as documented in
+ Documentation/devicetree/bindings/power/power_domain.txt
+ minItems: 3
+ maxItems: 3
+ power-domain-names:
+ items:
+ - const: core0
+ - const: core1
+ - const: core2
+
+ required:
+ - sram-supply
+ - power-domains
+ - power-domains-names
examples:
- |
--
2.29.2.729.g45daf8777d-goog
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v6 3/4] drm/panfrost: devfreq: Disable devfreq when num_supplies > 1
2021-01-05 0:11 [PATCH v6 0/4] drm/panfrost: Add support for mt8183 GPU Nicolas Boichat
2021-01-05 0:11 ` [PATCH v6 1/4] dt-bindings: gpu: mali-bifrost: Add Mediatek MT8183 Nicolas Boichat
@ 2021-01-05 0:11 ` Nicolas Boichat
2021-01-05 0:34 ` Alyssa Rosenzweig
2021-01-07 15:59 ` Steven Price
2021-01-05 0:11 ` [PATCH v6 4/4] drm/panfrost: Add mt8183-mali compatible string Nicolas Boichat
2 siblings, 2 replies; 9+ messages in thread
From: Nicolas Boichat @ 2021-01-05 0:11 UTC (permalink / raw)
To: Rob Herring, Steven Price, Alyssa Rosenzweig
Cc: Nicolas Boichat, Tomeu Vizoso, fshao, David Airlie, linux-kernel,
dri-devel, boris.brezillon, hsinyi, hoegsberg
GPUs with more than a single regulator (e.g. G-57 on MT8183) will
require platform-specific handling, disable devfreq for now.
Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
---
Changes in v6:
- New change
drivers/gpu/drm/panfrost/panfrost_devfreq.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
index f44d28fad085..1f49043aae73 100644
--- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c
+++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
@@ -92,6 +92,15 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)
struct thermal_cooling_device *cooling;
struct panfrost_devfreq *pfdevfreq = &pfdev->pfdevfreq;
+ if (pfdev->comp->num_supplies > 1) {
+ /*
+ * GPUs with more than 1 supply require platform-specific handling:
+ * continue without devfreq
+ */
+ DRM_DEV_ERROR(dev, "More than 1 supply is not supported yet\n");
+ return 0;
+ }
+
opp_table = dev_pm_opp_set_regulators(dev, pfdev->comp->supply_names,
pfdev->comp->num_supplies);
if (IS_ERR(opp_table)) {
--
2.29.2.729.g45daf8777d-goog
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v6 3/4] drm/panfrost: devfreq: Disable devfreq when num_supplies > 1
2021-01-05 0:11 ` [PATCH v6 3/4] drm/panfrost: devfreq: Disable devfreq when num_supplies > 1 Nicolas Boichat
@ 2021-01-05 0:34 ` Alyssa Rosenzweig
2021-01-05 0:59 ` Nicolas Boichat
2021-01-07 15:59 ` Steven Price
1 sibling, 1 reply; 9+ messages in thread
From: Alyssa Rosenzweig @ 2021-01-05 0:34 UTC (permalink / raw)
To: Nicolas Boichat
Cc: Tomeu Vizoso, fshao, David Airlie, linux-kernel, dri-devel,
Steven Price, boris.brezillon, hsinyi, hoegsberg
[-- Attachment #1.1: Type: text/plain, Size: 73 bytes --]
> GPUs with more than a single regulator (e.g. G-57 on MT8183) will
G72
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v6 3/4] drm/panfrost: devfreq: Disable devfreq when num_supplies > 1
2021-01-05 0:34 ` Alyssa Rosenzweig
@ 2021-01-05 0:59 ` Nicolas Boichat
0 siblings, 0 replies; 9+ messages in thread
From: Nicolas Boichat @ 2021-01-05 0:59 UTC (permalink / raw)
To: Alyssa Rosenzweig
Cc: Tomeu Vizoso, Fei Shao, David Airlie, lkml, dri-devel,
Steven Price, Boris Brezillon, Hsin-Yi Wang, hoegsberg
On Tue, Jan 5, 2021 at 8:34 AM Alyssa Rosenzweig
<alyssa.rosenzweig@collabora.com> wrote:
>
> > GPUs with more than a single regulator (e.g. G-57 on MT8183) will
>
> G72
Duh, sorry, yes. I will fix that in v7.
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v6 3/4] drm/panfrost: devfreq: Disable devfreq when num_supplies > 1
2021-01-05 0:11 ` [PATCH v6 3/4] drm/panfrost: devfreq: Disable devfreq when num_supplies > 1 Nicolas Boichat
2021-01-05 0:34 ` Alyssa Rosenzweig
@ 2021-01-07 15:59 ` Steven Price
2021-01-07 23:51 ` Nicolas Boichat
1 sibling, 1 reply; 9+ messages in thread
From: Steven Price @ 2021-01-07 15:59 UTC (permalink / raw)
To: Nicolas Boichat, Rob Herring, Alyssa Rosenzweig
Cc: Tomeu Vizoso, fshao, David Airlie, linux-kernel, dri-devel,
boris.brezillon, hsinyi, hoegsberg
On 05/01/2021 00:11, Nicolas Boichat wrote:
> GPUs with more than a single regulator (e.g. G-57 on MT8183) will
> require platform-specific handling, disable devfreq for now.
Can you explain what actually goes wrong here? AFAICT the existing code
does support controlling multiple regulators - but clearly this is the
first platform that exercises that code with num_supplies>1.
Steve
>
> Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
> ---
>
> Changes in v6:
> - New change
>
> drivers/gpu/drm/panfrost/panfrost_devfreq.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
> index f44d28fad085..1f49043aae73 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
> @@ -92,6 +92,15 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)
> struct thermal_cooling_device *cooling;
> struct panfrost_devfreq *pfdevfreq = &pfdev->pfdevfreq;
>
> + if (pfdev->comp->num_supplies > 1) {
> + /*
> + * GPUs with more than 1 supply require platform-specific handling:
> + * continue without devfreq
> + */
> + DRM_DEV_ERROR(dev, "More than 1 supply is not supported yet\n");
> + return 0;
> + }
> +
> opp_table = dev_pm_opp_set_regulators(dev, pfdev->comp->supply_names,
> pfdev->comp->num_supplies);
> if (IS_ERR(opp_table)) {
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v6 3/4] drm/panfrost: devfreq: Disable devfreq when num_supplies > 1
2021-01-07 15:59 ` Steven Price
@ 2021-01-07 23:51 ` Nicolas Boichat
0 siblings, 0 replies; 9+ messages in thread
From: Nicolas Boichat @ 2021-01-07 23:51 UTC (permalink / raw)
To: Steven Price
Cc: Tomeu Vizoso, Fei Shao, David Airlie, lkml, dri-devel,
Boris Brezillon, Alyssa Rosenzweig, Hsin-Yi Wang,
Kristian Kristensen
On Thu, Jan 7, 2021 at 11:59 PM Steven Price <steven.price@arm.com> wrote:
>
> On 05/01/2021 00:11, Nicolas Boichat wrote:
> > GPUs with more than a single regulator (e.g. G-57 on MT8183) will
> > require platform-specific handling, disable devfreq for now.
>
> Can you explain what actually goes wrong here? AFAICT the existing code
> does support controlling multiple regulators - but clearly this is the
> first platform that exercises that code with num_supplies>1.
Sure, I should have expanded in the commit message, will do in v9.
We have support for >1 supplies, and we need to enable them to get the
GPU running _at all_ (and the default voltages should be safe by
design).
For devfreq though:
1. There are constraints on the voltage difference between the core
and SRAM, we have this caterpillar logic downstream [1], so somebody
will need to port it (TBH I don't think it's overly critical at this
point, as Bifrost support is still not very mature from what I can
see, and devfreq is purely a performance thing).
2. The core [2] does not support multiple regulators, so we'll need
custom code anyway. Even if we didn't have constraints.
[1] https://chromium.googlesource.com/chromiumos/third_party/kernel/+/refs/heads/chromeos-4.19/drivers/gpu/arm/bifrost/platform/mediatek/mali_kbase_runtime_pm.c#367
[2] https://elixir.bootlin.com/linux/latest/source/drivers/opp/core.c#L679
>
> Steve
>
> >
> > Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
> > ---
> >
> > Changes in v6:
> > - New change
> >
> > drivers/gpu/drm/panfrost/panfrost_devfreq.c | 9 +++++++++
> > 1 file changed, 9 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
> > index f44d28fad085..1f49043aae73 100644
> > --- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c
> > +++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
> > @@ -92,6 +92,15 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)
> > struct thermal_cooling_device *cooling;
> > struct panfrost_devfreq *pfdevfreq = &pfdev->pfdevfreq;
> >
> > + if (pfdev->comp->num_supplies > 1) {
> > + /*
> > + * GPUs with more than 1 supply require platform-specific handling:
> > + * continue without devfreq
> > + */
> > + DRM_DEV_ERROR(dev, "More than 1 supply is not supported yet\n");
> > + return 0;
> > + }
> > +
> > opp_table = dev_pm_opp_set_regulators(dev, pfdev->comp->supply_names,
> > pfdev->comp->num_supplies);
> > if (IS_ERR(opp_table)) {
> >
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v6 4/4] drm/panfrost: Add mt8183-mali compatible string
2021-01-05 0:11 [PATCH v6 0/4] drm/panfrost: Add support for mt8183 GPU Nicolas Boichat
2021-01-05 0:11 ` [PATCH v6 1/4] dt-bindings: gpu: mali-bifrost: Add Mediatek MT8183 Nicolas Boichat
2021-01-05 0:11 ` [PATCH v6 3/4] drm/panfrost: devfreq: Disable devfreq when num_supplies > 1 Nicolas Boichat
@ 2021-01-05 0:11 ` Nicolas Boichat
2021-01-05 0:35 ` Alyssa Rosenzweig
2 siblings, 1 reply; 9+ messages in thread
From: Nicolas Boichat @ 2021-01-05 0:11 UTC (permalink / raw)
To: Rob Herring, Steven Price, Alyssa Rosenzweig
Cc: Nicolas Boichat, Tomeu Vizoso, fshao, David Airlie, linux-kernel,
dri-devel, boris.brezillon, linux-mediatek, hsinyi,
Matthias Brugger, hoegsberg, linux-arm-kernel
Add support for MT8183's G-57 Bifrost.
Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
---
Changes in v6:
- Context conflicts, reflow the code.
- Use ARRAY_SIZE for power domains too.
Changes in v5:
- Change power domain name from 2d to core2.
Changes in v4:
- Add power domain names.
Changes in v3:
- Match mt8183-mali instead of bifrost, as we require special
handling for the 2 regulators and 3 power domains.
drivers/gpu/drm/panfrost/panfrost_drv.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c
index 83a461bdeea8..ca07098a6141 100644
--- a/drivers/gpu/drm/panfrost/panfrost_drv.c
+++ b/drivers/gpu/drm/panfrost/panfrost_drv.c
@@ -665,6 +665,15 @@ static const struct panfrost_compatible amlogic_data = {
.vendor_quirk = panfrost_gpu_amlogic_quirk,
};
+const char * const mediatek_mt8183_supplies[] = { "mali", "sram" };
+const char * const mediatek_mt8183_pm_domains[] = { "core0", "core1", "core2" };
+static const struct panfrost_compatible mediatek_mt8183_data = {
+ .num_supplies = ARRAY_SIZE(mediatek_mt8183_supplies),
+ .supply_names = mediatek_mt8183_supplies,
+ .num_pm_domains = ARRAY_SIZE(mediatek_mt8183_pm_domains),
+ .pm_domain_names = mediatek_mt8183_pm_domains,
+};
+
static const struct of_device_id dt_match[] = {
/* Set first to probe before the generic compatibles */
{ .compatible = "amlogic,meson-gxm-mali",
@@ -681,6 +690,7 @@ static const struct of_device_id dt_match[] = {
{ .compatible = "arm,mali-t860", .data = &default_data, },
{ .compatible = "arm,mali-t880", .data = &default_data, },
{ .compatible = "arm,mali-bifrost", .data = &default_data, },
+ { .compatible = "mediatek,mt8183-mali", .data = &mediatek_mt8183_data },
{}
};
MODULE_DEVICE_TABLE(of, dt_match);
--
2.29.2.729.g45daf8777d-goog
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v6 4/4] drm/panfrost: Add mt8183-mali compatible string
2021-01-05 0:11 ` [PATCH v6 4/4] drm/panfrost: Add mt8183-mali compatible string Nicolas Boichat
@ 2021-01-05 0:35 ` Alyssa Rosenzweig
0 siblings, 0 replies; 9+ messages in thread
From: Alyssa Rosenzweig @ 2021-01-05 0:35 UTC (permalink / raw)
To: Nicolas Boichat
Cc: Tomeu Vizoso, fshao, David Airlie, linux-kernel, dri-devel,
Steven Price, boris.brezillon, linux-mediatek, hsinyi,
Matthias Brugger, hoegsberg, linux-arm-kernel
[-- Attachment #1.1: Type: text/plain, Size: 46 bytes --]
> Add support for MT8183's G-57 Bifrost.
G72
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 9+ messages in thread