Commit d196bbbc authored Jul 03, 2019 by Nathan Chancellor Committed by Alex Deucher Aug 02, 2019

drm/amd/display: Use proper enum conversion functions

clang warns:

drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_pp_smu.c:336:8:
warning: implicit conversion from enumeration type 'enum smu_clk_type'
to different enumeration type 'enum amd_pp_clock_type'
[-Wenum-conversion]
                                        dc_to_smu_clock_type(clk_type),
                                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_pp_smu.c:421:14:
warning: implicit conversion from enumeration type 'enum
amd_pp_clock_type' to different enumeration type 'enum smu_clk_type'
[-Wenum-conversion]
                                        dc_to_pp_clock_type(clk_type),
                                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

There are functions to properly convert between all of these types, use
them so there are no longer any warnings.

Fixes: a43913ea ("drm/amd/powerplay: add function get_clock_by_type_with_latency for navi10")
Fixes: e5e4e223 ("drm/amd/powerplay: add interface to get clock by type with latency for display (v2)")
Link: https://github.com/ClangBuiltLinux/linux/issues/586


Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Reviewed-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 482f0e53

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -334,7 +334,7 @@ bool dm_pp_get_clock_levels_by_type(
		}
		} else if (adev->smu.funcs && adev->smu.funcs->get_clock_by_type) {
		if (smu_get_clock_by_type(&adev->smu,
		dc_to_smu_clock_type(clk_type),
		dc_to_pp_clock_type(clk_type),
		&pp_clks)) {
		get_default_clock_levels(clk_type, dc_clks);
		return true;
		@@ -419,7 +419,7 @@ bool dm_pp_get_clock_levels_by_type_with_latency(
		return false;
		} else if (adev->smu.ppt_funcs && adev->smu.ppt_funcs->get_clock_by_type_with_latency) {
		if (smu_get_clock_by_type_with_latency(&adev->smu,
		dc_to_pp_clock_type(clk_type),
		dc_to_smu_clock_type(clk_type),
		&pp_clks))
		return false;
		}

Admin message