diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2014-11-19 18:30:20 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-11-20 13:26:29 +0000 |
| commit | 7725c423cda217e0dbd95003bb7a80b4b3a73bb4 (patch) | |
| tree | 40f6648fc767b8a9bec2a1ee4939e3fc3448752a /src | |
| parent | f367f3dee5e2ecba265a8ff7e98e196189793613 (diff) | |
sna/dri2: Improve precision of completion event for no-op swaps
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src')
| -rw-r--r-- | src/sna/sna_dri2.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c index 5e9f284f..d0760fcb 100644 --- a/src/sna/sna_dri2.c +++ b/src/sna/sna_dri2.c @@ -1948,8 +1948,8 @@ static void frame_swap_complete(struct sna_dri2_event *frame, int type) assert(frame->client); swap = sna_crtc_last_swap(frame->crtc); - DBG(("%s: draw=%ld, pipe=%d, frame=%lld [msc=%lld], tv=%d.%06d\n", - __FUNCTION__, (long)frame->draw, frame->pipe, + DBG(("%s(type=%d): draw=%ld, pipe=%d, frame=%lld [msc=%lld], tv=%d.%06d\n", + __FUNCTION__, type, (long)frame->draw, frame->pipe, (long long)swap->msc, (long long)draw_current_msc(frame->draw, frame->crtc, swap->msc), swap->tv_sec, swap->tv_usec)); @@ -1967,8 +1967,8 @@ static void fake_swap_complete(struct sna *sna, ClientPtr client, const struct ust_msc *swap; swap = sna_crtc_last_swap(crtc); - DBG(("%s: draw=%ld, pipe=%d, frame=%lld [msc %lld], tv=%d.%06d\n", - __FUNCTION__, (long)draw->id, crtc ? sna_crtc_to_pipe(crtc) : -1, + DBG(("%s(type=%d): draw=%ld, pipe=%d, frame=%lld [msc %lld], tv=%d.%06d\n", + __FUNCTION__, type, (long)draw->id, crtc ? sna_crtc_to_pipe(crtc) : -1, (long long)swap->msc, (long long)draw_current_msc(draw, crtc, swap->msc), swap->tv_sec, swap->tv_usec)); @@ -2802,6 +2802,7 @@ sna_dri2_schedule_swap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front, union drm_wait_vblank vbl; xf86CrtcPtr crtc = NULL; struct sna_dri2_event *info = NULL; + int type = DRI2_EXCHANGE_COMPLETE; CARD64 current_msc; DBG(("%s: draw=%lu %dx%d, pixmap=%ld %dx%d, back=%u (refs=%d/%d, flush=%d) , front=%u (refs=%d/%d, flush=%d)\n", @@ -2973,15 +2974,17 @@ blit: DBG(("%s -- blit\n", __FUNCTION__)); if (info) sna_dri2_event_free(info); - if (can_xchg(sna, draw, front, back)) + if (can_xchg(sna, draw, front, back)) { sna_dri2_xchg(draw, front, back); - else + } else { __sna_dri2_copy_region(sna, draw, NULL, back, front, false); + type = DRI2_BLIT_COMPLETE; + } skip: DBG(("%s: unable to show frame, unblocking client\n", __FUNCTION__)); if (crtc == NULL) crtc = sna_mode_first_crtc(sna); - fake_swap_complete(sna, client, draw, crtc, DRI2_BLIT_COMPLETE, func, data); + fake_swap_complete(sna, client, draw, crtc, type, func, data); *target_msc = 0; /* offscreen, so zero out target vblank count */ return TRUE; } |