diff options
author | Nathan Chancellor <natechancellor@gmail.com> | 2018-09-21 17:01:06 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-09-27 10:40:09 -0400 |
commit | 3ea81f7125dfda80e264e4552b1146c88eff1aa7 (patch) | |
tree | b570989f2c729e4f1f924c98dbfda7e7773b2129 | |
parent | 006a0b3d86e7cee0e38d0543c7a6e5dbbf12025e (diff) |
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.
Reported-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c b/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c index d27c1c9df286..4588bddf8b33 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c | |||
@@ -488,7 +488,8 @@ int pp_atomfwctrl_get_gpio_information(struct pp_hwmgr *hwmgr, | |||
488 | return 0; | 488 | return 0; |
489 | } | 489 | } |
490 | 490 | ||
491 | int pp_atomfwctrl_get_clk_information_by_clkid(struct pp_hwmgr *hwmgr, BIOS_CLKID id, uint32_t *frequency) | 491 | int pp_atomfwctrl_get_clk_information_by_clkid(struct pp_hwmgr *hwmgr, |
492 | uint8_t id, uint32_t *frequency) | ||
492 | { | 493 | { |
493 | struct amdgpu_device *adev = hwmgr->adev; | 494 | struct amdgpu_device *adev = hwmgr->adev; |
494 | struct atom_get_smu_clock_info_parameters_v3_1 parameters; | 495 | struct atom_get_smu_clock_info_parameters_v3_1 parameters; |
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h b/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h index 22e21668c93a..fe9e8ceef50e 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h | |||
@@ -236,7 +236,7 @@ int pp_atomfwctrl_get_vbios_bootup_values(struct pp_hwmgr *hwmgr, | |||
236 | int pp_atomfwctrl_get_smc_dpm_information(struct pp_hwmgr *hwmgr, | 236 | int pp_atomfwctrl_get_smc_dpm_information(struct pp_hwmgr *hwmgr, |
237 | struct pp_atomfwctrl_smc_dpm_parameters *param); | 237 | struct pp_atomfwctrl_smc_dpm_parameters *param); |
238 | int pp_atomfwctrl_get_clk_information_by_clkid(struct pp_hwmgr *hwmgr, | 238 | int pp_atomfwctrl_get_clk_information_by_clkid(struct pp_hwmgr *hwmgr, |
239 | BIOS_CLKID id, uint32_t *frequency); | 239 | uint8_t id, uint32_t *frequency); |
240 | 240 | ||
241 | #endif | 241 | #endif |
242 | 242 | ||