diff mbox series

[RESEND,10/26] drm/msm/disp/dpu1/dpu_hw_interrupts: Demote a bunch of kernel-doc abuses

Message ID 20210602143300.2330146-11-lee.jones@linaro.org
State New
Headers show
Series Rid W=1 warnings from GPU | expand

Commit Message

Lee Jones June 2, 2021, 2:32 p.m. UTC
Fixes the following W=1 kernel build warning(s):

 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:17: warning: expecting prototype for Register offsets in MDSS register file for the interrupt registers(). Prototype was for MDP_SSPP_TOP0_OFF() instead
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:35: warning: expecting prototype for WB interrupt status bit definitions(). Prototype was for DPU_INTR_WB_0_DONE() instead
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:42: warning: expecting prototype for WDOG timer interrupt status bit definitions(). Prototype was for DPU_INTR_WD_TIMER_0_DONE() instead
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:51: warning: expecting prototype for Pingpong interrupt status bit definitions(). Prototype was for DPU_INTR_PING_PONG_0_DONE() instead
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:71: warning: expecting prototype for Interface interrupt status bit definitions(). Prototype was for DPU_INTR_INTF_0_UNDERRUN() instead
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:85: warning: expecting prototype for Pingpong Secondary interrupt status bit definitions(). Prototype was for DPU_INTR_PING_PONG_S0_AUTOREFRESH_DONE() instead
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:94: warning: expecting prototype for Pingpong TEAR detection interrupt status bit definitions(). Prototype was for DPU_INTR_PING_PONG_0_TEAR_DETECTED() instead
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:102: warning: expecting prototype for Pingpong TE detection interrupt status bit definitions(). Prototype was for DPU_INTR_PING_PONG_0_TE_DETECTED() instead
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:110: warning: expecting prototype for Ctl start interrupt status bit definitions(). Prototype was for DPU_INTR_CTL_0_START() instead
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:119: warning: expecting prototype for Concurrent WB overflow interrupt status bit definitions(). Prototype was for DPU_INTR_CWB_2_OVERFLOW() instead
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:125: warning: expecting prototype for Histogram VIG done interrupt status bit definitions(). Prototype was for DPU_INTR_HIST_VIG_0_DONE() instead
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:133: warning: expecting prototype for Histogram VIG reset Sequence done interrupt status bit definitions(). Prototype was for DPU_INTR_HIST_VIG_0_RSTSEQ_DONE() instead
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:141: warning: expecting prototype for Histogram DSPP done interrupt status bit definitions(). Prototype was for DPU_INTR_HIST_DSPP_0_DONE() instead
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:149: warning: expecting prototype for Histogram DSPP reset Sequence done interrupt status bit definitions(). Prototype was for DPU_INTR_HIST_DSPP_0_RSTSEQ_DONE() instead
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:157: warning: expecting prototype for INTF interrupt status bit definitions(). Prototype was for DPU_INTR_VIDEO_INTO_STATIC() instead
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:170: warning: expecting prototype for AD4 interrupt status bit definitions(). Prototype was for DPU_INTR_BACKLIGHT_UPDATED() instead

Cc: Rob Clark <robdclark@gmail.com>
Cc: Sean Paul <sean@poorly.run>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Krishna Manikandan <mkrishn@codeaurora.org>
Cc: linux-arm-msm@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Cc: freedreno@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 .../gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

Comments

Abhinav Kumar June 2, 2021, 5:33 p.m. UTC | #1
On 2021-06-02 07:32, Lee Jones wrote:
> Fixes the following W=1 kernel build warning(s):
> 
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:17: warning:
> expecting prototype for Register offsets in MDSS register file for the
> interrupt registers(). Prototype was for MDP_SSPP_TOP0_OFF() instead
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:35: warning:
> expecting prototype for WB interrupt status bit definitions().
> Prototype was for DPU_INTR_WB_0_DONE() instead
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:42: warning:
> expecting prototype for WDOG timer interrupt status bit definitions().
> Prototype was for DPU_INTR_WD_TIMER_0_DONE() instead
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:51: warning:
> expecting prototype for Pingpong interrupt status bit definitions().
> Prototype was for DPU_INTR_PING_PONG_0_DONE() instead
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:71: warning:
> expecting prototype for Interface interrupt status bit definitions().
> Prototype was for DPU_INTR_INTF_0_UNDERRUN() instead
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:85: warning:
> expecting prototype for Pingpong Secondary interrupt status bit
> definitions(). Prototype was for
> DPU_INTR_PING_PONG_S0_AUTOREFRESH_DONE() instead
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:94: warning:
> expecting prototype for Pingpong TEAR detection interrupt status bit
> definitions(). Prototype was for DPU_INTR_PING_PONG_0_TEAR_DETECTED()
> instead
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:102: warning:
> expecting prototype for Pingpong TE detection interrupt status bit
> definitions(). Prototype was for DPU_INTR_PING_PONG_0_TE_DETECTED()
> instead
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:110: warning:
> expecting prototype for Ctl start interrupt status bit definitions().
> Prototype was for DPU_INTR_CTL_0_START() instead
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:119: warning:
> expecting prototype for Concurrent WB overflow interrupt status bit
> definitions(). Prototype was for DPU_INTR_CWB_2_OVERFLOW() instead
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:125: warning:
> expecting prototype for Histogram VIG done interrupt status bit
> definitions(). Prototype was for DPU_INTR_HIST_VIG_0_DONE() instead
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:133: warning:
> expecting prototype for Histogram VIG reset Sequence done interrupt
> status bit definitions(). Prototype was for
> DPU_INTR_HIST_VIG_0_RSTSEQ_DONE() instead
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:141: warning:
> expecting prototype for Histogram DSPP done interrupt status bit
> definitions(). Prototype was for DPU_INTR_HIST_DSPP_0_DONE() instead
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:149: warning:
> expecting prototype for Histogram DSPP reset Sequence done interrupt
> status bit definitions(). Prototype was for
> DPU_INTR_HIST_DSPP_0_RSTSEQ_DONE() instead
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:157: warning:
> expecting prototype for INTF interrupt status bit definitions().
> Prototype was for DPU_INTR_VIDEO_INTO_STATIC() instead
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:170: warning:
> expecting prototype for AD4 interrupt status bit definitions().
> Prototype was for DPU_INTR_BACKLIGHT_UPDATED() instead
> 
> Cc: Rob Clark <robdclark@gmail.com>
> Cc: Sean Paul <sean@poorly.run>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Krishna Manikandan <mkrishn@codeaurora.org>
> Cc: linux-arm-msm@vger.kernel.org
> Cc: dri-devel@lists.freedesktop.org
> Cc: freedreno@lists.freedesktop.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org>
> ---
>  .../gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 32 +++++++++----------
>  1 file changed, 16 insertions(+), 16 deletions(-)
> 
> 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 48c96b8121268..aaf251741dc27 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c
> @@ -10,7 +10,7 @@
>  #include "dpu_hw_util.h"
>  #include "dpu_hw_mdss.h"
> 
> -/**
> +/*
>   * Register offsets in MDSS register file for the interrupt registers
>   * w.r.t. to the MDP base
>   */
> @@ -29,14 +29,14 @@
>  #define MDP_INTF_1_OFF_REV_7xxx             0x35000
>  #define MDP_INTF_5_OFF_REV_7xxx             0x39000
> 
> -/**
> +/*
>   * WB interrupt status bit definitions
>   */
>  #define DPU_INTR_WB_0_DONE BIT(0)
>  #define DPU_INTR_WB_1_DONE BIT(1)
>  #define DPU_INTR_WB_2_DONE BIT(4)
> 
> -/**
> +/*
>   * WDOG timer interrupt status bit definitions
>   */
>  #define DPU_INTR_WD_TIMER_0_DONE BIT(2)
> @@ -45,7 +45,7 @@
>  #define DPU_INTR_WD_TIMER_3_DONE BIT(6)
>  #define DPU_INTR_WD_TIMER_4_DONE BIT(7)
> 
> -/**
> +/*
>   * Pingpong interrupt status bit definitions
>   */
>  #define DPU_INTR_PING_PONG_0_DONE BIT(8)
> @@ -65,7 +65,7 @@
>  #define DPU_INTR_PING_PONG_2_AUTOREFRESH_DONE BIT(22)
>  #define DPU_INTR_PING_PONG_3_AUTOREFRESH_DONE BIT(23)
> 
> -/**
> +/*
>   * Interface interrupt status bit definitions
>   */
>  #define DPU_INTR_INTF_0_UNDERRUN BIT(24)
> @@ -79,7 +79,7 @@
>  #define DPU_INTR_INTF_3_VSYNC BIT(31)
>  #define DPU_INTR_INTF_5_VSYNC BIT(23)
> 
> -/**
> +/*
>   * Pingpong Secondary interrupt status bit definitions
>   */
>  #define DPU_INTR_PING_PONG_S0_AUTOREFRESH_DONE BIT(0)
> @@ -88,7 +88,7 @@
>  #define DPU_INTR_PING_PONG_S0_TEAR_DETECTED BIT(22)
>  #define DPU_INTR_PING_PONG_S0_TE_DETECTED BIT(28)
> 
> -/**
> +/*
>   * Pingpong TEAR detection interrupt status bit definitions
>   */
>  #define DPU_INTR_PING_PONG_0_TEAR_DETECTED BIT(16)
> @@ -96,7 +96,7 @@
>  #define DPU_INTR_PING_PONG_2_TEAR_DETECTED BIT(18)
>  #define DPU_INTR_PING_PONG_3_TEAR_DETECTED BIT(19)
> 
> -/**
> +/*
>   * Pingpong TE detection interrupt status bit definitions
>   */
>  #define DPU_INTR_PING_PONG_0_TE_DETECTED BIT(24)
> @@ -104,7 +104,7 @@
>  #define DPU_INTR_PING_PONG_2_TE_DETECTED BIT(26)
>  #define DPU_INTR_PING_PONG_3_TE_DETECTED BIT(27)
> 
> -/**
> +/*
>   * Ctl start interrupt status bit definitions
>   */
>  #define DPU_INTR_CTL_0_START BIT(9)
> @@ -113,13 +113,13 @@
>  #define DPU_INTR_CTL_3_START BIT(12)
>  #define DPU_INTR_CTL_4_START BIT(13)
> 
> -/**
> +/*
>   * Concurrent WB overflow interrupt status bit definitions
>   */
>  #define DPU_INTR_CWB_2_OVERFLOW BIT(14)
>  #define DPU_INTR_CWB_3_OVERFLOW BIT(15)
> 
> -/**
> +/*
>   * Histogram VIG done interrupt status bit definitions
>   */
>  #define DPU_INTR_HIST_VIG_0_DONE BIT(0)
> @@ -127,7 +127,7 @@
>  #define DPU_INTR_HIST_VIG_2_DONE BIT(8)
>  #define DPU_INTR_HIST_VIG_3_DONE BIT(10)
> 
> -/**
> +/*
>   * Histogram VIG reset Sequence done interrupt status bit definitions
>   */
>  #define DPU_INTR_HIST_VIG_0_RSTSEQ_DONE BIT(1)
> @@ -135,7 +135,7 @@
>  #define DPU_INTR_HIST_VIG_2_RSTSEQ_DONE BIT(9)
>  #define DPU_INTR_HIST_VIG_3_RSTSEQ_DONE BIT(11)
> 
> -/**
> +/*
>   * Histogram DSPP done interrupt status bit definitions
>   */
>  #define DPU_INTR_HIST_DSPP_0_DONE BIT(12)
> @@ -143,7 +143,7 @@
>  #define DPU_INTR_HIST_DSPP_2_DONE BIT(20)
>  #define DPU_INTR_HIST_DSPP_3_DONE BIT(22)
> 
> -/**
> +/*
>   * Histogram DSPP reset Sequence done interrupt status bit definitions
>   */
>  #define DPU_INTR_HIST_DSPP_0_RSTSEQ_DONE BIT(13)
> @@ -151,7 +151,7 @@
>  #define DPU_INTR_HIST_DSPP_2_RSTSEQ_DONE BIT(21)
>  #define DPU_INTR_HIST_DSPP_3_RSTSEQ_DONE BIT(23)
> 
> -/**
> +/*
>   * INTF interrupt status bit definitions
>   */
>  #define DPU_INTR_VIDEO_INTO_STATIC BIT(0)
> @@ -164,7 +164,7 @@
>  #define DPU_INTR_DSICMD_2_OUTOF_STATIC BIT(7)
>  #define DPU_INTR_PROG_LINE BIT(8)
> 
> -/**
> +/*
>   * AD4 interrupt status bit definitions
>   */
>  #define DPU_INTR_BACKLIGHT_UPDATED BIT(0)
Dmitry Baryshkov June 4, 2021, 8:32 a.m. UTC | #2
On 02/06/2021 17:32, Lee Jones wrote:
> Fixes the following W=1 kernel build warning(s):

> 

>   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:17: warning: expecting prototype for Register offsets in MDSS register file for the interrupt registers(). Prototype was for MDP_SSPP_TOP0_OFF() instead

>   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:35: warning: expecting prototype for WB interrupt status bit definitions(). Prototype was for DPU_INTR_WB_0_DONE() instead

>   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:42: warning: expecting prototype for WDOG timer interrupt status bit definitions(). Prototype was for DPU_INTR_WD_TIMER_0_DONE() instead

>   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:51: warning: expecting prototype for Pingpong interrupt status bit definitions(). Prototype was for DPU_INTR_PING_PONG_0_DONE() instead

>   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:71: warning: expecting prototype for Interface interrupt status bit definitions(). Prototype was for DPU_INTR_INTF_0_UNDERRUN() instead

>   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:85: warning: expecting prototype for Pingpong Secondary interrupt status bit definitions(). Prototype was for DPU_INTR_PING_PONG_S0_AUTOREFRESH_DONE() instead

>   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:94: warning: expecting prototype for Pingpong TEAR detection interrupt status bit definitions(). Prototype was for DPU_INTR_PING_PONG_0_TEAR_DETECTED() instead

>   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:102: warning: expecting prototype for Pingpong TE detection interrupt status bit definitions(). Prototype was for DPU_INTR_PING_PONG_0_TE_DETECTED() instead

>   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:110: warning: expecting prototype for Ctl start interrupt status bit definitions(). Prototype was for DPU_INTR_CTL_0_START() instead

>   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:119: warning: expecting prototype for Concurrent WB overflow interrupt status bit definitions(). Prototype was for DPU_INTR_CWB_2_OVERFLOW() instead

>   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:125: warning: expecting prototype for Histogram VIG done interrupt status bit definitions(). Prototype was for DPU_INTR_HIST_VIG_0_DONE() instead

>   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:133: warning: expecting prototype for Histogram VIG reset Sequence done interrupt status bit definitions(). Prototype was for DPU_INTR_HIST_VIG_0_RSTSEQ_DONE() instead

>   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:141: warning: expecting prototype for Histogram DSPP done interrupt status bit definitions(). Prototype was for DPU_INTR_HIST_DSPP_0_DONE() instead

>   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:149: warning: expecting prototype for Histogram DSPP reset Sequence done interrupt status bit definitions(). Prototype was for DPU_INTR_HIST_DSPP_0_RSTSEQ_DONE() instead

>   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:157: warning: expecting prototype for INTF interrupt status bit definitions(). Prototype was for DPU_INTR_VIDEO_INTO_STATIC() instead

>   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:170: warning: expecting prototype for AD4 interrupt status bit definitions(). Prototype was for DPU_INTR_BACKLIGHT_UPDATED() instead


Most of these defines are gone in msm/msm-next. Could you please rebase 
and repost just this patch? Other patches apply clearly.

> Cc: Rob Clark <robdclark@gmail.com>

> Cc: Sean Paul <sean@poorly.run>

> Cc: David Airlie <airlied@linux.ie>

> Cc: Daniel Vetter <daniel@ffwll.ch>

> Cc: Krishna Manikandan <mkrishn@codeaurora.org>

> Cc: linux-arm-msm@vger.kernel.org

> Cc: dri-devel@lists.freedesktop.org

> Cc: freedreno@lists.freedesktop.org

> Signed-off-by: Lee Jones <lee.jones@linaro.org>

> ---

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

>   1 file changed, 16 insertions(+), 16 deletions(-)

> 

> 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 48c96b8121268..aaf251741dc27 100644

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

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

> @@ -10,7 +10,7 @@

>   #include "dpu_hw_util.h"

>   #include "dpu_hw_mdss.h"

>   

> -/**

> +/*

>    * Register offsets in MDSS register file for the interrupt registers

>    * w.r.t. to the MDP base

>    */

> @@ -29,14 +29,14 @@

>   #define MDP_INTF_1_OFF_REV_7xxx             0x35000

>   #define MDP_INTF_5_OFF_REV_7xxx             0x39000

>   

> -/**

> +/*

>    * WB interrupt status bit definitions

>    */

>   #define DPU_INTR_WB_0_DONE BIT(0)

>   #define DPU_INTR_WB_1_DONE BIT(1)

>   #define DPU_INTR_WB_2_DONE BIT(4)

>   

> -/**

> +/*

>    * WDOG timer interrupt status bit definitions

>    */

>   #define DPU_INTR_WD_TIMER_0_DONE BIT(2)

> @@ -45,7 +45,7 @@

>   #define DPU_INTR_WD_TIMER_3_DONE BIT(6)

>   #define DPU_INTR_WD_TIMER_4_DONE BIT(7)

>   

> -/**

> +/*

>    * Pingpong interrupt status bit definitions

>    */

>   #define DPU_INTR_PING_PONG_0_DONE BIT(8)

> @@ -65,7 +65,7 @@

>   #define DPU_INTR_PING_PONG_2_AUTOREFRESH_DONE BIT(22)

>   #define DPU_INTR_PING_PONG_3_AUTOREFRESH_DONE BIT(23)

>   

> -/**

> +/*

>    * Interface interrupt status bit definitions

>    */

>   #define DPU_INTR_INTF_0_UNDERRUN BIT(24)

> @@ -79,7 +79,7 @@

>   #define DPU_INTR_INTF_3_VSYNC BIT(31)

>   #define DPU_INTR_INTF_5_VSYNC BIT(23)

>   

> -/**

> +/*

>    * Pingpong Secondary interrupt status bit definitions

>    */

>   #define DPU_INTR_PING_PONG_S0_AUTOREFRESH_DONE BIT(0)

> @@ -88,7 +88,7 @@

>   #define DPU_INTR_PING_PONG_S0_TEAR_DETECTED BIT(22)

>   #define DPU_INTR_PING_PONG_S0_TE_DETECTED BIT(28)

>   

> -/**

> +/*

>    * Pingpong TEAR detection interrupt status bit definitions

>    */

>   #define DPU_INTR_PING_PONG_0_TEAR_DETECTED BIT(16)

> @@ -96,7 +96,7 @@

>   #define DPU_INTR_PING_PONG_2_TEAR_DETECTED BIT(18)

>   #define DPU_INTR_PING_PONG_3_TEAR_DETECTED BIT(19)

>   

> -/**

> +/*

>    * Pingpong TE detection interrupt status bit definitions

>    */

>   #define DPU_INTR_PING_PONG_0_TE_DETECTED BIT(24)

> @@ -104,7 +104,7 @@

>   #define DPU_INTR_PING_PONG_2_TE_DETECTED BIT(26)

>   #define DPU_INTR_PING_PONG_3_TE_DETECTED BIT(27)

>   

> -/**

> +/*

>    * Ctl start interrupt status bit definitions

>    */

>   #define DPU_INTR_CTL_0_START BIT(9)

> @@ -113,13 +113,13 @@

>   #define DPU_INTR_CTL_3_START BIT(12)

>   #define DPU_INTR_CTL_4_START BIT(13)

>   

> -/**

> +/*

>    * Concurrent WB overflow interrupt status bit definitions

>    */

>   #define DPU_INTR_CWB_2_OVERFLOW BIT(14)

>   #define DPU_INTR_CWB_3_OVERFLOW BIT(15)

>   

> -/**

> +/*

>    * Histogram VIG done interrupt status bit definitions

>    */

>   #define DPU_INTR_HIST_VIG_0_DONE BIT(0)

> @@ -127,7 +127,7 @@

>   #define DPU_INTR_HIST_VIG_2_DONE BIT(8)

>   #define DPU_INTR_HIST_VIG_3_DONE BIT(10)

>   

> -/**

> +/*

>    * Histogram VIG reset Sequence done interrupt status bit definitions

>    */

>   #define DPU_INTR_HIST_VIG_0_RSTSEQ_DONE BIT(1)

> @@ -135,7 +135,7 @@

>   #define DPU_INTR_HIST_VIG_2_RSTSEQ_DONE BIT(9)

>   #define DPU_INTR_HIST_VIG_3_RSTSEQ_DONE BIT(11)

>   

> -/**

> +/*

>    * Histogram DSPP done interrupt status bit definitions

>    */

>   #define DPU_INTR_HIST_DSPP_0_DONE BIT(12)

> @@ -143,7 +143,7 @@

>   #define DPU_INTR_HIST_DSPP_2_DONE BIT(20)

>   #define DPU_INTR_HIST_DSPP_3_DONE BIT(22)

>   

> -/**

> +/*

>    * Histogram DSPP reset Sequence done interrupt status bit definitions

>    */

>   #define DPU_INTR_HIST_DSPP_0_RSTSEQ_DONE BIT(13)

> @@ -151,7 +151,7 @@

>   #define DPU_INTR_HIST_DSPP_2_RSTSEQ_DONE BIT(21)

>   #define DPU_INTR_HIST_DSPP_3_RSTSEQ_DONE BIT(23)

>   

> -/**

> +/*

>    * INTF interrupt status bit definitions

>    */

>   #define DPU_INTR_VIDEO_INTO_STATIC BIT(0)

> @@ -164,7 +164,7 @@

>   #define DPU_INTR_DSICMD_2_OUTOF_STATIC BIT(7)

>   #define DPU_INTR_PROG_LINE BIT(8)

>   

> -/**

> +/*

>    * AD4 interrupt status bit definitions

>    */

>   #define DPU_INTR_BACKLIGHT_UPDATED BIT(0)

> 



-- 
With best wishes
Dmitry
Lee Jones June 4, 2021, 8:57 a.m. UTC | #3
On Fri, 04 Jun 2021, Dmitry Baryshkov wrote:

> On 02/06/2021 17:32, Lee Jones wrote:
> > Fixes the following W=1 kernel build warning(s):
> > 
> >   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:17: warning: expecting prototype for Register offsets in MDSS register file for the interrupt registers(). Prototype was for MDP_SSPP_TOP0_OFF() instead
> >   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:35: warning: expecting prototype for WB interrupt status bit definitions(). Prototype was for DPU_INTR_WB_0_DONE() instead
> >   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:42: warning: expecting prototype for WDOG timer interrupt status bit definitions(). Prototype was for DPU_INTR_WD_TIMER_0_DONE() instead
> >   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:51: warning: expecting prototype for Pingpong interrupt status bit definitions(). Prototype was for DPU_INTR_PING_PONG_0_DONE() instead
> >   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:71: warning: expecting prototype for Interface interrupt status bit definitions(). Prototype was for DPU_INTR_INTF_0_UNDERRUN() instead
> >   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:85: warning: expecting prototype for Pingpong Secondary interrupt status bit definitions(). Prototype was for DPU_INTR_PING_PONG_S0_AUTOREFRESH_DONE() instead
> >   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:94: warning: expecting prototype for Pingpong TEAR detection interrupt status bit definitions(). Prototype was for DPU_INTR_PING_PONG_0_TEAR_DETECTED() instead
> >   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:102: warning: expecting prototype for Pingpong TE detection interrupt status bit definitions(). Prototype was for DPU_INTR_PING_PONG_0_TE_DETECTED() instead
> >   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:110: warning: expecting prototype for Ctl start interrupt status bit definitions(). Prototype was for DPU_INTR_CTL_0_START() instead
> >   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:119: warning: expecting prototype for Concurrent WB overflow interrupt status bit definitions(). Prototype was for DPU_INTR_CWB_2_OVERFLOW() instead
> >   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:125: warning: expecting prototype for Histogram VIG done interrupt status bit definitions(). Prototype was for DPU_INTR_HIST_VIG_0_DONE() instead
> >   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:133: warning: expecting prototype for Histogram VIG reset Sequence done interrupt status bit definitions(). Prototype was for DPU_INTR_HIST_VIG_0_RSTSEQ_DONE() instead
> >   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:141: warning: expecting prototype for Histogram DSPP done interrupt status bit definitions(). Prototype was for DPU_INTR_HIST_DSPP_0_DONE() instead
> >   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:149: warning: expecting prototype for Histogram DSPP reset Sequence done interrupt status bit definitions(). Prototype was for DPU_INTR_HIST_DSPP_0_RSTSEQ_DONE() instead
> >   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:157: warning: expecting prototype for INTF interrupt status bit definitions(). Prototype was for DPU_INTR_VIDEO_INTO_STATIC() instead
> >   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c:170: warning: expecting prototype for AD4 interrupt status bit definitions(). Prototype was for DPU_INTR_BACKLIGHT_UPDATED() instead
> 
> Most of these defines are gone in msm/msm-next. Could you please rebase and
> repost just this patch? Other patches apply clearly.

Sure.
diff mbox series

Patch

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 48c96b8121268..aaf251741dc27 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c
@@ -10,7 +10,7 @@ 
 #include "dpu_hw_util.h"
 #include "dpu_hw_mdss.h"
 
-/**
+/*
  * Register offsets in MDSS register file for the interrupt registers
  * w.r.t. to the MDP base
  */
@@ -29,14 +29,14 @@ 
 #define MDP_INTF_1_OFF_REV_7xxx             0x35000
 #define MDP_INTF_5_OFF_REV_7xxx             0x39000
 
-/**
+/*
  * WB interrupt status bit definitions
  */
 #define DPU_INTR_WB_0_DONE BIT(0)
 #define DPU_INTR_WB_1_DONE BIT(1)
 #define DPU_INTR_WB_2_DONE BIT(4)
 
-/**
+/*
  * WDOG timer interrupt status bit definitions
  */
 #define DPU_INTR_WD_TIMER_0_DONE BIT(2)
@@ -45,7 +45,7 @@ 
 #define DPU_INTR_WD_TIMER_3_DONE BIT(6)
 #define DPU_INTR_WD_TIMER_4_DONE BIT(7)
 
-/**
+/*
  * Pingpong interrupt status bit definitions
  */
 #define DPU_INTR_PING_PONG_0_DONE BIT(8)
@@ -65,7 +65,7 @@ 
 #define DPU_INTR_PING_PONG_2_AUTOREFRESH_DONE BIT(22)
 #define DPU_INTR_PING_PONG_3_AUTOREFRESH_DONE BIT(23)
 
-/**
+/*
  * Interface interrupt status bit definitions
  */
 #define DPU_INTR_INTF_0_UNDERRUN BIT(24)
@@ -79,7 +79,7 @@ 
 #define DPU_INTR_INTF_3_VSYNC BIT(31)
 #define DPU_INTR_INTF_5_VSYNC BIT(23)
 
-/**
+/*
  * Pingpong Secondary interrupt status bit definitions
  */
 #define DPU_INTR_PING_PONG_S0_AUTOREFRESH_DONE BIT(0)
@@ -88,7 +88,7 @@ 
 #define DPU_INTR_PING_PONG_S0_TEAR_DETECTED BIT(22)
 #define DPU_INTR_PING_PONG_S0_TE_DETECTED BIT(28)
 
-/**
+/*
  * Pingpong TEAR detection interrupt status bit definitions
  */
 #define DPU_INTR_PING_PONG_0_TEAR_DETECTED BIT(16)
@@ -96,7 +96,7 @@ 
 #define DPU_INTR_PING_PONG_2_TEAR_DETECTED BIT(18)
 #define DPU_INTR_PING_PONG_3_TEAR_DETECTED BIT(19)
 
-/**
+/*
  * Pingpong TE detection interrupt status bit definitions
  */
 #define DPU_INTR_PING_PONG_0_TE_DETECTED BIT(24)
@@ -104,7 +104,7 @@ 
 #define DPU_INTR_PING_PONG_2_TE_DETECTED BIT(26)
 #define DPU_INTR_PING_PONG_3_TE_DETECTED BIT(27)
 
-/**
+/*
  * Ctl start interrupt status bit definitions
  */
 #define DPU_INTR_CTL_0_START BIT(9)
@@ -113,13 +113,13 @@ 
 #define DPU_INTR_CTL_3_START BIT(12)
 #define DPU_INTR_CTL_4_START BIT(13)
 
-/**
+/*
  * Concurrent WB overflow interrupt status bit definitions
  */
 #define DPU_INTR_CWB_2_OVERFLOW BIT(14)
 #define DPU_INTR_CWB_3_OVERFLOW BIT(15)
 
-/**
+/*
  * Histogram VIG done interrupt status bit definitions
  */
 #define DPU_INTR_HIST_VIG_0_DONE BIT(0)
@@ -127,7 +127,7 @@ 
 #define DPU_INTR_HIST_VIG_2_DONE BIT(8)
 #define DPU_INTR_HIST_VIG_3_DONE BIT(10)
 
-/**
+/*
  * Histogram VIG reset Sequence done interrupt status bit definitions
  */
 #define DPU_INTR_HIST_VIG_0_RSTSEQ_DONE BIT(1)
@@ -135,7 +135,7 @@ 
 #define DPU_INTR_HIST_VIG_2_RSTSEQ_DONE BIT(9)
 #define DPU_INTR_HIST_VIG_3_RSTSEQ_DONE BIT(11)
 
-/**
+/*
  * Histogram DSPP done interrupt status bit definitions
  */
 #define DPU_INTR_HIST_DSPP_0_DONE BIT(12)
@@ -143,7 +143,7 @@ 
 #define DPU_INTR_HIST_DSPP_2_DONE BIT(20)
 #define DPU_INTR_HIST_DSPP_3_DONE BIT(22)
 
-/**
+/*
  * Histogram DSPP reset Sequence done interrupt status bit definitions
  */
 #define DPU_INTR_HIST_DSPP_0_RSTSEQ_DONE BIT(13)
@@ -151,7 +151,7 @@ 
 #define DPU_INTR_HIST_DSPP_2_RSTSEQ_DONE BIT(21)
 #define DPU_INTR_HIST_DSPP_3_RSTSEQ_DONE BIT(23)
 
-/**
+/*
  * INTF interrupt status bit definitions
  */
 #define DPU_INTR_VIDEO_INTO_STATIC BIT(0)
@@ -164,7 +164,7 @@ 
 #define DPU_INTR_DSICMD_2_OUTOF_STATIC BIT(7)
 #define DPU_INTR_PROG_LINE BIT(8)
 
-/**
+/*
  * AD4 interrupt status bit definitions
  */
 #define DPU_INTR_BACKLIGHT_UPDATED BIT(0)