[PATCH 06/10] drm/amd/display: Remove vupdate_int_entry definition

[Alex Deucher]

Applied.  Thanks!

Alex

On Tue, Feb 22, 2022 at 8:18 AM Maíra Canal <maira.canal at usp.br> wrote:
>
> Remove the vupdate_int_entry definition and utilization to avoid the
> following warning by Clang:
>
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:410:2:
> warning: initializer overrides prior initialization of this subobject
> [-Winitializer-overrides]
>     vupdate_no_lock_int_entry(0),
>     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:280:39:
> note: expanded from macro 'vupdate_no_lock_int_entry'
>     [DC_IRQ_SOURCE_VUPDATE1 + reg_num] = {\
>     ^~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:404:2:
> note: previous initialization is here
>     vupdate_int_entry(0),
>     ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:269:39:
> note: expanded from macro 'vupdate_int_entry'
>     [DC_IRQ_SOURCE_VUPDATE1 + reg_num] = {\
>     ^~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:411:2:
> warning: initializer overrides prior initialization of this subobject
> [-Winitializer-overrides]
>     vupdate_no_lock_int_entry(1),
>     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:280:39:
> note: expanded from macro 'vupdate_no_lock_int_entry'
>     [DC_IRQ_SOURCE_VUPDATE1 + reg_num] = {\
>     ^~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:405:2:
> note: previous initialization is here
>     vupdate_int_entry(1),
>     ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:269:39:
> note: expanded from macro 'vupdate_int_entry'
>     [DC_IRQ_SOURCE_VUPDATE1 + reg_num] = {\
>     ^~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:412:2:
> warning: initializer overrides prior initialization of this subobject
> [-Winitializer-overrides]
>     vupdate_no_lock_int_entry(2),
>     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:280:39:
> note: expanded from macro 'vupdate_no_lock_int_entry'
>     [DC_IRQ_SOURCE_VUPDATE1 + reg_num] = {\
>     ^~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:406:2:
> note: previous initialization is here
>     vupdate_int_entry(2),
>     ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:269:39:
> note: expanded from macro 'vupdate_int_entry'
>     [DC_IRQ_SOURCE_VUPDATE1 + reg_num] = {\
>     ^~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:413:2:
> warning: initializer overrides prior initialization of this subobject
> [-Winitializer-overrides]
>     vupdate_no_lock_int_entry(3),
>     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:280:39:
> note: expanded from macro 'vupdate_no_lock_int_entry'
>     [DC_IRQ_SOURCE_VUPDATE1 + reg_num] = {\
>     ^~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:407:2:
> note: previous initialization is here
>     vupdate_int_entry(3),
>     ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:269:39:
> note: expanded from macro 'vupdate_int_entry'
>     [DC_IRQ_SOURCE_VUPDATE1 + reg_num] = {\
>     ^~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:414:2:
> warning: initializer overrides prior initialization of this subobject
> [-Winitializer-overrides]
>     vupdate_no_lock_int_entry(4),
>     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:280:39:
> note: expanded from macro 'vupdate_no_lock_int_entry'
>     [DC_IRQ_SOURCE_VUPDATE1 + reg_num] = {\
>     ^~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:408:2:
> note: previous initialization is here
>     vupdate_int_entry(4),
>     ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:269:39:
> note: expanded from macro 'vupdate_int_entry'
>     [DC_IRQ_SOURCE_VUPDATE1 + reg_num] = {\
>     ^~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:415:2:
> warning: initializer overrides prior initialization of this subobject
> [-Winitializer-overrides]
>     vupdate_no_lock_int_entry(5),
>     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:280:39:
> note: expanded from macro 'vupdate_no_lock_int_entry'
>     [DC_IRQ_SOURCE_VUPDATE1 + reg_num] = {\
>     ^~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:409:2:
> note: previous initialization is here
>     vupdate_int_entry(5),
>     ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:269:39:
> note: expanded from macro 'vupdate_int_entry'
>         [DC_IRQ_SOURCE_VUPDATE1 + reg_num] = {\
>         ^~
> 6 warnings generated.
>
> fixes: 688f97ed ("drm/amd/display: Add vupdate_no_lock interrupts for
> DCN2.1")
>
> Signed-off-by: Maíra Canal <maira.canal at usp.br>
> ---
>  .../amd/display/dc/irq/dcn21/irq_service_dcn21.c   | 14 --------------
>  1 file changed, 14 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c b/drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c
> index 0f15bcada4e9..717977aec6d0 100644
> --- a/drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c
> +++ b/drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c
> @@ -265,14 +265,6 @@ static const struct irq_source_info_funcs vline0_irq_info_funcs = {
>                 .funcs = &pflip_irq_info_funcs\
>         }
>
> -#define vupdate_int_entry(reg_num)\
> -       [DC_IRQ_SOURCE_VUPDATE1 + reg_num] = {\
> -               IRQ_REG_ENTRY(OTG, reg_num,\
> -                       OTG_GLOBAL_SYNC_STATUS, VUPDATE_INT_EN,\
> -                       OTG_GLOBAL_SYNC_STATUS, VUPDATE_EVENT_CLEAR),\
> -               .funcs = &vblank_irq_info_funcs\
> -       }
> -
>  /* vupdate_no_lock_int_entry maps to DC_IRQ_SOURCE_VUPDATEx, to match semantic
>   * of DCE's DC_IRQ_SOURCE_VUPDATEx.
>   */
> @@ -401,12 +393,6 @@ irq_source_info_dcn21[DAL_IRQ_SOURCES_NUMBER] = {
>         dc_underflow_int_entry(6),
>         [DC_IRQ_SOURCE_DMCU_SCP] = dummy_irq_entry(),
>         [DC_IRQ_SOURCE_VBIOS_SW] = dummy_irq_entry(),
> -       vupdate_int_entry(0),
> -       vupdate_int_entry(1),
> -       vupdate_int_entry(2),
> -       vupdate_int_entry(3),
> -       vupdate_int_entry(4),
> -       vupdate_int_entry(5),
>         vupdate_no_lock_int_entry(0),
>         vupdate_no_lock_int_entry(1),
>         vupdate_no_lock_int_entry(2),
> --
> 2.35.1
>