Merge tag 'drm-msm-next-2021-06-23b' of https://gitlab.freedesktop.org/drm/msm into...

[linux-2.6-microblaze.git] / drivers / gpu / drm / msm / disp / dpu1 / dpu_kms.c

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
index 93bc357..4fd9135 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
@@ -19,6 +19,7 @@
 #include "msm_drv.h"
 #include "msm_mmu.h"
 #include "msm_gem.h"
+#include "disp/msm_disp_snapshot.h"
 
 #include "dpu_kms.h"
 #include "dpu_core_irq.h"
@@ -798,6 +799,51 @@ static void dpu_irq_uninstall(struct msm_kms *kms)
        dpu_core_irq_uninstall(dpu_kms);
 }
 
+static void dpu_kms_mdp_snapshot(struct msm_disp_state *disp_state, struct msm_kms *kms)
+{
+       int i;
+       struct dpu_kms *dpu_kms;
+       struct dpu_mdss_cfg *cat;
+       struct dpu_hw_mdp *top;
+
+       dpu_kms = to_dpu_kms(kms);
+
+       cat = dpu_kms->catalog;
+       top = dpu_kms->hw_mdp;
+
+       pm_runtime_get_sync(&dpu_kms->pdev->dev);
+
+       /* dump CTL sub-blocks HW regs info */
+       for (i = 0; i < cat->ctl_count; i++)
+               msm_disp_snapshot_add_block(disp_state, cat->ctl[i].len,
+                               dpu_kms->mmio + cat->ctl[i].base, "ctl_%d", i);
+
+       /* dump DSPP sub-blocks HW regs info */
+       for (i = 0; i < cat->dspp_count; i++)
+               msm_disp_snapshot_add_block(disp_state, cat->dspp[i].len,
+                               dpu_kms->mmio + cat->dspp[i].base, "dspp_%d", i);
+
+       /* dump INTF sub-blocks HW regs info */
+       for (i = 0; i < cat->intf_count; i++)
+               msm_disp_snapshot_add_block(disp_state, cat->intf[i].len,
+                               dpu_kms->mmio + cat->intf[i].base, "intf_%d", i);
+
+       /* dump PP sub-blocks HW regs info */
+       for (i = 0; i < cat->pingpong_count; i++)
+               msm_disp_snapshot_add_block(disp_state, cat->pingpong[i].len,
+                               dpu_kms->mmio + cat->pingpong[i].base, "pingpong_%d", i);
+
+       /* dump SSPP sub-blocks HW regs info */
+       for (i = 0; i < cat->sspp_count; i++)
+               msm_disp_snapshot_add_block(disp_state, cat->sspp[i].len,
+                               dpu_kms->mmio + cat->sspp[i].base, "sspp_%d", i);
+
+       msm_disp_snapshot_add_block(disp_state, top->hw.length,
+                       dpu_kms->mmio + top->hw.blk_off, "top");
+
+       pm_runtime_put_sync(&dpu_kms->pdev->dev);
+}
+
 static const struct msm_kms_funcs kms_funcs = {
        .hw_init         = dpu_kms_hw_init,
        .irq_preinstall  = dpu_irq_preinstall,
@@ -818,6 +864,7 @@ static const struct msm_kms_funcs kms_funcs = {
        .round_pixclk    = dpu_kms_round_pixclk,
        .destroy         = dpu_kms_destroy,
        .set_encoder_mode = _dpu_kms_set_encoder_mode,
+       .snapshot        = dpu_kms_mdp_snapshot,
 #ifdef CONFIG_DEBUG_FS
        .debugfs_init    = dpu_kms_debugfs_init,
 #endif
@@ -1089,21 +1136,21 @@ static int dpu_bind(struct device *dev, struct device *master, void *data)
        if (!dpu_kms)
                return -ENOMEM;
 
-       dpu_kms->opp_table = dev_pm_opp_set_clkname(dev, "core");
-       if (IS_ERR(dpu_kms->opp_table))
-               return PTR_ERR(dpu_kms->opp_table);
+       ret = devm_pm_opp_set_clkname(dev, "core");
+       if (ret)
+               return ret;
        /* OPP table is optional */
-       ret = dev_pm_opp_of_add_table(dev);
+       ret = devm_pm_opp_of_add_table(dev);
        if (ret && ret != -ENODEV) {
                dev_err(dev, "invalid OPP table in device tree\n");
-               goto put_clkname;
+               return ret;
        }
 
        mp = &dpu_kms->mp;
        ret = msm_dss_parse_clock(pdev, mp);
        if (ret) {
                DPU_ERROR("failed to parse clocks, ret=%d\n", ret);
-               goto err;
+               return ret;
        }
 
        platform_set_drvdata(pdev, dpu_kms);
@@ -1111,7 +1158,7 @@ static int dpu_bind(struct device *dev, struct device *master, void *data)
        ret = msm_kms_init(&dpu_kms->base, &kms_funcs);
        if (ret) {
                DPU_ERROR("failed to init kms, ret=%d\n", ret);
-               goto err;
+               return ret;
        }
        dpu_kms->dev = ddev;
        dpu_kms->pdev = pdev;
@@ -1120,11 +1167,7 @@ static int dpu_bind(struct device *dev, struct device *master, void *data)
        dpu_kms->rpm_enabled = true;
 
        priv->kms = &dpu_kms->base;
-       return ret;
-err:
-       dev_pm_opp_of_remove_table(dev);
-put_clkname:
-       dev_pm_opp_put_clkname(dpu_kms->opp_table);
+
        return ret;
 }
 
@@ -1140,9 +1183,6 @@ static void dpu_unbind(struct device *dev, struct device *master, void *data)
 
        if (dpu_kms->rpm_enabled)
                pm_runtime_disable(&pdev->dev);
-
-       dev_pm_opp_of_remove_table(dev);
-       dev_pm_opp_put_clkname(dpu_kms->opp_table);
 }
 
 static const struct component_ops dpu_ops = {