Commit 3ea81f71 authored Sep 21, 2018 by Nathan Chancellor Committed by Alex Deucher Sep 27, 2018

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>

parent 006a0b3d

drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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