| Message ID | 20200916150147.25753-4-narmstrong@baylibre.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Neil Armstrong |
| Headers | show |
| Series | drm/panfrost: add Amlogic integration quirks | expand |
On 16/09/2020 16:01, Neil Armstrong wrote: > This adds the required GPU quirks, including the quirk in the PWR registers at the GPU > reset time and the IOMMU quirk for shareability issues observed on G52 in Amlogic G12B SoCs. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Reviewed-by: Steven Price <steven.price@arm.com> > --- > drivers/gpu/drm/panfrost/panfrost_drv.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c > index 7c8a87d164c3..6e5dedacb777 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_drv.c > +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c > @@ -658,7 +658,18 @@ static const struct panfrost_compatible default_data = { > .pm_domain_names = NULL, > }; > > +static const struct panfrost_compatible amlogic_data = { > + .num_supplies = ARRAY_SIZE(default_supplies), > + .supply_names = default_supplies, > + .vendor_quirk = panfrost_gpu_amlogic_quirk, > +}; > + > static const struct of_device_id dt_match[] = { > + /* Set first to probe before the generic compatibles */ > + { .compatible = "amlogic,meson-gxm-mali", > + .data = &amlogic_data, }, > + { .compatible = "amlogic,meson-g12a-mali", > + .data = &amlogic_data, }, > { .compatible = "arm,mali-t604", .data = &default_data, }, > { .compatible = "arm,mali-t624", .data = &default_data, }, > { .compatible = "arm,mali-t628", .data = &default_data, }, >
diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c index 7c8a87d164c3..6e5dedacb777 100644 --- a/drivers/gpu/drm/panfrost/panfrost_drv.c +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c @@ -658,7 +658,18 @@ static const struct panfrost_compatible default_data = { .pm_domain_names = NULL, }; +static const struct panfrost_compatible amlogic_data = { + .num_supplies = ARRAY_SIZE(default_supplies), + .supply_names = default_supplies, + .vendor_quirk = panfrost_gpu_amlogic_quirk, +}; + static const struct of_device_id dt_match[] = { + /* Set first to probe before the generic compatibles */ + { .compatible = "amlogic,meson-gxm-mali", + .data = &amlogic_data, }, + { .compatible = "amlogic,meson-g12a-mali", + .data = &amlogic_data, }, { .compatible = "arm,mali-t604", .data = &default_data, }, { .compatible = "arm,mali-t624", .data = &default_data, }, { .compatible = "arm,mali-t628", .data = &default_data, },
This adds the required GPU quirks, including the quirk in the PWR registers at the GPU reset time and the IOMMU quirk for shareability issues observed on G52 in Amlogic G12B SoCs. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- drivers/gpu/drm/panfrost/panfrost_drv.c | 11 +++++++++++ 1 file changed, 11 insertions(+)