xf86-video-intel: src/sna/sna_present.c
Chris Wilson
ickle at kemper.freedesktop.org
Thu Jun 11 05:07:42 PDT 2015
src/sna/sna_present.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f71148a8b792ba917a007dfc5b06bb592b1963eb
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Thu Jun 11 13:05:43 2015 +0100
sna/present: Downgrade a known assert failure to a warning
We know Present is sending garbage msc into the wait_vblank, so just
warn about the error so that we do not prevent usage of --enable-debug
due to somebody else's bug.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_present.c b/src/sna/sna_present.c
index 2b3468d..1fb059a 100644
--- a/src/sna/sna_present.c
+++ b/src/sna/sna_present.c
@@ -313,7 +313,7 @@ sna_present_queue_vblank(RRCrtcPtr crtc, uint64_t event_id, uint64_t msc)
(long long)event_id, (long long)msc));
swap = sna_crtc_last_swap(crtc->devPrivate);
- assert((int64_t)(msc - swap->msc) >= 0);
+ warn_unless((int64_t)(msc - swap->msc) >= 0);
if ((int64_t)(msc - swap->msc) <= 0) {
DBG(("%s: pipe=%d tv=%d.%06d msc=%lld (target=%lld), event=%lld complete\n", __FUNCTION__,
sna_crtc_pipe(crtc->devPrivate),
More information about the xorg-commit
mailing list