From: Biju Das <[email protected]>

RZ/G3E SoC is embedded with Mali-G52 GPU system. The system hangs after
STR in the following condition:

STR -> Wakeup from STR -> Unload panfrost using 'modprobe -r panfrost'.

Fix this issue by asserting/deasserting the reset during suspend/resume.
Rename the variable allwinner_h616_data->default_pm_rt_data for data
reuse and make it as generic GPU PM runtime data.

Signed-off-by: Biju Das <[email protected]>
---
 drivers/gpu/drm/panfrost/panfrost_drv.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c 
b/drivers/gpu/drm/panfrost/panfrost_drv.c
index 7d8c7c337606..e553f183c780 100644
--- a/drivers/gpu/drm/panfrost/panfrost_drv.c
+++ b/drivers/gpu/drm/panfrost/panfrost_drv.c
@@ -976,7 +976,7 @@ static const struct panfrost_compatible default_data = {
        .pm_domain_names = NULL,
 };
 
-static const struct panfrost_compatible allwinner_h616_data = {
+static const struct panfrost_compatible default_pm_rt_data = {
        .num_supplies = ARRAY_SIZE(default_supplies) - 1,
        .supply_names = default_supplies,
        .num_pm_domains = 1,
@@ -1056,6 +1056,7 @@ static const struct of_device_id dt_match[] = {
          .data = &amlogic_data, },
        { .compatible = "amlogic,meson-g12a-mali",
          .data = &amlogic_data, },
+       { .compatible = "renesas,r9a09g047-mali", .data = &default_pm_rt_data },
        { .compatible = "arm,mali-t604", .data = &default_data, },
        { .compatible = "arm,mali-t624", .data = &default_data, },
        { .compatible = "arm,mali-t628", .data = &default_data, },
@@ -1073,7 +1074,7 @@ static const struct of_device_id dt_match[] = {
        { .compatible = "mediatek,mt8188-mali", .data = &mediatek_mt8188_data },
        { .compatible = "mediatek,mt8192-mali", .data = &mediatek_mt8192_data },
        { .compatible = "mediatek,mt8370-mali", .data = &mediatek_mt8370_data },
-       { .compatible = "allwinner,sun50i-h616-mali", .data = 
&allwinner_h616_data },
+       { .compatible = "allwinner,sun50i-h616-mali", .data = 
&default_pm_rt_data },
        {}
 };
 MODULE_DEVICE_TABLE(of, dt_match);
-- 
2.43.0

Reply via email to