diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-11-19 10:31:25 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2016-03-03 10:36:42 -0500 |
commit | 61f3c40b489c7f3ca2f844e6513c1abd08e66a93 (patch) | |
tree | 58920e88070f80f4c5fec5f8d6b6574c234a7fae /drivers/gpu/drm/omapdrm | |
parent | 3f50effdb835c1563bb4d5afb4cd0de8ce6ced68 (diff) |
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 <tomi.valkeinen@ti.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm')
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_crtc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c index f5b19d18fa8b..f1cd2800055b 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) | |||
80 | { | 80 | { |
81 | struct omap_crtc *omap_crtc = to_omap_crtc(crtc); | 81 | struct omap_crtc *omap_crtc = to_omap_crtc(crtc); |
82 | 82 | ||
83 | /* | ||
84 | * Timeout is set to a "sufficiently" high value, which should cover | ||
85 | * a single frame refresh even on slower displays. | ||
86 | */ | ||
83 | return wait_event_timeout(omap_crtc->pending_wait, | 87 | return wait_event_timeout(omap_crtc->pending_wait, |
84 | !omap_crtc->pending, | 88 | !omap_crtc->pending, |
85 | msecs_to_jiffies(50)); | 89 | msecs_to_jiffies(250)); |
86 | } | 90 | } |
87 | 91 | ||
88 | /* ----------------------------------------------------------------------------- | 92 | /* ----------------------------------------------------------------------------- |