diff mbox series

[v2,5/7] drm/msm/dpu: remove extra wrappers around dpu_core_irq

Message ID 20210617222029.463045-6-dmitry.baryshkov@linaro.org
State New
Headers show
Series drm/msm/dpu: merge dpu_core_irq into dpu_hw_interrupts | expand

Commit Message

Dmitry Baryshkov June 17, 2021, 10:20 p.m. UTC
Remove extra dpu_irq_* wrappers from dpu_kms.c, merge them directly into
dpu_core_irq_* functions.

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

---
 drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h  | 12 ++++-----
 .../gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c |  9 ++++---
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c       | 27 +++----------------
 3 files changed, 15 insertions(+), 33 deletions(-)

-- 
2.30.2

Comments

Abhinav Kumar Aug. 18, 2021, 3:30 a.m. UTC | #1
On 2021-06-17 15:20, Dmitry Baryshkov wrote:
> Remove extra dpu_irq_* wrappers from dpu_kms.c, merge them directly 

> into

> dpu_core_irq_* functions.

> 

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

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

> ---

>  drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h  | 12 ++++-----

>  .../gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c |  9 ++++---

>  drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c       | 27 +++----------------

>  3 files changed, 15 insertions(+), 33 deletions(-)

> 

> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h

> b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h

> index 44ab97fb2964..afc8cd546368 100644

> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h

> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h

> @@ -10,24 +10,24 @@

> 

>  /**

>   * dpu_core_irq_preinstall - perform pre-installation of core IRQ 

> handler

> - * @dpu_kms:		DPU handle

> + * @kms:		MSM KMS handle

>   * @return:		none

>   */

> -void dpu_core_irq_preinstall(struct dpu_kms *dpu_kms);

> +void dpu_core_irq_preinstall(struct msm_kms *kms);

> 

>  /**

>   * dpu_core_irq_uninstall - uninstall core IRQ handler

> - * @dpu_kms:		DPU handle

> + * @kms:		MSM KMS handle

>   * @return:		none

>   */

> -void dpu_core_irq_uninstall(struct dpu_kms *dpu_kms);

> +void dpu_core_irq_uninstall(struct msm_kms *kms);

> 

>  /**

>   * dpu_core_irq - core IRQ handler

> - * @dpu_kms:		DPU handle

> + * @kms:		MSM KMS handle

>   * @return:		interrupt handling status

>   */

> -irqreturn_t dpu_core_irq(struct dpu_kms *dpu_kms);

> +irqreturn_t dpu_core_irq(struct msm_kms *kms);

> 

>  /**

>   * dpu_core_irq_read - IRQ helper function for reading IRQ status

> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c

> b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c

> index 7062e7f0e860..9b74cfdf5355 100644

> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c

> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c

> @@ -140,8 +140,9 @@ static void dpu_core_irq_callback_handler(struct

> dpu_kms *dpu_kms, int irq_idx)

> 

> 	dpu_kms->hw_intr->irq_tbl[irq_idx].cb(dpu_kms->hw_intr->irq_tbl[irq_idx].arg,

> irq_idx);

>  }

> 

> -irqreturn_t dpu_core_irq(struct dpu_kms *dpu_kms)

> +irqreturn_t dpu_core_irq(struct msm_kms *kms)

>  {

> +	struct dpu_kms *dpu_kms = to_dpu_kms(kms);

>  	struct dpu_hw_intr *intr = dpu_kms->hw_intr;

>  	int reg_idx;

>  	int irq_idx;

> @@ -526,8 +527,9 @@ void dpu_debugfs_core_irq_init(struct dpu_kms 

> *dpu_kms,

>  }

>  #endif

> 

> -void dpu_core_irq_preinstall(struct dpu_kms *dpu_kms)

> +void dpu_core_irq_preinstall(struct msm_kms *kms)

>  {

> +	struct dpu_kms *dpu_kms = to_dpu_kms(kms);

>  	int i;

> 

>  	pm_runtime_get_sync(&dpu_kms->pdev->dev);

> @@ -539,8 +541,9 @@ void dpu_core_irq_preinstall(struct dpu_kms 

> *dpu_kms)

>  		atomic_set(&dpu_kms->hw_intr->irq_tbl[i].count, 0);

>  }

> 

> -void dpu_core_irq_uninstall(struct dpu_kms *dpu_kms)

> +void dpu_core_irq_uninstall(struct msm_kms *kms)

>  {

> +	struct dpu_kms *dpu_kms = to_dpu_kms(kms);

>  	int i;

> 

>  	pm_runtime_get_sync(&dpu_kms->pdev->dev);

> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c

> b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c

> index 1d3a4f395e74..c1706205a514 100644

> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c

> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c

> @@ -761,20 +761,6 @@ static void _dpu_kms_set_encoder_mode(struct 

> msm_kms *kms,

>  			encoder->base.id, rc);

>  }

> 

> -static irqreturn_t dpu_irq(struct msm_kms *kms)

> -{

> -	struct dpu_kms *dpu_kms = to_dpu_kms(kms);

> -

> -	return dpu_core_irq(dpu_kms);

> -}

> -

> -static void dpu_irq_preinstall(struct msm_kms *kms)

> -{

> -	struct dpu_kms *dpu_kms = to_dpu_kms(kms);

> -

> -	dpu_core_irq_preinstall(dpu_kms);

> -}

> -

>  static int dpu_irq_postinstall(struct msm_kms *kms)

>  {

>  	struct msm_drm_private *priv;

> @@ -792,13 +778,6 @@ static int dpu_irq_postinstall(struct msm_kms 

> *kms)

>  	return 0;

>  }

> 

> -static void dpu_irq_uninstall(struct msm_kms *kms)

> -{

> -	struct dpu_kms *dpu_kms = to_dpu_kms(kms);

> -

> -	dpu_core_irq_uninstall(dpu_kms);

> -}

> -

>  static void dpu_kms_mdp_snapshot(struct msm_disp_state *disp_state,

> struct msm_kms *kms)

>  {

>  	int i;

> @@ -846,10 +825,10 @@ static void dpu_kms_mdp_snapshot(struct

> msm_disp_state *disp_state, struct msm_k

> 

>  static const struct msm_kms_funcs kms_funcs = {

>  	.hw_init         = dpu_kms_hw_init,

> -	.irq_preinstall  = dpu_irq_preinstall,

> +	.irq_preinstall  = dpu_core_irq_preinstall,

>  	.irq_postinstall = dpu_irq_postinstall,

> -	.irq_uninstall   = dpu_irq_uninstall,

> -	.irq             = dpu_irq,

> +	.irq_uninstall   = dpu_core_irq_uninstall,

> +	.irq             = dpu_core_irq,

>  	.enable_commit   = dpu_kms_enable_commit,

>  	.disable_commit  = dpu_kms_disable_commit,

>  	.vsync_time      = dpu_kms_vsync_time,
diff mbox series

Patch

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h
index 44ab97fb2964..afc8cd546368 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h
@@ -10,24 +10,24 @@ 
 
 /**
  * dpu_core_irq_preinstall - perform pre-installation of core IRQ handler
- * @dpu_kms:		DPU handle
+ * @kms:		MSM KMS handle
  * @return:		none
  */
-void dpu_core_irq_preinstall(struct dpu_kms *dpu_kms);
+void dpu_core_irq_preinstall(struct msm_kms *kms);
 
 /**
  * dpu_core_irq_uninstall - uninstall core IRQ handler
- * @dpu_kms:		DPU handle
+ * @kms:		MSM KMS handle
  * @return:		none
  */
-void dpu_core_irq_uninstall(struct dpu_kms *dpu_kms);
+void dpu_core_irq_uninstall(struct msm_kms *kms);
 
 /**
  * dpu_core_irq - core IRQ handler
- * @dpu_kms:		DPU handle
+ * @kms:		MSM KMS handle
  * @return:		interrupt handling status
  */
-irqreturn_t dpu_core_irq(struct dpu_kms *dpu_kms);
+irqreturn_t dpu_core_irq(struct msm_kms *kms);
 
 /**
  * dpu_core_irq_read - IRQ helper function for reading IRQ status
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c
index 7062e7f0e860..9b74cfdf5355 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c
@@ -140,8 +140,9 @@  static void dpu_core_irq_callback_handler(struct dpu_kms *dpu_kms, int irq_idx)
 	dpu_kms->hw_intr->irq_tbl[irq_idx].cb(dpu_kms->hw_intr->irq_tbl[irq_idx].arg, irq_idx);
 }
 
-irqreturn_t dpu_core_irq(struct dpu_kms *dpu_kms)
+irqreturn_t dpu_core_irq(struct msm_kms *kms)
 {
+	struct dpu_kms *dpu_kms = to_dpu_kms(kms);
 	struct dpu_hw_intr *intr = dpu_kms->hw_intr;
 	int reg_idx;
 	int irq_idx;
@@ -526,8 +527,9 @@  void dpu_debugfs_core_irq_init(struct dpu_kms *dpu_kms,
 }
 #endif
 
-void dpu_core_irq_preinstall(struct dpu_kms *dpu_kms)
+void dpu_core_irq_preinstall(struct msm_kms *kms)
 {
+	struct dpu_kms *dpu_kms = to_dpu_kms(kms);
 	int i;
 
 	pm_runtime_get_sync(&dpu_kms->pdev->dev);
@@ -539,8 +541,9 @@  void dpu_core_irq_preinstall(struct dpu_kms *dpu_kms)
 		atomic_set(&dpu_kms->hw_intr->irq_tbl[i].count, 0);
 }
 
-void dpu_core_irq_uninstall(struct dpu_kms *dpu_kms)
+void dpu_core_irq_uninstall(struct msm_kms *kms)
 {
+	struct dpu_kms *dpu_kms = to_dpu_kms(kms);
 	int i;
 
 	pm_runtime_get_sync(&dpu_kms->pdev->dev);
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
index 1d3a4f395e74..c1706205a514 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
@@ -761,20 +761,6 @@  static void _dpu_kms_set_encoder_mode(struct msm_kms *kms,
 			encoder->base.id, rc);
 }
 
-static irqreturn_t dpu_irq(struct msm_kms *kms)
-{
-	struct dpu_kms *dpu_kms = to_dpu_kms(kms);
-
-	return dpu_core_irq(dpu_kms);
-}
-
-static void dpu_irq_preinstall(struct msm_kms *kms)
-{
-	struct dpu_kms *dpu_kms = to_dpu_kms(kms);
-
-	dpu_core_irq_preinstall(dpu_kms);
-}
-
 static int dpu_irq_postinstall(struct msm_kms *kms)
 {
 	struct msm_drm_private *priv;
@@ -792,13 +778,6 @@  static int dpu_irq_postinstall(struct msm_kms *kms)
 	return 0;
 }
 
-static void dpu_irq_uninstall(struct msm_kms *kms)
-{
-	struct dpu_kms *dpu_kms = to_dpu_kms(kms);
-
-	dpu_core_irq_uninstall(dpu_kms);
-}
-
 static void dpu_kms_mdp_snapshot(struct msm_disp_state *disp_state, struct msm_kms *kms)
 {
 	int i;
@@ -846,10 +825,10 @@  static void dpu_kms_mdp_snapshot(struct msm_disp_state *disp_state, struct msm_k
 
 static const struct msm_kms_funcs kms_funcs = {
 	.hw_init         = dpu_kms_hw_init,
-	.irq_preinstall  = dpu_irq_preinstall,
+	.irq_preinstall  = dpu_core_irq_preinstall,
 	.irq_postinstall = dpu_irq_postinstall,
-	.irq_uninstall   = dpu_irq_uninstall,
-	.irq             = dpu_irq,
+	.irq_uninstall   = dpu_core_irq_uninstall,
+	.irq             = dpu_core_irq,
 	.enable_commit   = dpu_kms_enable_commit,
 	.disable_commit  = dpu_kms_disable_commit,
 	.vsync_time      = dpu_kms_vsync_time,