linux-kernel - Re: [PATCH] drm/amd/display (gcc13): fix enum mismatch

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Tue, 1 Nov 2022 10:28:06 -0400
From:   Alex Deucher <alexdeucher@...il.com>
To:     Harry Wentland <harry.wentland@....com>
Cc:     "Jiri Slaby (SUSE)" <jirislaby@...nel.org>,
        Leo Li <sunpeng.li@....com>,
        "Pan, Xinhui" <Xinhui.Pan@....com>,
        Rodrigo Siqueira <Rodrigo.Siqueira@....com>,
        linux-kernel@...r.kernel.org, amd-gfx@...ts.freedesktop.org,
        dri-devel@...ts.freedesktop.org,
        Alex Deucher <alexander.deucher@....com>,
        Martin Liska <mliska@...e.cz>,
        Christian König <christian.koenig@....com>
Subject: Re: [PATCH] drm/amd/display (gcc13): fix enum mismatch

Applied.  Thanks!

Alex

On Mon, Oct 31, 2022 at 9:59 AM Harry Wentland <harry.wentland@....com> wrote:
>
> On 2022-10-31 07:42, Jiri Slaby (SUSE) wrote:
> > rn_vbios_smu_set_dcn_low_power_state() produces a valid warning with
> > gcc-13:
> >   drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c:237:6: error: conflicting types for 'rn_vbios_smu_set_dcn_low_power_state' due to enum/integer mismatch; have 'void(struct clk_mgr_internal *, enum dcn_pwr_state)'
> >   drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h:36:6: note: previous declaration of 'rn_vbios_smu_set_dcn_low_power_state' with type 'void(struct clk_mgr_internal *, int)'
> >
> > I.e. the type of the 2nd parameter of
> > rn_vbios_smu_set_dcn_low_power_state() in the declaration is int, while
> > the definition spells enum dcn_pwr_state. Synchronize them to the
> > latter (and add a forward enum declaration).
> >
> > Cc: Martin Liska <mliska@...e.cz>
> > Cc: Harry Wentland <harry.wentland@....com>
> > Cc: Leo Li <sunpeng.li@....com>
> > Cc: Rodrigo Siqueira <Rodrigo.Siqueira@....com>
> > Cc: Alex Deucher <alexander.deucher@....com>
> > Cc: "Christian König" <christian.koenig@....com>
> > Cc: "Pan, Xinhui" <Xinhui.Pan@....com>
> > Cc: David Airlie <airlied@...il.com>
> > Cc: Daniel Vetter <daniel@...ll.ch>
> > Cc: amd-gfx@...ts.freedesktop.org
> > Cc: dri-devel@...ts.freedesktop.org
> > Signed-off-by: Jiri Slaby (SUSE) <jirislaby@...nel.org>
>
> Reviewed-by: Harry Wentland <harry.wentland@....com>
>
> Harry
>
> > ---
> >  .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h   | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h
> > index 3e5df27aa96f..1ce19d875358 100644
> > --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h
> > +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h
> > @@ -26,6 +26,8 @@
> >  #ifndef DAL_DC_RN_CLK_MGR_VBIOS_SMU_H_
> >  #define DAL_DC_RN_CLK_MGR_VBIOS_SMU_H_
> >
> > +enum dcn_pwr_state;
> > +
> >  int rn_vbios_smu_get_smu_version(struct clk_mgr_internal *clk_mgr);
> >  int rn_vbios_smu_set_dispclk(struct clk_mgr_internal *clk_mgr, int requested_dispclk_khz);
> >  int rn_vbios_smu_set_dprefclk(struct clk_mgr_internal *clk_mgr);
> > @@ -33,7 +35,7 @@ int rn_vbios_smu_set_hard_min_dcfclk(struct clk_mgr_internal *clk_mgr, int reque
> >  int rn_vbios_smu_set_min_deep_sleep_dcfclk(struct clk_mgr_internal *clk_mgr, int requested_min_ds_dcfclk_khz);
> >  void rn_vbios_smu_set_phyclk(struct clk_mgr_internal *clk_mgr, int requested_phyclk_khz);
> >  int rn_vbios_smu_set_dppclk(struct clk_mgr_internal *clk_mgr, int requested_dpp_khz);
> > -void rn_vbios_smu_set_dcn_low_power_state(struct clk_mgr_internal *clk_mgr, int display_count);
> > +void rn_vbios_smu_set_dcn_low_power_state(struct clk_mgr_internal *clk_mgr, enum dcn_pwr_state);
> >  void rn_vbios_smu_enable_48mhz_tmdp_refclk_pwrdwn(struct clk_mgr_internal *clk_mgr, bool enable);
> >  void rn_vbios_smu_enable_pme_wa(struct clk_mgr_internal *clk_mgr);
> >  int rn_vbios_smu_is_periodic_retraining_disabled(struct clk_mgr_internal *clk_mgr);
>