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: <20221215164537.1126692-1-arnd@kernel.org>
In-Reply-To: <20221215164537.1126692-1-arnd@kernel.org>
From:   Alex Deucher <alexdeucher@gmail.com>
Date:   Thu, 15 Dec 2022 13:47:02 -0500
Message-ID: <CADnq5_MxnmXaMW+D-F6fDLafwWPojHr2YuwX1mY8VM5a3S_Yjw@mail.gmail.com>
Subject: Re: [PATCH] drm/amd/display: fix duplicate assignments
To:     Arnd Bergmann <arnd@kernel.org>
Cc:     Harry Wentland <harry.wentland@amd.com>,
        Leo Li <sunpeng.li@amd.com>,
        Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>,
        Charlene Liu <Charlene.Liu@amd.com>,
        Arnd Bergmann <arnd@arndb.de>, Alex Hung <alex.hung@amd.com>,
        linux-kernel@vger.kernel.org, "Pan, Xinhui" <Xinhui.Pan@amd.com>,
        Roman Li <roman.li@amd.com>, amd-gfx@lists.freedesktop.org,
        Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>,
        Aurabindo Pillai <aurabindo.pillai@amd.com>,
        Michael Strauss <michael.strauss@amd.com>,
        dri-devel@lists.freedesktop.org, Daniel Vetter <daniel@ffwll.ch>,
        Alex Deucher <alexander.deucher@amd.com>,
        David Airlie <airlied@gmail.com>,
        =?UTF-8?Q?Christian_K=C3=B6nig?= <christian.koenig@amd.com>,
        Duncan Ma <duncan.ma@amd.com>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

Applied.  Thanks!

Alex

On Thu, Dec 15, 2022 at 11:46 AM Arnd Bergmann <arnd@kernel.org> wrote:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> The .set_odm_combine callback pointer was added twice, causing
> a harmless -Wextra warning:
>
> drivers/gpu/drm/amd/amdgpu/../display/dc/dcn314/dcn314_optc.c:258:36: error: initialized field overwritten [-Werror=override-init]
>   258 |                 .set_odm_combine = optc314_set_odm_combine,
>       |                                    ^~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/dc/dcn314/dcn314_optc.c:258:36: note: (near initialization for 'dcn314_tg_funcs.set_odm_combine')
>
> Fixes: 5ade1b951dec ("drm/amd/display: Add OTG/ODM functions")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  drivers/gpu/drm/amd/display/dc/dcn314/dcn314_optc.c | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_optc.c b/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_optc.c
> index f246aab23050..0086cafb0f7a 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_optc.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_optc.c
> @@ -241,7 +241,6 @@ static struct timing_generator_funcs dcn314_tg_funcs = {
>                 .set_dsc_config = optc3_set_dsc_config,
>                 .get_dsc_status = optc2_get_dsc_status,
>                 .set_dwb_source = NULL,
> -               .set_odm_combine = optc314_set_odm_combine,
>                 .get_optc_source = optc2_get_optc_source,
>                 .set_out_mux = optc3_set_out_mux,
>                 .set_drr_trigger_window = optc3_set_drr_trigger_window,
> --
> 2.35.1
>