From: Xu Jianqun Date: Tue, 2 May 2017 06:34:52 +0000 (+0800) Subject: drm/rockchip: vop: fix update timeout to 1000 ms X-Git-Tag: release-20171130_firefly~4^2~691 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=c505c0d7aece398533ea4b4446a02348fa90559a;p=firefly-linux-kernel-4.4.55.git drm/rockchip: vop: fix update timeout to 1000 ms Extend timeout value from 100 jiffies to 1000 millisecond. Change-Id: I4941bb487051a73cf348f72799226e17d4b60e49 Signed-off-by: Xu Jianqun --- diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 7c125decacc0..096f7aa0666b 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -1308,7 +1308,8 @@ static void vop_crtc_wait_for_update(struct drm_crtc *crtc) struct vop *vop = to_vop(crtc); reinit_completion(&vop->wait_update_complete); - WARN_ON(!wait_for_completion_timeout(&vop->wait_update_complete, 100)); + WARN_ON(!wait_for_completion_timeout(&vop->wait_update_complete, + msecs_to_jiffies(1000))); } static void vop_crtc_cancel_pending_vblank(struct drm_crtc *crtc,