Merge tag 'drm-intel-next-2018-02-21' of git://anongit.freedesktop.org/drm/drm-intel...

[linux-2.6-block.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_display.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index 1eb0861c91476a29aaa244555aeb867ae8f8b41d..93f700ab1bfbfbd75b29757d9acbff329e88e898 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -210,7 +210,7 @@ int amdgpu_display_crtc_page_flip_target(struct drm_crtc *crtc,
        amdgpu_bo_unreserve(new_abo);
 
        work->base = base;
-       work->target_vblank = target - drm_crtc_vblank_count(crtc) +
+       work->target_vblank = target - (uint32_t)drm_crtc_vblank_count(crtc) +
                amdgpu_get_vblank_counter_kms(dev, work->crtc_id);
 
        /* we borrow the event spin lock for protecting flip_wrok */