drm/msm: Convert to use resource-managed OPP API

Use resource-managed OPP API to simplify code.

Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Link: https://lore.kernel.org/r/20210314163408.22292-12-digetx@gmail.com
Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Rob Clark <robdclark@chromium.org>

diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
index eb0f884eaf30ea5a683f1fc377698c37b231e387..f46562c1202224d80c69c9fa4da75b4b707e33e1 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
@@ -1705,7 +1705,7 @@ static void check_speed_bin(struct device *dev)
                nvmem_cell_put(cell);
        }
 
-       dev_pm_opp_set_supported_hw(dev, &val, 1);
+       devm_pm_opp_set_supported_hw(dev, &val, 1);
 }
 
 struct msm_gpu *a5xx_gpu_init(struct drm_device *dev)

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
index 3d55e153fa9c30a8571763be0cc13005bbdc6d66..0517fead9319f5ae5f649281cd738e9c79f4426f 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
@@ -1346,7 +1346,7 @@ static int a6xx_gmu_pwrlevels_probe(struct a6xx_gmu *gmu)
         * The GMU handles its own frequency switching so build a list of
         * available frequencies to send during initialization
         */
-       ret = dev_pm_opp_of_add_table(gmu->dev);
+       ret = devm_pm_opp_of_add_table(gmu->dev);
        if (ret) {
                DRM_DEV_ERROR(gmu->dev, "Unable to set the OPP table for the GMU\n");
                return ret;

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
index 0b9713c2ff6065f8c97f64133362245bac43b0af..540d14e7cdae613a66b0915fd525eb5e9cd87d21 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
@@ -1339,9 +1339,6 @@ static void a6xx_destroy(struct msm_gpu *gpu)
 
        adreno_gpu_cleanup(adreno_gpu);
 
-       if (a6xx_gpu->opp_table)
-               dev_pm_opp_put_supported_hw(a6xx_gpu->opp_table);
-
        kfree(a6xx_gpu);
 }
 
@@ -1474,7 +1471,6 @@ static u32 fuse_to_supp_hw(struct device *dev, u32 revn, u32 fuse)
 static int a6xx_set_supported_hw(struct device *dev, struct a6xx_gpu *a6xx_gpu,
                u32 revn)
 {
-       struct opp_table *opp_table;
        u32 supp_hw = UINT_MAX;
        u16 speedbin;
        int ret;
@@ -1497,11 +1493,10 @@ static int a6xx_set_supported_hw(struct device *dev, struct a6xx_gpu *a6xx_gpu,
        supp_hw = fuse_to_supp_hw(dev, revn, speedbin);
 
 done:
-       opp_table = dev_pm_opp_set_supported_hw(dev, &supp_hw, 1);
-       if (IS_ERR(opp_table))
-               return PTR_ERR(opp_table);
+       ret = devm_pm_opp_set_supported_hw(dev, &supp_hw, 1);
+       if (ret)
+               return ret;
 
-       a6xx_gpu->opp_table = opp_table;
        return 0;
 }
 

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.h b/drivers/gpu/drm/msm/adreno/a6xx_gpu.h
index bb544dfe57379d01165e8b8855b575d9cd242715..0bc2d062f54ab15a52e925a30ef0de130af92e83 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.h
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.h
@@ -33,8 +33,6 @@ struct a6xx_gpu {
        void *llc_slice;
        void *htw_llc_slice;
        bool have_mmu500;
-
-       struct opp_table *opp_table;
 };
 
 #define to_a6xx_gpu(x) container_of(x, struct a6xx_gpu, base)

diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
index 8fd0777f2dc9360afecd6e339756a1d6af95277c..c1b02f79080426b8829b06c42ea60ef9779d8c40 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
@@ -841,7 +841,7 @@ static void adreno_get_pwrlevels(struct device *dev,
        if (!of_find_property(dev->of_node, "operating-points-v2", NULL))
                ret = adreno_get_legacy_pwrlevels(dev);
        else {
-               ret = dev_pm_opp_of_add_table(dev);
+               ret = devm_pm_opp_of_add_table(dev);
                if (ret)
                        DRM_DEV_ERROR(dev, "Unable to set the OPP table\n");
        }

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
index e500a9294528de7472c18e7d94ddf6ef608f3b23..1d3a4f395e74cd791d031a3fc45a84581438a72a 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
@@ -1141,21 +1141,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);
@@ -1163,7 +1163,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;
@@ -1172,11 +1172,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;
 }
 
@@ -1192,9 +1188,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 = {

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
index bbaee4f75c6fc6dbdd5b96bea51360b9950c1a68..2b23696ee7fd34b4add859583622c9f86db25030 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
@@ -128,8 +128,6 @@ struct dpu_kms {
        struct platform_device *pdev;
        bool rpm_enabled;
 
-       struct opp_table *opp_table;
-
        struct dss_module_power mp;
 
        /* reference count bandwidth requests, so we know when we can

diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.c b/drivers/gpu/drm/msm/dp/dp_ctrl.c
index 2a8955ca70d1ada4a42577ce810c078ef0a4a4e5..6f8ace7890fe2d219237901d31ff7fe1f3a14652 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_ctrl.c
+++ b/drivers/gpu/drm/msm/dp/dp_ctrl.c
@@ -77,8 +77,6 @@ struct dp_ctrl_private {
        struct dp_parser *parser;
        struct dp_catalog *catalog;
 
-       struct opp_table *opp_table;
-
        struct completion idle_comp;
        struct completion video_comp;
 };
@@ -1941,20 +1939,17 @@ struct dp_ctrl *dp_ctrl_get(struct device *dev, struct dp_link *link,
                return ERR_PTR(-ENOMEM);
        }
 
-       ctrl->opp_table = dev_pm_opp_set_clkname(dev, "ctrl_link");
-       if (IS_ERR(ctrl->opp_table)) {
+       ret = devm_pm_opp_set_clkname(dev, "ctrl_link");
+       if (ret) {
                dev_err(dev, "invalid DP OPP table in device tree\n");
-               /* caller do PTR_ERR(ctrl->opp_table) */
-               return (struct dp_ctrl *)ctrl->opp_table;
+               /* caller do PTR_ERR(opp_table) */
+               return (struct dp_ctrl *)ERR_PTR(ret);
        }
 
        /* OPP table is optional */
-       ret = dev_pm_opp_of_add_table(dev);
-       if (ret) {
+       ret = devm_pm_opp_of_add_table(dev);
+       if (ret)
                dev_err(dev, "failed to add DP OPP table\n");
-               dev_pm_opp_put_clkname(ctrl->opp_table);
-               ctrl->opp_table = NULL;
-       }
 
        init_completion(&ctrl->idle_comp);
        init_completion(&ctrl->video_comp);
@@ -1970,16 +1965,3 @@ struct dp_ctrl *dp_ctrl_get(struct device *dev, struct dp_link *link,
 
        return &ctrl->dp_ctrl;
 }
-
-void dp_ctrl_put(struct dp_ctrl *dp_ctrl)
-{
-       struct dp_ctrl_private *ctrl;
-
-       ctrl = container_of(dp_ctrl, struct dp_ctrl_private, dp_ctrl);
-
-       if (ctrl->opp_table) {
-               dev_pm_opp_of_remove_table(ctrl->dev);
-               dev_pm_opp_put_clkname(ctrl->opp_table);
-               ctrl->opp_table = NULL;
-       }
-}

diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.h b/drivers/gpu/drm/msm/dp/dp_ctrl.h
index 25e4f7512252254ae2ecf8bec3535036f9733c97..2363a2df9597b50fb7259d48a5bbd1d04369047d 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_ctrl.h
+++ b/drivers/gpu/drm/msm/dp/dp_ctrl.h
@@ -33,6 +33,5 @@ struct dp_ctrl *dp_ctrl_get(struct device *dev, struct dp_link *link,
                        struct dp_panel *panel, struct drm_dp_aux *aux,
                        struct dp_power *power, struct dp_catalog *catalog,
                        struct dp_parser *parser);
-void dp_ctrl_put(struct dp_ctrl *dp_ctrl);
 
 #endif /* _DP_CTRL_H_ */

diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
index cf9c645346241dced4f023993c94fa5ac681c9d5..1b051ee93d7afc84df4df6630b1f1ec2ba311f78 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -747,7 +747,6 @@ static int dp_irq_hpd_handle(struct dp_display_private *dp, u32 data)
 static void dp_display_deinit_sub_modules(struct dp_display_private *dp)
 {
        dp_debug_put(dp->debug);
-       dp_ctrl_put(dp->ctrl);
        dp_panel_put(dp->panel);
        dp_aux_put(dp->aux);
        dp_audio_put(dp->audio);
@@ -841,13 +840,11 @@ static int dp_init_sub_modules(struct dp_display_private *dp)
                rc = PTR_ERR(dp->audio);
                pr_err("failed to initialize audio, rc = %d\n", rc);
                dp->audio = NULL;
-               goto error_audio;
+               goto error_ctrl;
        }
 
        return rc;
 
-error_audio:
-       dp_ctrl_put(dp->ctrl);
 error_ctrl:
        dp_panel_put(dp->panel);
 error_link:

diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c
index dfaff19f4ba0dd8244a1d253c0b11b87abc7214f..ed504fe5074f6ce8f5395a8dc3ba8f4123074949 100644 (file)
--- a/drivers/gpu/drm/msm/dsi/dsi_host.c
+++ b/drivers/gpu/drm/msm/dsi/dsi_host.c
@@ -114,8 +114,6 @@ struct msm_dsi_host {
        struct clk *pixel_clk_src;
        struct clk *byte_intf_clk;
 
-       struct opp_table *opp_table;
-
        u32 byte_clk_rate;
        u32 pixel_clk_rate;
        u32 esc_clk_rate;
@@ -1885,14 +1883,13 @@ int msm_dsi_host_init(struct msm_dsi *msm_dsi)
                goto fail;
        }
 
-       msm_host->opp_table = dev_pm_opp_set_clkname(&pdev->dev, "byte");
-       if (IS_ERR(msm_host->opp_table))
-               return PTR_ERR(msm_host->opp_table);
+       ret = devm_pm_opp_set_clkname(&pdev->dev, "byte");
+       if (ret)
+               return ret;
        /* OPP table is optional */
-       ret = dev_pm_opp_of_add_table(&pdev->dev);
+       ret = devm_pm_opp_of_add_table(&pdev->dev);
        if (ret && ret != -ENODEV) {
                dev_err(&pdev->dev, "invalid OPP table in device tree\n");
-               dev_pm_opp_put_clkname(msm_host->opp_table);
                return ret;
        }
 
@@ -1931,8 +1928,6 @@ void msm_dsi_host_destroy(struct mipi_dsi_host *host)
        mutex_destroy(&msm_host->cmd_mutex);
        mutex_destroy(&msm_host->dev_mutex);
 
-       dev_pm_opp_of_remove_table(&msm_host->pdev->dev);
-       dev_pm_opp_put_clkname(msm_host->opp_table);
        pm_runtime_disable(&msm_host->pdev->dev);
 }