Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20220222131701.356117-1-maira.canal@usp.br> <20220222131701.356117-7-maira.canal@usp.br>
In-Reply-To: <20220222131701.356117-7-maira.canal@usp.br>
From:   Alex Deucher <alexdeucher@gmail.com>
Date:   Tue, 22 Feb 2022 11:38:02 -0500
Message-ID: <CADnq5_O_YzwjBOBv8_ifZHZQy2rmOyC5d4n1bEeL3Xw0w6JEkg@mail.gmail.com>
Subject: Re: [PATCH 06/10] drm/amd/display: Remove vupdate_int_entry definition
To:     =?UTF-8?B?TWHDrXJhIENhbmFs?= <maira.canal@usp.br>
Cc:     "Deucher, Alexander" <alexander.deucher@amd.com>,
        Christian Koenig <christian.koenig@amd.com>,
        xinhui pan <Xinhui.Pan@amd.com>,
        Hawking Zhang <Hawking.Zhang@amd.com>,
        John Clements <john.clements@amd.com>,
        Tao Zhou <tao.zhou1@amd.com>,
        "Chai, Thomas" <YiPeng.Chai@amd.com>,
        "Tuikov, Luben" <luben.tuikov@amd.com>,
        "Stanley.Yang" <Stanley.Yang@amd.com>,
        Dennis Li <Dennis.Li@amd.com>,
        "Joshi, Mukul" <mukul.joshi@amd.com>,
        "Wentland, Harry" <harry.wentland@amd.com>,
        "Leo (Sunpeng) Li" <sunpeng.li@amd.com>,
        "Siqueira, Rodrigo" <Rodrigo.Siqueira@amd.com>,
        Anthony Koo <Anthony.Koo@amd.com>,
        Magali Lemes <magalilemes00@gmail.com>,
        LKML <linux-kernel@vger.kernel.org>,
        Maling list - DRI developers 
        <dri-devel@lists.freedesktop.org>, mwen@igalia.com,
        amd-gfx list <amd-gfx@lists.freedesktop.org>,
        Isabella Basso <isabbasso@riseup.net>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Applied.  Thanks!

Alex

On Tue, Feb 22, 2022 at 8:18 AM Ma=C3=ADra Canal <maira.canal@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:41=
0: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:28=
0:39:
> note: expanded from macro 'vupdate_no_lock_int_entry'
>     [DC_IRQ_SOURCE_VUPDATE1 + reg_num] =3D {\
>     ^~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:40=
4:2:
> note: previous initialization is here
>     vupdate_int_entry(0),
>     ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:26=
9:39:
> note: expanded from macro 'vupdate_int_entry'
>     [DC_IRQ_SOURCE_VUPDATE1 + reg_num] =3D {\
>     ^~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:41=
1: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:28=
0:39:
> note: expanded from macro 'vupdate_no_lock_int_entry'
>     [DC_IRQ_SOURCE_VUPDATE1 + reg_num] =3D {\
>     ^~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:40=
5:2:
> note: previous initialization is here
>     vupdate_int_entry(1),
>     ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:26=
9:39:
> note: expanded from macro 'vupdate_int_entry'
>     [DC_IRQ_SOURCE_VUPDATE1 + reg_num] =3D {\
>     ^~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:41=
2: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:28=
0:39:
> note: expanded from macro 'vupdate_no_lock_int_entry'
>     [DC_IRQ_SOURCE_VUPDATE1 + reg_num] =3D {\
>     ^~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:40=
6:2:
> note: previous initialization is here
>     vupdate_int_entry(2),
>     ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:26=
9:39:
> note: expanded from macro 'vupdate_int_entry'
>     [DC_IRQ_SOURCE_VUPDATE1 + reg_num] =3D {\
>     ^~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:41=
3: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:28=
0:39:
> note: expanded from macro 'vupdate_no_lock_int_entry'
>     [DC_IRQ_SOURCE_VUPDATE1 + reg_num] =3D {\
>     ^~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:40=
7:2:
> note: previous initialization is here
>     vupdate_int_entry(3),
>     ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:26=
9:39:
> note: expanded from macro 'vupdate_int_entry'
>     [DC_IRQ_SOURCE_VUPDATE1 + reg_num] =3D {\
>     ^~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:41=
4: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:28=
0:39:
> note: expanded from macro 'vupdate_no_lock_int_entry'
>     [DC_IRQ_SOURCE_VUPDATE1 + reg_num] =3D {\
>     ^~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:40=
8:2:
> note: previous initialization is here
>     vupdate_int_entry(4),
>     ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:26=
9:39:
> note: expanded from macro 'vupdate_int_entry'
>     [DC_IRQ_SOURCE_VUPDATE1 + reg_num] =3D {\
>     ^~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:41=
5: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:28=
0:39:
> note: expanded from macro 'vupdate_no_lock_int_entry'
>     [DC_IRQ_SOURCE_VUPDATE1 + reg_num] =3D {\
>     ^~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:40=
9:2:
> note: previous initialization is here
>     vupdate_int_entry(5),
>     ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn21/irq_service_dcn21.c:26=
9:39:
> note: expanded from macro 'vupdate_int_entry'
>         [DC_IRQ_SOURCE_VUPDATE1 + reg_num] =3D {\
>         ^~
> 6 warnings generated.
>
> fixes: 688f97ed ("drm/amd/display: Add vupdate_no_lock interrupts for
> DCN2.1")
>
> Signed-off-by: Ma=C3=ADra Canal <maira.canal@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 =3D {
>                 .funcs =3D &pflip_irq_info_funcs\
>         }
>
> -#define vupdate_int_entry(reg_num)\
> -       [DC_IRQ_SOURCE_VUPDATE1 + reg_num] =3D {\
> -               IRQ_REG_ENTRY(OTG, reg_num,\
> -                       OTG_GLOBAL_SYNC_STATUS, VUPDATE_INT_EN,\
> -                       OTG_GLOBAL_SYNC_STATUS, VUPDATE_EVENT_CLEAR),\
> -               .funcs =3D &vblank_irq_info_funcs\
> -       }
> -
>  /* vupdate_no_lock_int_entry maps to DC_IRQ_SOURCE_VUPDATEx, to match se=
mantic
>   * of DCE's DC_IRQ_SOURCE_VUPDATEx.
>   */
> @@ -401,12 +393,6 @@ irq_source_info_dcn21[DAL_IRQ_SOURCES_NUMBER] =3D {
>         dc_underflow_int_entry(6),
>         [DC_IRQ_SOURCE_DMCU_SCP] =3D dummy_irq_entry(),
>         [DC_IRQ_SOURCE_VBIOS_SW] =3D 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
>