drm/panfrost: add Amlogic GPU integration quirks
authorNeil Armstrong <narmstrong@baylibre.com>
Wed, 16 Sep 2020 15:01:47 +0000 (17:01 +0200)
committerSteven Price <steven.price@arm.com>
Mon, 21 Sep 2020 09:13:50 +0000 (10:13 +0100)
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>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Signed-off-by: Steven Price <steven.price@arm.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200916150147.25753-4-narmstrong@baylibre.com
drivers/gpu/drm/panfrost/panfrost_drv.c

index 36463c89e96694f7f99e47e62fef21dc6259a68c..37d4cb7a5491c4a58ea1a3102ac3f05032e4a9fc 100644 (file)
@@ -656,7 +656,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, },