[v2,10/28] drm/msm/dsi: remove msm_dsi_pll_set_usecase

Message ID 20210324151846.2774204-11-dmitry.baryshkov@linaro.org
State Superseded
Headers show
Series
  • drm/msm/dsi: refactor MSM DSI PHY/PLL drivers
Related show

Commit Message

Dmitry Baryshkov March 24, 2021, 3:18 p.m.
msm_dsi_pll_set_usecase() function is not used outside of individual DSI
PHY drivers, so drop it in favour of calling the the respective
set_usecase functions directly.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

---
 drivers/gpu/drm/msm/dsi/dsi.h              | 7 -------
 drivers/gpu/drm/msm/dsi/phy/dsi_phy.h      | 2 --
 drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 4 +---
 drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 4 +---
 drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c  | 4 +---
 drivers/gpu/drm/msm/dsi/phy/dsi_pll.c      | 9 ---------
 6 files changed, 3 insertions(+), 27 deletions(-)

-- 
2.30.2

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Comments

Abhinav Kumar March 26, 2021, 5:54 p.m. | #1
On 2021-03-24 08:18, Dmitry Baryshkov wrote:
> msm_dsi_pll_set_usecase() function is not used outside of individual 

> DSI

> PHY drivers, so drop it in favour of calling the the respective

> set_usecase functions directly.

> 

> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org>

> ---

>  drivers/gpu/drm/msm/dsi/dsi.h              | 7 -------

>  drivers/gpu/drm/msm/dsi/phy/dsi_phy.h      | 2 --

>  drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 4 +---

>  drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 4 +---

>  drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c  | 4 +---

>  drivers/gpu/drm/msm/dsi/phy/dsi_pll.c      | 9 ---------

>  6 files changed, 3 insertions(+), 27 deletions(-)

> 

> diff --git a/drivers/gpu/drm/msm/dsi/dsi.h 

> b/drivers/gpu/drm/msm/dsi/dsi.h

> index 98a4b296fa30..b310cf344ed4 100644

> --- a/drivers/gpu/drm/msm/dsi/dsi.h

> +++ b/drivers/gpu/drm/msm/dsi/dsi.h

> @@ -100,8 +100,6 @@ int msm_dsi_pll_get_clk_provider(struct msm_dsi_pll 

> *pll,

>  	struct clk **byte_clk_provider, struct clk **pixel_clk_provider);

>  void msm_dsi_pll_save_state(struct msm_dsi_pll *pll);

>  int msm_dsi_pll_restore_state(struct msm_dsi_pll *pll);

> -int msm_dsi_pll_set_usecase(struct msm_dsi_pll *pll,

> -			    enum msm_dsi_phy_usecase uc);

>  #else

>  static inline void msm_dsi_pll_destroy(struct msm_dsi_pll *pll)

>  {

> @@ -118,11 +116,6 @@ static inline int

> msm_dsi_pll_restore_state(struct msm_dsi_pll *pll)

>  {

>  	return 0;

>  }

> -static inline int msm_dsi_pll_set_usecase(struct msm_dsi_pll *pll,

> -					  enum msm_dsi_phy_usecase uc)

> -{

> -	return -ENODEV;

> -}

>  #endif

> 

>  /* dsi host */

> diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.h

> b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.h

> index 000e4207dabc..f737bef74b91 100644

> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.h

> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.h

> @@ -29,8 +29,6 @@ struct msm_dsi_pll_ops {

>  	void (*destroy)(struct msm_dsi_pll *pll);

>  	void (*save_state)(struct msm_dsi_pll *pll);

>  	int (*restore_state)(struct msm_dsi_pll *pll);

> -	int (*set_usecase)(struct msm_dsi_pll *pll,

> -			   enum msm_dsi_phy_usecase uc);

>  };

> 

>  struct msm_dsi_phy_cfg {

> diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c

> b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c

> index 5f9d0cfc4e03..7a98e420414f 100644

> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c

> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c

> @@ -1049,7 +1049,7 @@ static int dsi_10nm_phy_enable(struct

> msm_dsi_phy *phy, int src_pll_id,

>  	/* Select full-rate mode */

>  	dsi_phy_write(base + REG_DSI_10nm_PHY_CMN_CTRL_2, 0x40);

> 

> -	ret = msm_dsi_pll_set_usecase(phy->pll, phy->usecase);

> +	ret = dsi_pll_10nm_set_usecase(phy->pll, phy->usecase);

>  	if (ret) {

>  		DRM_DEV_ERROR(&phy->pdev->dev, "%s: set pll usecase failed, %d\n",

>  			__func__, ret);

> @@ -1109,7 +1109,6 @@ const struct msm_dsi_phy_cfg dsi_phy_10nm_cfgs = 

> {

>  		.destroy = dsi_pll_10nm_destroy,

>  		.save_state = dsi_pll_10nm_save_state,

>  		.restore_state = dsi_pll_10nm_restore_state,

> -		.set_usecase = dsi_pll_10nm_set_usecase,

>  	},

>  	.min_pll_rate = 1000000000UL,

>  	.max_pll_rate = 3500000000UL,

> @@ -1136,7 +1135,6 @@ const struct msm_dsi_phy_cfg 

> dsi_phy_10nm_8998_cfgs = {

>  		.destroy = dsi_pll_10nm_destroy,

>  		.save_state = dsi_pll_10nm_save_state,

>  		.restore_state = dsi_pll_10nm_restore_state,

> -		.set_usecase = dsi_pll_10nm_set_usecase,

>  	},

>  	.min_pll_rate = 1000000000UL,

>  	.max_pll_rate = 3500000000UL,

> diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c

> b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c

> index 8e4528301e5d..bab86fa6dc4b 100644

> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c

> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c

> @@ -1190,7 +1190,7 @@ static int dsi_14nm_phy_enable(struct

> msm_dsi_phy *phy, int src_pll_id,

>  				REG_DSI_14nm_PHY_CMN_GLBL_TEST_CTRL,

>  				DSI_14nm_PHY_CMN_GLBL_TEST_CTRL_BITCLK_HS_SEL);

> 

> -	ret = msm_dsi_pll_set_usecase(phy->pll, phy->usecase);

> +	ret = dsi_pll_14nm_set_usecase(phy->pll, phy->usecase);

>  	if (ret) {

>  		DRM_DEV_ERROR(&phy->pdev->dev, "%s: set pll usecase failed, %d\n",

>  			__func__, ret);

> @@ -1231,7 +1231,6 @@ const struct msm_dsi_phy_cfg dsi_phy_14nm_cfgs = 

> {

>  		.destroy = dsi_pll_14nm_destroy,

>  		.save_state = dsi_pll_14nm_save_state,

>  		.restore_state = dsi_pll_14nm_restore_state,

> -		.set_usecase = dsi_pll_14nm_set_usecase,

>  		.disable_seq = dsi_pll_14nm_disable_seq,

>  		.enable_seq = dsi_pll_14nm_enable_seq,

>  	},

> @@ -1260,7 +1259,6 @@ const struct msm_dsi_phy_cfg 

> dsi_phy_14nm_660_cfgs = {

>  		.destroy = dsi_pll_14nm_destroy,

>  		.save_state = dsi_pll_14nm_save_state,

>  		.restore_state = dsi_pll_14nm_restore_state,

> -		.set_usecase = dsi_pll_14nm_set_usecase,

>  		.disable_seq = dsi_pll_14nm_disable_seq,

>  		.enable_seq = dsi_pll_14nm_enable_seq,

>  	},

> diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c

> b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c

> index 4831d6769da7..5acdfe1f63be 100644

> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c

> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c

> @@ -1064,7 +1064,7 @@ static int dsi_7nm_phy_enable(struct msm_dsi_phy

> *phy, int src_pll_id,

>  	/* Select full-rate mode */

>  	dsi_phy_write(base + REG_DSI_7nm_PHY_CMN_CTRL_2, 0x40);

> 

> -	ret = msm_dsi_pll_set_usecase(phy->pll, phy->usecase);

> +	ret = dsi_pll_7nm_set_usecase(phy->pll, phy->usecase);

>  	if (ret) {

>  		DRM_DEV_ERROR(&phy->pdev->dev, "%s: set pll usecase failed, %d\n",

>  			__func__, ret);

> @@ -1142,7 +1142,6 @@ const struct msm_dsi_phy_cfg dsi_phy_7nm_cfgs = {

>  		.destroy = dsi_pll_7nm_destroy,

>  		.save_state = dsi_pll_7nm_save_state,

>  		.restore_state = dsi_pll_7nm_restore_state,

> -		.set_usecase = dsi_pll_7nm_set_usecase,

>  	},

>  	.min_pll_rate = 600000000UL,

>  	.max_pll_rate = (5000000000ULL < ULONG_MAX) ? 5000000000ULL : 

> ULONG_MAX,

> @@ -1170,7 +1169,6 @@ const struct msm_dsi_phy_cfg 

> dsi_phy_7nm_8150_cfgs = {

>  		.destroy = dsi_pll_7nm_destroy,

>  		.save_state = dsi_pll_7nm_save_state,

>  		.restore_state = dsi_pll_7nm_restore_state,

> -		.set_usecase = dsi_pll_7nm_set_usecase,

>  	},

>  	.min_pll_rate = 1000000000UL,

>  	.max_pll_rate = 3500000000UL,

> diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_pll.c

> b/drivers/gpu/drm/msm/dsi/phy/dsi_pll.c

> index e607adffe001..98ee4560581a 100644

> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_pll.c

> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_pll.c

> @@ -113,12 +113,3 @@ int msm_dsi_pll_restore_state(struct msm_dsi_pll 

> *pll)

> 

>  	return 0;

>  }

> -

> -int msm_dsi_pll_set_usecase(struct msm_dsi_pll *pll,

> -			    enum msm_dsi_phy_usecase uc)

> -{

> -	if (pll->cfg->pll_ops.set_usecase)

> -		return pll->cfg->pll_ops.set_usecase(pll, uc);

> -

> -	return 0;

> -}

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Patch

diff --git a/drivers/gpu/drm/msm/dsi/dsi.h b/drivers/gpu/drm/msm/dsi/dsi.h
index 98a4b296fa30..b310cf344ed4 100644
--- a/drivers/gpu/drm/msm/dsi/dsi.h
+++ b/drivers/gpu/drm/msm/dsi/dsi.h
@@ -100,8 +100,6 @@  int msm_dsi_pll_get_clk_provider(struct msm_dsi_pll *pll,
 	struct clk **byte_clk_provider, struct clk **pixel_clk_provider);
 void msm_dsi_pll_save_state(struct msm_dsi_pll *pll);
 int msm_dsi_pll_restore_state(struct msm_dsi_pll *pll);
-int msm_dsi_pll_set_usecase(struct msm_dsi_pll *pll,
-			    enum msm_dsi_phy_usecase uc);
 #else
 static inline void msm_dsi_pll_destroy(struct msm_dsi_pll *pll)
 {
@@ -118,11 +116,6 @@  static inline int msm_dsi_pll_restore_state(struct msm_dsi_pll *pll)
 {
 	return 0;
 }
-static inline int msm_dsi_pll_set_usecase(struct msm_dsi_pll *pll,
-					  enum msm_dsi_phy_usecase uc)
-{
-	return -ENODEV;
-}
 #endif
 
 /* dsi host */
diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.h b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.h
index 000e4207dabc..f737bef74b91 100644
--- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.h
+++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.h
@@ -29,8 +29,6 @@  struct msm_dsi_pll_ops {
 	void (*destroy)(struct msm_dsi_pll *pll);
 	void (*save_state)(struct msm_dsi_pll *pll);
 	int (*restore_state)(struct msm_dsi_pll *pll);
-	int (*set_usecase)(struct msm_dsi_pll *pll,
-			   enum msm_dsi_phy_usecase uc);
 };
 
 struct msm_dsi_phy_cfg {
diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c
index 5f9d0cfc4e03..7a98e420414f 100644
--- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c
+++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c
@@ -1049,7 +1049,7 @@  static int dsi_10nm_phy_enable(struct msm_dsi_phy *phy, int src_pll_id,
 	/* Select full-rate mode */
 	dsi_phy_write(base + REG_DSI_10nm_PHY_CMN_CTRL_2, 0x40);
 
-	ret = msm_dsi_pll_set_usecase(phy->pll, phy->usecase);
+	ret = dsi_pll_10nm_set_usecase(phy->pll, phy->usecase);
 	if (ret) {
 		DRM_DEV_ERROR(&phy->pdev->dev, "%s: set pll usecase failed, %d\n",
 			__func__, ret);
@@ -1109,7 +1109,6 @@  const struct msm_dsi_phy_cfg dsi_phy_10nm_cfgs = {
 		.destroy = dsi_pll_10nm_destroy,
 		.save_state = dsi_pll_10nm_save_state,
 		.restore_state = dsi_pll_10nm_restore_state,
-		.set_usecase = dsi_pll_10nm_set_usecase,
 	},
 	.min_pll_rate = 1000000000UL,
 	.max_pll_rate = 3500000000UL,
@@ -1136,7 +1135,6 @@  const struct msm_dsi_phy_cfg dsi_phy_10nm_8998_cfgs = {
 		.destroy = dsi_pll_10nm_destroy,
 		.save_state = dsi_pll_10nm_save_state,
 		.restore_state = dsi_pll_10nm_restore_state,
-		.set_usecase = dsi_pll_10nm_set_usecase,
 	},
 	.min_pll_rate = 1000000000UL,
 	.max_pll_rate = 3500000000UL,
diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c
index 8e4528301e5d..bab86fa6dc4b 100644
--- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c
+++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c
@@ -1190,7 +1190,7 @@  static int dsi_14nm_phy_enable(struct msm_dsi_phy *phy, int src_pll_id,
 				REG_DSI_14nm_PHY_CMN_GLBL_TEST_CTRL,
 				DSI_14nm_PHY_CMN_GLBL_TEST_CTRL_BITCLK_HS_SEL);
 
-	ret = msm_dsi_pll_set_usecase(phy->pll, phy->usecase);
+	ret = dsi_pll_14nm_set_usecase(phy->pll, phy->usecase);
 	if (ret) {
 		DRM_DEV_ERROR(&phy->pdev->dev, "%s: set pll usecase failed, %d\n",
 			__func__, ret);
@@ -1231,7 +1231,6 @@  const struct msm_dsi_phy_cfg dsi_phy_14nm_cfgs = {
 		.destroy = dsi_pll_14nm_destroy,
 		.save_state = dsi_pll_14nm_save_state,
 		.restore_state = dsi_pll_14nm_restore_state,
-		.set_usecase = dsi_pll_14nm_set_usecase,
 		.disable_seq = dsi_pll_14nm_disable_seq,
 		.enable_seq = dsi_pll_14nm_enable_seq,
 	},
@@ -1260,7 +1259,6 @@  const struct msm_dsi_phy_cfg dsi_phy_14nm_660_cfgs = {
 		.destroy = dsi_pll_14nm_destroy,
 		.save_state = dsi_pll_14nm_save_state,
 		.restore_state = dsi_pll_14nm_restore_state,
-		.set_usecase = dsi_pll_14nm_set_usecase,
 		.disable_seq = dsi_pll_14nm_disable_seq,
 		.enable_seq = dsi_pll_14nm_enable_seq,
 	},
diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c
index 4831d6769da7..5acdfe1f63be 100644
--- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c
+++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c
@@ -1064,7 +1064,7 @@  static int dsi_7nm_phy_enable(struct msm_dsi_phy *phy, int src_pll_id,
 	/* Select full-rate mode */
 	dsi_phy_write(base + REG_DSI_7nm_PHY_CMN_CTRL_2, 0x40);
 
-	ret = msm_dsi_pll_set_usecase(phy->pll, phy->usecase);
+	ret = dsi_pll_7nm_set_usecase(phy->pll, phy->usecase);
 	if (ret) {
 		DRM_DEV_ERROR(&phy->pdev->dev, "%s: set pll usecase failed, %d\n",
 			__func__, ret);
@@ -1142,7 +1142,6 @@  const struct msm_dsi_phy_cfg dsi_phy_7nm_cfgs = {
 		.destroy = dsi_pll_7nm_destroy,
 		.save_state = dsi_pll_7nm_save_state,
 		.restore_state = dsi_pll_7nm_restore_state,
-		.set_usecase = dsi_pll_7nm_set_usecase,
 	},
 	.min_pll_rate = 600000000UL,
 	.max_pll_rate = (5000000000ULL < ULONG_MAX) ? 5000000000ULL : ULONG_MAX,
@@ -1170,7 +1169,6 @@  const struct msm_dsi_phy_cfg dsi_phy_7nm_8150_cfgs = {
 		.destroy = dsi_pll_7nm_destroy,
 		.save_state = dsi_pll_7nm_save_state,
 		.restore_state = dsi_pll_7nm_restore_state,
-		.set_usecase = dsi_pll_7nm_set_usecase,
 	},
 	.min_pll_rate = 1000000000UL,
 	.max_pll_rate = 3500000000UL,
diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_pll.c b/drivers/gpu/drm/msm/dsi/phy/dsi_pll.c
index e607adffe001..98ee4560581a 100644
--- a/drivers/gpu/drm/msm/dsi/phy/dsi_pll.c
+++ b/drivers/gpu/drm/msm/dsi/phy/dsi_pll.c
@@ -113,12 +113,3 @@  int msm_dsi_pll_restore_state(struct msm_dsi_pll *pll)
 
 	return 0;
 }
-
-int msm_dsi_pll_set_usecase(struct msm_dsi_pll *pll,
-			    enum msm_dsi_phy_usecase uc)
-{
-	if (pll->cfg->pll_ops.set_usecase)
-		return pll->cfg->pll_ops.set_usecase(pll, uc);
-
-	return 0;
-}