Skip to content

Commit 32d3e0f

Browse files
Rajendra Nayakrobclark
authored andcommitted
drm/msm: dsi: Use OPP API to set clk/perf state
On SDM845 and SC7180 DSI needs to express a performance state requirement on a power domain depending on the clock rates. Use OPP table from DT to register with OPP framework and use dev_pm_opp_set_rate() to set the clk/perf state. dev_pm_opp_set_rate() is designed to be equivalent to clk_set_rate() for devices without an OPP table, hence the change works fine on devices/platforms which only need to set a clock rate. Signed-off-by: Rajendra Nayak <[email protected]> Reviewed-by: Matthias Kaehlcke <[email protected]> Signed-off-by: Rob Clark <[email protected]>
1 parent b0530eb commit 32d3e0f

File tree

1 file changed

+25
-2
lines changed

1 file changed

+25
-2
lines changed

drivers/gpu/drm/msm/dsi/dsi_host.c

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <linux/of_graph.h>
1515
#include <linux/of_irq.h>
1616
#include <linux/pinctrl/consumer.h>
17+
#include <linux/pm_opp.h>
1718
#include <linux/regmap.h>
1819
#include <linux/regulator/consumer.h>
1920
#include <linux/spinlock.h>
@@ -111,6 +112,9 @@ struct msm_dsi_host {
111112
struct clk *pixel_clk_src;
112113
struct clk *byte_intf_clk;
113114

115+
struct opp_table *opp_table;
116+
bool has_opp_table;
117+
114118
u32 byte_clk_rate;
115119
u32 pixel_clk_rate;
116120
u32 esc_clk_rate;
@@ -512,9 +516,10 @@ int dsi_link_clk_set_rate_6g(struct msm_dsi_host *msm_host)
512516
DBG("Set clk rates: pclk=%d, byteclk=%d",
513517
msm_host->mode->clock, msm_host->byte_clk_rate);
514518

515-
ret = clk_set_rate(msm_host->byte_clk, msm_host->byte_clk_rate);
519+
ret = dev_pm_opp_set_rate(&msm_host->pdev->dev,
520+
msm_host->byte_clk_rate);
516521
if (ret) {
517-
pr_err("%s: Failed to set rate byte clk, %d\n", __func__, ret);
522+
pr_err("%s: dev_pm_opp_set_rate failed %d\n", __func__, ret);
518523
return ret;
519524
}
520525

@@ -658,6 +663,8 @@ int dsi_link_clk_enable_v2(struct msm_dsi_host *msm_host)
658663

659664
void dsi_link_clk_disable_6g(struct msm_dsi_host *msm_host)
660665
{
666+
/* Drop the performance state vote */
667+
dev_pm_opp_set_rate(&msm_host->pdev->dev, 0);
661668
clk_disable_unprepare(msm_host->esc_clk);
662669
clk_disable_unprepare(msm_host->pixel_clk);
663670
if (msm_host->byte_intf_clk)
@@ -1879,6 +1886,19 @@ int msm_dsi_host_init(struct msm_dsi *msm_dsi)
18791886
goto fail;
18801887
}
18811888

1889+
msm_host->opp_table = dev_pm_opp_set_clkname(&pdev->dev, "byte");
1890+
if (IS_ERR(msm_host->opp_table))
1891+
return PTR_ERR(msm_host->opp_table);
1892+
/* OPP table is optional */
1893+
ret = dev_pm_opp_of_add_table(&pdev->dev);
1894+
if (!ret) {
1895+
msm_host->has_opp_table = true;
1896+
} else if (ret != -ENODEV) {
1897+
dev_err(&pdev->dev, "invalid OPP table in device tree\n");
1898+
dev_pm_opp_put_clkname(msm_host->opp_table);
1899+
return ret;
1900+
}
1901+
18821902
init_completion(&msm_host->dma_comp);
18831903
init_completion(&msm_host->video_comp);
18841904
mutex_init(&msm_host->dev_mutex);
@@ -1914,6 +1934,9 @@ void msm_dsi_host_destroy(struct mipi_dsi_host *host)
19141934
mutex_destroy(&msm_host->cmd_mutex);
19151935
mutex_destroy(&msm_host->dev_mutex);
19161936

1937+
if (msm_host->has_opp_table)
1938+
dev_pm_opp_of_remove_table(&msm_host->pdev->dev);
1939+
dev_pm_opp_put_clkname(msm_host->opp_table);
19171940
pm_runtime_disable(&msm_host->pdev->dev);
19181941
}
19191942

0 commit comments

Comments
 (0)