commit 9887e425f91b063d68ee1fbec76dea15d6a82085
author Nils Wallménius <nils.wallmenius@gmail.com> Thu May 05 09:07:46 2016 +0200
committer Alex Deucher <alexander.deucher@amd.com> Wed May 11 12:31:23 2016 -0400
tree afc09c764d8a74ba359a207d9d87099a1318cb84
parent 859b8b6a27eb6f22d082282f5fd234d6323f849d

drm/amdgpu: Use max macro in *get_sleep_divider_id_from_clock

Signed-off-by: Nils Wallménius <nils.wallmenius@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

drivers/gpu/drm/amd/amdgpu/ci_dpm.c

diff --git a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
index 2f24797..4d50c43 100644
--- a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
@@ -2554,8 +2554,7 @@
 {
 	u32 i;
 	u32 tmp;
-	u32 min = (min_sclk_in_sr > CISLAND_MINIMUM_ENGINE_CLOCK) ?
-		min_sclk_in_sr : CISLAND_MINIMUM_ENGINE_CLOCK;
+	u32 min = max(min_sclk_in_sr, (u32)CISLAND_MINIMUM_ENGINE_CLOCK);
 
 	if (sclk < min)
 		return 0;