From: Tomi Valkeinen Date: Thu, 19 Nov 2015 15:31:25 +0000 (+0200) Subject: drm/omap: increase vblank wait timeout X-Git-Tag: v5.15~13916^2~24^2~60 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=61f3c40b489c7f3ca2f844e6513c1abd08e66a93;p=platform%2Fkernel%2Flinux-starfive.git drm/omap: increase vblank wait timeout omap_crtc_wait_pending() waits until the config changes have been taken into use, usually at next vblank. The wait-timeout used is 50ms, which usually is enough, but in some rare cases not. As time wait-timeout is just a safety measure for cases where something is broken, we can just as well increase the timeout considerably. This patch makes the timeout 250ms. Signed-off-by: Tomi Valkeinen Acked-by: Laurent Pinchart --- diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c index f5b19d1..f1cd280 100644 --- a/drivers/gpu/drm/omapdrm/omap_crtc.c +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c @@ -80,9 +80,13 @@ int omap_crtc_wait_pending(struct drm_crtc *crtc) { struct omap_crtc *omap_crtc = to_omap_crtc(crtc); + /* + * Timeout is set to a "sufficiently" high value, which should cover + * a single frame refresh even on slower displays. + */ return wait_event_timeout(omap_crtc->pending_wait, !omap_crtc->pending, - msecs_to_jiffies(50)); + msecs_to_jiffies(250)); } /* -----------------------------------------------------------------------------