Commit ab387647 authored by Kuogee Hsieh's avatar Kuogee Hsieh Committed by Rob Clark
Browse files

drm/msm/dp: add opp_table corner voting support base on dp_ink_clk rate 



Set link rate by using OPP set rate api so that CX level will be set
accordingly based on the link rate.

Changes in v2:
-- remove dev from dp_ctrl_put() parameters
-- Add more information to commit message

Changes in v3:
-- return when dev_pm_opp_set_clkname() failed

Signed-off-by: default avatarKuogee Hsieh <khsieh@codeaurora.org>
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent dd29bd41

drivers/gpu/drm/msm/dp/dp_ctrl.c

+28 −0
Original line number Diff line number Diff line
@@ -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;

};
@@ -1833,6 +1836,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) {
@@ -1846,6 +1850,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");

		/* caller do PTR_ERR(ctrl->opp_table) */

		return (struct dp_ctrl *)ctrl->opp_table;

	}



	/* OPP table is optional */

	ret = dev_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);
@@ -1863,4 +1882,13 @@ struct dp_ctrl *dp_ctrl_get(struct device *dev, struct dp_link *link, 


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;

	}

}

drivers/gpu/drm/msm/dp/dp_display.c

+1 −1
Original line number Diff line number Diff line
@@ -699,7 +699,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);

drivers/gpu/drm/msm/dp/dp_power.c

+40 −4
Original line number Diff line number Diff line
@@ -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,19 +150,52 @@ 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;



	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);

				if (rc)

					break;

			}



		}

	}

	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 (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 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");

				DRM_ERROR("failed to set clks rate\n");

				return rc;

			}

		}

	}



	rc = msm_dss_enable_clk(mp->clk_config, mp->num_clk, enable);

	if (rc) {
@@ -349,7 +384,7 @@ int dp_power_deinit(struct dp_power *dp_power) 
	return 0;

}



struct dp_power *dp_power_get(struct dp_parser *parser)

struct dp_power *dp_power_get(struct device *dev, struct dp_parser *parser)

{

	struct dp_power_private *power;

	struct dp_power *dp_power;
@@ -365,6 +400,7 @@ struct dp_power *dp_power_get(struct dp_parser *parser) 


	power->parser = parser;

	power->pdev = parser->pdev;

	power->dev = dev;



	dp_power = &power->dp_power;

drivers/gpu/drm/msm/dp/dp_power.h

+1 −1
Original line number Diff line number Diff line
@@ -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_ */