drm/msm/dp: add voltage corners voting support base on dp link rate
PATCH 1/1 drm/msm/dp: add voltage corners voting support base on dp link rate
Set link rate by using OPP set rate api so that CX level will be set accordingly base on the link rate.
--- drivers/gpu/drm/msm/dp/dp_ctrl.c | 33 ++++++++++++++++++++++- drivers/gpu/drm/msm/dp/dp_ctrl.h | 2 +- drivers/gpu/drm/msm/dp/dp_display.c | 8 +++--- drivers/gpu/drm/msm/dp/dp_power.c | 42 ++++++++++++++++++++++++++--- drivers/gpu/drm/msm/dp/dp_power.h | 2 +- 5 files changed, 77 insertions(+), 10 deletions(-)
drivers/gpu/drm/msm/dp/dp_ctrl.c +32 -1
@@ -10,6 +10,7 @@#include <linux/delay.h> #include <linux/phy/phy.h> #include <linux/phy/phy-dp.h> +#include <linux/pm_opp.h> #include <drm/drm_fixed.h> #include <drm/drm_dp_helper.h> #include <drm/drm_print.h>
@@ -76,6 +77,8 @@ 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; };
@@ -1836,6 +1839,7 @@ struct dp_ctrl *dp_ctrl_get(struct device *dev, struct dp_link *link, struct dp_parser *parser) {struct dp_ctrl_private *ctrl; +int ret;if (!dev || !panel || !aux || !link || !catalog) {
@@ -1849,6 +1853,21 @@ 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)) { +dev_err (dev,"invalid DP OPP table in device tree\n" ); + ctrl->opp_table =NULL ; + }else { +/* OPP table is optional */ + ret =dev_pm_opp_of_add_table (dev); +if (ret && ret != -ENODEV ) { +dev_err (dev,"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);
@@ -1864,6 +1883,18 @@ 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) +void dp_ctrl_put (struct device *dev,struct dp_ctrl *dp_ctrl) { +struct dp_ctrl_private *ctrl; + +if (!dp_ctrl) +return ; + + ctrl = container_of(dp_ctrl, struct dp_ctrl_private, dp_ctrl); + +if (ctrl->opp_table !=NULL ) { +dev_pm_opp_of_remove_table (dev); +dev_pm_opp_put_clkname (ctrl->opp_table); + ctrl->opp_table =NULL ; + } }
drivers/gpu/drm/msm/dp/dp_ctrl.h +1 -1
@@ -31,6 +31,6 @@ 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); +void dp_ctrl_put (struct device *dev,struct dp_ctrl *dp_ctrl);#endif /* _DP_CTRL_H_ */
drivers/gpu/drm/msm/dp/dp_display.c +5 -3
@@ -648,8 +648,10 @@ 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) { +struct device *dev = &dp->pdev->dev; +dp_debug_put (dp->debug); -dp_ctrl_put (dp->ctrl); +dp_ctrl_put (dev, dp->ctrl);dp_panel_put (dp->panel);dp_aux_put (dp->aux);dp_audio_put (dp->audio);
@@ -693,7 +695,7 @@ static int dp_init_sub_modules(struct dp_display_private *dp) goto error; } - dp->power =dp_power_get (dp->parser); + dp->power =dp_power_get (dev, dp->parser);if (IS_ERR (dp->power)) { rc =PTR_ERR (dp->power);DRM_ERROR ("failed to initialize power, rc = %d\n" , rc);
@@ -749,7 +751,7 @@ static int dp_init_sub_modules(struct dp_display_private *dp)return rc; error_audio: -dp_ctrl_put (dp->ctrl); +dp_ctrl_put (dev, dp->ctrl); error_ctrl:dp_panel_put (dp->panel); error_link:
drivers/gpu/drm/msm/dp/dp_power.c +38 -4
81 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_power.h +1 -1
@@ -102,6 +102,6 @@ void dp_power_client_deinit(struct dp_power *power);* methods to be called by the client to configure the power related * modueles. */ -struct dp_power *dp_power_get (struct dp_parser *parser); +struct dp_power *dp_power_get (struct device *dev,struct dp_parser *parser);#endif /* _DP_POWER_H_ */
base-commit: 3c0f462da069af12211901ddf26f7e16e6951d9b
prerequisite-patch-id: a109eaf08147f50149ad661a58122b6745a52445
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Quoting Kuogee Hsieh (2020-09-29 10:10:26)
Quoted 2 lines
Set link rate by using OPP set rate api so that CX level will be set accordingly base on the link rate.
s/base/based/
Quoted 11 lines
Signed-off-by Kuogee Hsieh <[email protected]>---
drivers/gpu/drm/msm/dp/dp_ctrl.c +0
-0@@ -1849,6 +1853,21 @@ struct dp_ctrl *dp_ctrl_get(struct device *dev, struct dp_link *link,return ERR_PTR (-ENOMEM ); }
drivers/gpu/drm/msm/dp/dp_ctrl.c struct dp_ctrl *dp_ctrl_get(struct device *dev, struct dp_link *link, · line 1865
Quoted 10 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +10
-0+ ctrl->opp_table =dev_pm_opp_set_clkname (dev,"ctrl_link" ); + +if (IS_ERR (ctrl->opp_table)) { +dev_err (dev,"invalid DP OPP table in device tree\n" ); + ctrl->opp_table =NULL ; + }else { +/* OPP table is optional */ + ret =dev_pm_opp_of_add_table (dev); +if (ret && ret != -ENODEV ) { +dev_err (dev,"add DP OPP table\n" );
This is debug noise right?
Quoted 9 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +5
-0+dev_pm_opp_put_clkname (ctrl->opp_table); + ctrl->opp_table =NULL ; + } + } +init_completion (&ctrl->idle_comp);init_completion (&ctrl->video_comp);
drivers/gpu/drm/msm/dp/dp_ctrl.c struct dp_ctrl *dp_ctrl_get(struct device *dev, struct dp_link *link, · line 1890
Quoted 9 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +4
-1@@ -1864,6 +1883,18 @@ 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) +void dp_ctrl_put (struct device *dev,struct dp_ctrl *dp_ctrl) { +struct dp_ctrl_private *ctrl; + +if (!dp_ctrl)
Can this happen?
drivers/gpu/drm/msm/dp/dp_ctrl.c struct dp_ctrl *dp_ctrl_get(struct device *dev, struct dp_link *link, · line 1895
Quoted 5 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +5
-0+return ; + + ctrl = container_of(dp_ctrl, struct dp_ctrl_private, dp_ctrl); + +if (ctrl->opp_table !=NULL ) {
This is usually written as
if (ctrl->opp_table)
Quoted 10 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +4
-0+dev_pm_opp_of_remove_table (dev); +dev_pm_opp_put_clkname (ctrl->opp_table); + ctrl->opp_table =NULL ; + } }drivers/gpu/drm/msm/dp/dp_ctrl.h +0
-0
drivers/gpu/drm/msm/dp/dp_ctrl.h struct dp_ctrl *dp_ctrl_get(struct device *dev, struct dp_link *link, · line 34
Quoted 5 lines
drivers/gpu/drm/msm/dp/dp_ctrl.h +1
-1@@ -31,6 +31,6 @@ 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); +void dp_ctrl_put (struct device *dev,struct dp_ctrl *dp_ctrl);
Is 'dev' not inside 'dp_ctrl'?
Quoted 30 lines
drivers/gpu/drm/msm/dp/dp_ctrl.h +0
-0#endif /* _DP_CTRL_H_ */ drivers/gpu/drm/msm/dp/dp_power.c +7
-0@@ -8,12 +8,14 @@#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/regulator/consumer.h> +#include <linux/pm_opp.h> #include "dp_power.h" #include "msm_drv.h" struct dp_power_private {struct dp_parser *parser;struct platform_device *pdev; +struct device *dev;struct clk *link_clk_src;struct clk *pixel_provider;struct clk *link_provider;@@ -148,18 +150,49 @@ static int dp_power_clk_deinit(struct dp_power_private *power)return 0 ; } +static int dp_power_clk_set_link_rate (struct dp_power_private *power, +struct dss_clk *clk_arry,int num_clk,int enable) +{ +u32 rate; +int i, rc =0 ;
drivers/gpu/drm/msm/dp/dp_power.c static int dp_power_clk_deinit(struct dp_power_private *power) · line 167
Quoted 10 lines
drivers/gpu/drm/msm/dp/dp_power.c +10
-0+ +for (i =0 ; i < num_clk; i++) { +if (clk_arry[i].clk) { +if (clk_arry[i].type ==DSS_CLK_PCLK ) { +if (enable) + rate = clk_arry[i].rate; +else + rate =0 ; + + rc =dev_pm_opp_set_rate (power->dev, rate);
Why do we keep going if rc is non-zero?
Quoted 18 lines
drivers/gpu/drm/msm/dp/dp_power.c +9
-2+ } + + } + } +return rc; +} +static int dp_power_clk_set_rate (struct dp_power_private *power,enum dp_pm_type module,bool enable) {int rc =0 ;struct dss_module_power *mp = &power->parser->mp[module]; -if (enable) { - rc =msm_dss_clk_set_rate (mp->clk_config, mp->num_clk); +if (module ==DP_CTRL_PM ) { + rc =dp_power_clk_set_link_rate (power, mp->clk_config, mp->num_clk, enable);if (rc) {
drivers/gpu/drm/msm/dp/dp_power.c static int dp_power_clk_deinit(struct dp_power_private *power) · line 192
Quoted 10 lines
drivers/gpu/drm/msm/dp/dp_power.c +7
-1-DRM_ERROR ("failed to set clks rate.\n" ); +DRM_ERROR ("failed to set link clks rate.\n" );return rc; } + }else { + +if (enable) { + rc =msm_dss_clk_set_rate (mp->clk_config, mp->num_clk); +if (rc) { +DRM_ERROR ("failed to set clks rate.\n" );
Not sure we need the period on these error messages.
Quoted 9 lines
drivers/gpu/drm/msm/dp/dp_power.c +3
-0+return rc; + } + } } rc =msm_dss_enable_clk (mp->clk_config, mp->num_clk, enable);base-commit:
3c0f462da069af12211901ddf26f7e16e6951d9b
prerequisite-patch-id:a109eaf08147f50149ad661a58122b6745a52445
Can you rebase this on Rob's msm-next tree
(https://gitlab.freedesktop.org/drm/msm.git) and test? It doesn't apply for me because I have the dp phy patch from there.
Quoted 17 lines · Stephen Boyd
Quoting Kuogee Hsieh (2020-09-29 10:10:26)
Quoted 2 lines
Set link rate by using OPP set rate api so that CX level will be set accordingly base on the link rate.
s/base/based/
Quoted 11 lines
Signed-off-by Kuogee Hsieh <[email protected]>---
drivers/gpu/drm/msm/dp/dp_ctrl.c +0
-0@@ -1849,6 +1853,21 @@ struct dp_ctrl *dp_ctrl_get(struct device *dev, struct dp_link *link,return ERR_PTR (-ENOMEM ); }
Quoted 1 line
drivers/gpu/drm/msm/dp/dp_ctrl.c struct dp_ctrl *dp_ctrl_get(struct device *dev, struct dp_link *link, · line 1856
Quoted 1 line
drivers/gpu/drm/msm/dp/dp_ctrl.c +1
-0+ ctrl->opp_table =dev_pm_opp_set_clkname (dev,"ctrl_link" );
I see that downstream has multiple DP clocks which end up voting on CX, we don't have a way of associating multiple OPP tables with a device upstream, so whats usually done is (assuming all the clocks get scaled in lock step, which I assume is the case here) we pick the clock with the 'highest' CX requirement and associate that with the OPP table. I haven't looked but I am hoping thats how we have decided to associate "ctrl_link" clock here?
Quoted 149 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c struct dp_ctrl *dp_ctrl_get(struct device *dev, struct dp_link *link, · line 1865
Quoted 9 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +9
-0+ +if (IS_ERR (ctrl->opp_table)) { +dev_err (dev,"invalid DP OPP table in device tree\n" ); + ctrl->opp_table =NULL ; + }else { +/* OPP table is optional */ + ret =dev_pm_opp_of_add_table (dev); +if (ret && ret != -ENODEV ) { +dev_err (dev,"add DP OPP table\n" );This is debug noise right?
Quoted 9 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +5
-0+dev_pm_opp_put_clkname (ctrl->opp_table); + ctrl->opp_table =NULL ; + } + } +init_completion (&ctrl->idle_comp);init_completion (&ctrl->video_comp);drivers/gpu/drm/msm/dp/dp_ctrl.c struct dp_ctrl *dp_ctrl_get(struct device *dev, struct dp_link *link, · line 1890
Quoted 9 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +4
-1@@ -1864,6 +1883,18 @@ 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) +void dp_ctrl_put (struct device *dev,struct dp_ctrl *dp_ctrl) { +struct dp_ctrl_private *ctrl; + +if (!dp_ctrl)Can this happen?
drivers/gpu/drm/msm/dp/dp_ctrl.c struct dp_ctrl *dp_ctrl_get(struct device *dev, struct dp_link *link, · line 1895
Quoted 5 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +5
-0+return ; + + ctrl = container_of(dp_ctrl, struct dp_ctrl_private, dp_ctrl); + +if (ctrl->opp_table !=NULL ) {This is usually written as
if (ctrl->opp_table)Quoted 10 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +4
-0+dev_pm_opp_of_remove_table (dev); +dev_pm_opp_put_clkname (ctrl->opp_table); + ctrl->opp_table =NULL ; + } }drivers/gpu/drm/msm/dp/dp_ctrl.h +0
-0drivers/gpu/drm/msm/dp/dp_ctrl.h struct dp_ctrl *dp_ctrl_get(struct device *dev, struct dp_link *link, · line 34
Quoted 5 lines
drivers/gpu/drm/msm/dp/dp_ctrl.h +1
-1@@ -31,6 +31,6 @@ 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); +void dp_ctrl_put (struct device *dev,struct dp_ctrl *dp_ctrl);Is 'dev' not inside '
dp_ctrl'?Quoted 30 lines
drivers/gpu/drm/msm/dp/dp_ctrl.h +0
-0#endif /* _DP_CTRL_H_ */ drivers/gpu/drm/msm/dp/dp_power.c +7
-0@@ -8,12 +8,14 @@#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/regulator/consumer.h> +#include <linux/pm_opp.h> #include "dp_power.h" #include "msm_drv.h" struct dp_power_private {struct dp_parser *parser;struct platform_device *pdev; +struct device *dev;struct clk *link_clk_src;struct clk *pixel_provider;struct clk *link_provider;@@ -148,18 +150,49 @@ static int dp_power_clk_deinit(struct dp_power_private *power)return 0 ; } +static int dp_power_clk_set_link_rate (struct dp_power_private *power, +struct dss_clk *clk_arry,int num_clk,int enable) +{ +u32 rate; +int i, rc =0 ;drivers/gpu/drm/msm/dp/dp_power.c static int dp_power_clk_deinit(struct dp_power_private *power) · line 167
Quoted 10 lines
drivers/gpu/drm/msm/dp/dp_power.c +10
-0+ +for (i =0 ; i < num_clk; i++) { +if (clk_arry[i].clk) { +if (clk_arry[i].type ==DSS_CLK_PCLK ) { +if (enable) + rate = clk_arry[i].rate; +else + rate =0 ; + + rc =dev_pm_opp_set_rate (power->dev, rate);Why do we keep going if rc is non-zero?
Quoted 18 lines
drivers/gpu/drm/msm/dp/dp_power.c +9
-2+ } + + } + } +return rc; +} +static int dp_power_clk_set_rate (struct dp_power_private *power,enum dp_pm_type module,bool enable) {int rc =0 ;struct dss_module_power *mp = &power->parser->mp[module]; -if (enable) { - rc =msm_dss_clk_set_rate (mp->clk_config, mp->num_clk); +if (module ==DP_CTRL_PM ) { + rc =dp_power_clk_set_link_rate (power, mp->clk_config, mp->num_clk, enable);if (rc) {drivers/gpu/drm/msm/dp/dp_power.c static int dp_power_clk_deinit(struct dp_power_private *power) · line 192
Quoted 10 lines
drivers/gpu/drm/msm/dp/dp_power.c +7
-1-DRM_ERROR ("failed to set clks rate.\n" ); +DRM_ERROR ("failed to set link clks rate.\n" );return rc; } + }else { + +if (enable) { + rc =msm_dss_clk_set_rate (mp->clk_config, mp->num_clk); +if (rc) { +DRM_ERROR ("failed to set clks rate.\n" );Not sure we need the period on these error messages.
Quoted 9 lines
drivers/gpu/drm/msm/dp/dp_power.c +3
-0+return rc; + } + } } rc =msm_dss_enable_clk (mp->clk_config, mp->num_clk, enable);base-commit:
3c0f462da069af12211901ddf26f7e16e6951d9b
prerequisite-patch-id:a109eaf08147f50149ad661a58122b6745a52445Can you rebase this on Rob's msm-next tree
(https://gitlab.freedesktop.org/drm/msm.git) and test? It doesn't apply for me because I have the dp phy patch from there.
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Quoted 23 lines · Rajendra Nayak
Quoted 7 lines · Stephen Boyd
Quoting Kuogee Hsieh (2020-09-29 10:10:26)
Quoted 2 lines
Set link rate by using OPP set rate api so that CX level will be set accordingly base on the link rate.
s/base/based/
Quoted 1 line
Quoted 11 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c struct dp_ctrl *dp_ctrl_get(struct device · line 1856
Quoted 11 lines
Signed-off-by Kuogee Hsieh <[email protected]>---
drivers/gpu/drm/msm/dp/dp_ctrl.c +0
-0@@ -1849,6 +1853,21 @@ 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" );I see that downstream has multiple DP clocks which end up voting on CX, we don't have a
way of associating multiple OPP tables with a device upstream, so
Quoted 9 lines
whats usually done is
(assuming all the clocks get scaled in lock step, which I assume is the case here) we pick
the clock with the 'highest' CX requirement and associate that with the OPP table.
I haven't looked but I am hoping thats how we have decided to associate "ctrl_link" clock
here?
yes, only ctrl_link use dev_pm_opp_set_rate() to set rate.
Quoted 157 lines
Quoted 157 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c struct dp_ctrl *dp_ctrl_get(struct device *dev, struct dp_link *link, · line 1865
Quoted 10 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +9
-0+ +if (IS_ERR (ctrl->opp_table)) { +dev_err (dev,"invalid DP OPP table in device tree\n"); + ctrl->opp_table =NULL ; + }else { +/* OPP table is optional */ + ret =dev_pm_opp_of_add_table (dev); +if (ret && ret != -ENODEV ) { +dev_err (dev,"add DP OPP table\n" );This is debug noise right?
Quoted 12 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +5
-0+dev_pm_opp_put_clkname (ctrl->opp_table); + ctrl->opp_table =NULL ; + } + } +init_completion (&ctrl->idle_comp);init_completion (&ctrl->video_comp); @@ -1864,6 +1883,18 @@ struct dp_ctrl *dp_ctrl_get(struct device*dev, struct
dp_link*link,return &ctrl->dp_ctrl;}
-voiddp_ctrl_put(struct dp_ctrl *dp_ctrl)drivers/gpu/drm/msm/dp/dp_ctrl.c struct dp_ctrl *dp_ctrl_get(struct device *dev, struct dp_link *link, · line 1890
Quoted 5 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +4
-0+void dp_ctrl_put (struct device *dev,struct dp_ctrl *dp_ctrl) { +struct dp_ctrl_private *ctrl; + +if (!dp_ctrl)Can this happen?
drivers/gpu/drm/msm/dp/dp_ctrl.c
Quoted 6 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +3
-0+return ; + + ctrl = container_of(dp_ctrl, struct dp_ctrl_private,
dp_ctrl);drivers/gpu/drm/msm/dp/dp_ctrl.c +2
-0+ +if (ctrl->opp_table !=NULL ) {This is usually written as
if (ctrl->opp_table)Quoted 10 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +4
-0+dev_pm_opp_of_remove_table (dev); +dev_pm_opp_put_clkname (ctrl->opp_table); + ctrl->opp_table =NULL ; + } }drivers/gpu/drm/msm/dp/dp_ctrl.h +0
-0drivers/gpu/drm/msm/dp/dp_ctrl.h struct dp_ctrl *dp_ctrl_get(struct device *dev,
Quoted 8 lines
drivers/gpu/drm/msm/dp/dp_ctrl.h +1
-1@@ -31,6 +31,6 @@ 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); +void dp_ctrl_put (struct device *dev,struct dp_ctrl *dp_ctrl);Is 'dev' not inside '
dp_ctrl'?Quoted 31 lines
#endif /* _DP_CTRL_H_ */drivers/gpu/drm/msm/dp/dp_power.c +7
-0@@ -8,12 +8,14 @@#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/regulator/consumer.h> +#include <linux/pm_opp.h> #include "dp_power.h" #include "msm_drv.h" struct dp_power_private {struct dp_parser *parser;struct platform_device *pdev; +struct device *dev;struct clk *link_clk_src;struct clk *pixel_provider;struct clk *link_provider;@@ -148,18 +150,49 @@ static int dp_power_clk_deinit(struct dp_power_private *power)return 0 ; } +static int dp_power_clk_set_link_rate(struct dp_power_private *power, +struct dss_clk *clk_arry,int num_clk,int enable) +{ +u32 rate; +int i, rc =0 ; +drivers/gpu/drm/msm/dp/dp_power.c static int dp_power_clk_deinit(struct · line 170
Quoted 10 lines
drivers/gpu/drm/msm/dp/dp_power.c +9
-0+for (i =0 ; i < num_clk; i++) { +if (clk_arry[i].clk) { +if (clk_arry[i].type ==DSS_CLK_PCLK ) { +if (enable) + rate = clk_arry[i].rate; +else + rate =0 ; + + rc =dev_pm_opp_set_rate (power->dev, rate);Why do we keep going if rc is non-zero?
Quoted 30 lines
drivers/gpu/drm/msm/dp/dp_power.c +14
-2+ } + + } + } +return rc; +} +static int dp_power_clk_set_rate (struct dp_power_private *power,enum dp_pm_type module,bool enable) {int rc =0 ;struct dss_module_power *mp = &power->parser->mp[module]; - if (enable) { - rc =msm_dss_clk_set_rate (mp->clk_config, mp->num_clk); +if (module ==DP_CTRL_PM ) { + rc =dp_power_clk_set_link_rate (power, mp->clk_config, mp->num_clk, enable);if (rc) { -DRM_ERROR ("failed to set clks rate.\n" ); +DRM_ERROR ("failed to set link clks rate.\n" );return rc; } + }else { + +if (enable) { + rc = msm_dss_clk_set_rate(mp->clk_config,
mp->num_clk);drivers/gpu/drm/msm/dp/dp_power.c +2
-0+if (rc) { + DRM_ERROR("failed to set clksQuoted 1 line
rate.\n");
Not sure we need the period on these error messages.
Quoted 9 lines
drivers/gpu/drm/msm/dp/dp_power.c +3
-0+return rc; + } + } } rc = msm_dss_enable_clk(mp->clk_config, mp->num_clk,enable);
base-commit:
3c0f462da069af12211901ddf26f7e16e6951d9b
prerequisite-patch-id:a109eaf08147f50149ad661a58122b6745a52445Can you rebase this on Rob's msm-next tree
(https://gitlab.freedesktop.org/drm/msm.git) and test? It doesn't apply for me because I have the dp phy patch from there.