Applied. Thanks! Alex On Mon, Oct 31, 2022 at 9:59 AM Harry Wentland <harry.wentland@xxxxxxx> 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@xxxxxxx> > > Cc: Harry Wentland <harry.wentland@xxxxxxx> > > Cc: Leo Li <sunpeng.li@xxxxxxx> > > Cc: Rodrigo Siqueira <Rodrigo.Siqueira@xxxxxxx> > > Cc: Alex Deucher <alexander.deucher@xxxxxxx> > > Cc: "Christian König" <christian.koenig@xxxxxxx> > > Cc: "Pan, Xinhui" <Xinhui.Pan@xxxxxxx> > > Cc: David Airlie <airlied@xxxxxxxxx> > > Cc: Daniel Vetter <daniel@xxxxxxxx> > > Cc: amd-gfx@xxxxxxxxxxxxxxxxxxxxx > > Cc: dri-devel@xxxxxxxxxxxxxxxxxxxxx > > Signed-off-by: Jiri Slaby (SUSE) <jirislaby@xxxxxxxxxx> > > Reviewed-by: Harry Wentland <harry.wentland@xxxxxxx> > > 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); >
