diff options
| author | Tomi Valkeinen <[email protected]> | 2015-11-19 15:31:25 +0000 |
|---|---|---|
| committer | Tomi Valkeinen <[email protected]> | 2016-03-03 15:36:42 +0000 |
| commit | 61f3c40b489c7f3ca2f844e6513c1abd08e66a93 (patch) | |
| tree | 58920e88070f80f4c5fec5f8d6b6574c234a7fae | |
| parent | drm/omap: remove support for ext mem & sync (diff) | |
| download | kernel-61f3c40b489c7f3ca2f844e6513c1abd08e66a93.tar.gz kernel-61f3c40b489c7f3ca2f844e6513c1abd08e66a93.zip | |
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 <[email protected]>
Acked-by: Laurent Pinchart <[email protected]>
| -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) { 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)); } /* ----------------------------------------------------------------------------- |