drm/amd/display (gcc13): fix enum mismatch
Subsystems (3)
PATCH 1/1 drm/amd/display (gcc13): fix enum mismatch
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).
--- .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h +3 -1
@@ -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 requeint 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);
Signature · 1 line
2.38.1
Quoted 10 lines · Jiri Slaby (SUSE)
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 enumdcn_pwr_state. Synchronize them to the latter (and add a forward enum declaration).
Quoted 12 lines
Cc Martin Liska <[email protected]>Cc Harry Wentland <[email protected]>Cc Leo Li <[email protected]>Cc Rodrigo Siqueira <[email protected]>Cc Alex Deucher <[email protected]>Cc "Christian König" <[email protected]>Cc "Pan, Xinhui" <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Signed-off-by Jiri Slaby (SUSE) <[email protected]>
Harry
Quoted 26 lines
--- .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h +3
-1@@ -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 requeint 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);
Alex Deucher
AppliedApplied. Thanks!
Alex
Quoted 56 lines · Harry Wentland
Quoted 10 lines · Jiri Slaby (SUSE)
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 enumdcn_pwr_state. Synchronize them to the latter (and add a forward enum declaration).Quoted 12 lines
Cc Martin Liska <[email protected]>Cc Harry Wentland <[email protected]>Cc Leo Li <[email protected]>Cc Rodrigo Siqueira <[email protected]>Cc Alex Deucher <[email protected]>Cc "Christian König" <[email protected]>Cc "Pan, Xinhui" <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Signed-off-by Jiri Slaby (SUSE) <[email protected]>Reviewed-by Harry Wentland <[email protected]>Harry
Quoted 26 lines
--- .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h +3
-1@@ -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 requeint 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);