From: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
Date: Fri, 12 May 2017 20:19:15 +0000 (-0400)
Subject: drm/amd/display: Fix slow FPS.
X-Git-Tag: v4.19~2140^2~23^2~496
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e806208dc1daebf3b236d0188709d943cf0d9f16;p=platform%2Fkernel%2Flinux-rpi.git

drm/amd/display: Fix slow FPS.

Typo in expresion.

Signed-off-by: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
Reviewed-by: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 4ec86ed..a2c00c0 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -135,8 +135,8 @@ static int dm_crtc_get_scanoutpos(struct amdgpu_device *adev, int crtc,
 					 &h_position,
 					 &v_position);
 
-		*position = (v_position) || (h_position << 16);
-		*vbl = (v_blank_start) || (v_blank_end << 16);
+		*position = v_position | (h_position << 16);
+		*vbl = v_blank_start | (v_blank_end << 16);
 	}
 
 	return 0;