drm/amd/powerplay: Change id parameter type in pp_atomfwctrl_get_clk_information_by_clkid
Subsystems (2)
PATCH 1/1 drm/amd/powerplay: Change id parameter type in pp_atomfwctrl_get_clk_information_by_clkid
Clang generates warnings when one enumerated type is implicitly converted to another.
drivers/gpu/drm/amd/amdgpu/../powerplay/hwmgr/ppatomfwctrl.c:532:57:
warning: implicit conversion from enumeration type 'enum atom_smu11_syspll0_clock_id' to different enumeration type 'BIOS_CLKID'
(aka 'enum atom_smu9_syspll0_clock_id') [-Wenum-conversion]
if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr,SMU11_SYSPLL0_SOCCLK_ID, &frequency))
In this case, that is expected behavior. To make that clear to Clang without explicitly casting these values, change id's type to uint8_t in pp_atomfwctrl_get_clk_information_by_clkid so no conversion happens.
--- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c | 3 ++- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c +2 -1
@@ -488,7 +488,8 @@ int pp_atomfwctrl_get_gpio_information(struct pp_hwmgr *hwmgr,return 0 ; } -int pp_atomfwctrl_get_clk_information_by_clkid (struct pp_hwmgr *hwmgr,BIOS_CLKID id,uint32_t *frequency) +int pp_atomfwctrl_get_clk_information_by_clkid (struct pp_hwmgr *hwmgr, +uint8_t id,uint32_t *frequency) {struct amdgpu_device *adev = hwmgr->adev;struct atom_get_smu_clock_info_parameters_v3_1 parameters;
drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h +1 -1
@@ -236,7 +236,7 @@ int pp_atomfwctrl_get_vbios_bootup_values(struct pp_hwmgr *hwmgr,int pp_atomfwctrl_get_smc_dpm_information (struct pp_hwmgr *hwmgr,struct pp_atomfwctrl_smc_dpm_parameters *param);int pp_atomfwctrl_get_clk_information_by_clkid (struct pp_hwmgr *hwmgr, -BIOS_CLKID id,uint32_t *frequency); +uint8_t id,uint32_t *frequency);#endif
Signature · 1 line
2.19.0
Quoted 10 lines · Nathan Chancellor
Clang generates warnings when one enumerated type is implicitly converted to another.
drivers/gpu/drm/amd/amdgpu/../powerplay/hwmgr/ppatomfwctrl.c:532:57:
warning: implicit conversion from enumeration type 'enumatom_smu11_syspll0_clock_id' to different enumeration type 'BIOS_CLKID'
(aka 'enumatom_smu9_syspll0_clock_id') [-Wenum-conversion]
if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr,SMU11_SYSPLL0_SOCCLK_ID, &frequency))
Grepping the call sites, via:
$ grep -r pp_atomfwctrl_get_clk_information_by_clkid
shows that sometimes this function is called with instances of:
enum atom_smu9_syspll0_clock_id
enum atom_smu11_syspll0_clock_id
before your patch, the function defined to take a BIOS_CLKID, which is typedef'd to the *9* enum:
typedef enum atom_smu9_syspll0_clock_id BIOS_CLKID;
While the current values are < 256, the enums are not packed, so you should use either int or a union of the two types.
Do the maintainers have a preference, before sending a v2?
Quoted 40 lines
In this case, that is expected behavior. To make that clear to Clang without explicitly casting these values, change id's type to
uint8_tinpp_atomfwctrl_get_clk_information_by_clkidso no conversion happens.Reported-by Nick Desaulniers <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>--- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c | 3 ++- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c +2
-1@@ -488,7 +488,8 @@ int pp_atomfwctrl_get_gpio_information(struct pp_hwmgr *hwmgr,return 0 ; } -int pp_atomfwctrl_get_clk_information_by_clkid (struct pp_hwmgr *hwmgr,BIOS_CLKID id,uint32_t *frequency) +int pp_atomfwctrl_get_clk_information_by_clkid (struct pp_hwmgr *hwmgr, +uint8_t id,uint32_t *frequency) {struct amdgpu_device *adev = hwmgr->adev;struct atom_get_smu_clock_info_parameters_v3_1 parameters;drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h +1
-2@@ -236,7 +236,7 @@ int pp_atomfwctrl_get_vbios_bootup_values(struct pp_hwmgr *hwmgr,int pp_atomfwctrl_get_smc_dpm_information (struct pp_hwmgr *hwmgr,struct pp_atomfwctrl_smc_dpm_parameters *param);int pp_atomfwctrl_get_clk_information_by_clkid (struct pp_hwmgr *hwmgr, -BIOS_CLKID id,uint32_t *frequency); +uint8_t id,uint32_t *frequency);#endif --
Quoted 2 lines
2.19.0
--
Thanks,
~Nick Desaulniers
Quoted 22 lines · Nick Desaulniers
Quoted 10 lines · Nathan Chancellor
Clang generates warnings when one enumerated type is implicitly converted to another.
drivers/gpu/drm/amd/amdgpu/../powerplay/hwmgr/ppatomfwctrl.c:532:57:
warning: implicit conversion from enumeration type 'enumatom_smu11_syspll0_clock_id' to different enumeration type 'BIOS_CLKID'
(aka 'enumatom_smu9_syspll0_clock_id') [-Wenum-conversion]
if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr,SMU11_SYSPLL0_SOCCLK_ID, &frequency))Grepping the call sites, via:
$ grep -r pp_atomfwctrl_get_clk_information_by_clkidshows that sometimes this function is called with instances of:
enum
atom_smu9_syspll0_clock_id
enumatom_smu11_syspll0_clock_id
Quoted 8 lines
before your patch, the function defined to take a
BIOS_CLKID, which is typedef'd to the *9* enum:typedef enum
atom_smu9_syspll0_clock_idBIOS_CLKID;While the current values are < 256, the enums are not packed, so you should use either int or a union of the two types.
Do the maintainers have a preference, before sending a v2?
I think the patch is probably fine as is. For reference, what this function does it look up a value in the vbios based on the id. So all we really need is the numeric value of the id. The ids are different between asic families but the vbios interface is the same.
Alex
Quoted 52 lines
Quoted 41 lines
In this case, that is expected behavior. To make that clear to Clang without explicitly casting these values, change id's type to
uint8_tinpp_atomfwctrl_get_clk_information_by_clkidso no conversion happens.Reported-by Nick Desaulniers <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>--- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c | 3 ++- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c +2
-1@@ -488,7 +488,8 @@ int pp_atomfwctrl_get_gpio_information(struct pp_hwmgr *hwmgr,return 0 ; } -int pp_atomfwctrl_get_clk_information_by_clkid (struct pp_hwmgr *hwmgr,BIOS_CLKID id,uint32_t *frequency) +int pp_atomfwctrl_get_clk_information_by_clkid (struct pp_hwmgr *hwmgr, +uint8_t id,uint32_t *frequency) {struct amdgpu_device *adev = hwmgr->adev;struct atom_get_smu_clock_info_parameters_v3_1 parameters;drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h +1
-2@@ -236,7 +236,7 @@ int pp_atomfwctrl_get_vbios_bootup_values(struct pp_hwmgr *hwmgr,int pp_atomfwctrl_get_smc_dpm_information (struct pp_hwmgr *hwmgr,struct pp_atomfwctrl_smc_dpm_parameters *param);int pp_atomfwctrl_get_clk_information_by_clkid (struct pp_hwmgr *hwmgr, -BIOS_CLKID id,uint32_t *frequency); +uint8_t id,uint32_t *frequency);#endif --Quoted 2 lines
2.19.0
--
Thanks,
~Nick Desaulniers
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
AppliedApplied. thanks!
Alex
Quoted 56 lines · Nathan Chancellor
Clang generates warnings when one enumerated type is implicitly converted to another.
drivers/gpu/drm/amd/amdgpu/../powerplay/hwmgr/ppatomfwctrl.c:532:57:
warning: implicit conversion from enumeration type 'enumatom_smu11_syspll0_clock_id' to different enumeration type 'BIOS_CLKID'
(aka 'enumatom_smu9_syspll0_clock_id') [-Wenum-conversion]
if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr,SMU11_SYSPLL0_SOCCLK_ID, &frequency))In this case, that is expected behavior. To make that clear to Clang without explicitly casting these values, change id's type to
uint8_tinpp_atomfwctrl_get_clk_information_by_clkidso no conversion happens.Reported-by Nick Desaulniers <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>--- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c | 3 ++- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c +2
-1@@ -488,7 +488,8 @@ int pp_atomfwctrl_get_gpio_information(struct pp_hwmgr *hwmgr,return 0 ; } -int pp_atomfwctrl_get_clk_information_by_clkid (struct pp_hwmgr *hwmgr,BIOS_CLKID id,uint32_t *frequency) +int pp_atomfwctrl_get_clk_information_by_clkid (struct pp_hwmgr *hwmgr, +uint8_t id,uint32_t *frequency) {struct amdgpu_device *adev = hwmgr->adev;struct atom_get_smu_clock_info_parameters_v3_1 parameters;drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h +1
-2@@ -236,7 +236,7 @@ int pp_atomfwctrl_get_vbios_bootup_values(struct pp_hwmgr *hwmgr,int pp_atomfwctrl_get_smc_dpm_information (struct pp_hwmgr *hwmgr,struct pp_atomfwctrl_smc_dpm_parameters *param);int pp_atomfwctrl_get_clk_information_by_clkid (struct pp_hwmgr *hwmgr, -BIOS_CLKID id,uint32_t *frequency); +uint8_t id,uint32_t *frequency);#endif --2.19.0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx