Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna/dri2: Extend keepalives to windowed swaps 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2015-06-13 09:29:12 +01:00
parent 92a2773221
commit a0af3d1856
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/sna/sna_dri2.c
View File

@ -100,6 +100,7 @@ enum event_type {
SWAP,
SWAP_WAIT,
SWAP_THROTTLE,
SWAP_ALIVE,
FLIP,
FLIP_THROTTLE,
FLIP_COMPLETE,
@ -1543,6 +1544,7 @@ sna_dri2_add_event(struct sna *sna,
info->draw = draw;
info->crtc = crtc;
info->pipe = sna_crtc_pipe(crtc);
info->keepalive = 1;
if (!add_event_to_client(info, sna, client)) {
free(info);
@ -2426,6 +2428,8 @@ void sna_dri2_vblank_handler(struct drm_event_vblank *event)
frame_swap_complete(info, DRI2_BLIT_COMPLETE);
}
break;
case SWAP_ALIVE:
break;
case WAITMSC:
assert(info->client);
@ -2445,6 +2449,21 @@ void sna_dri2_vblank_handler(struct drm_event_vblank *event)
sna_dri2_remove_event((WindowPtr)draw, info);
chain_swap(info->chain);
info->draw = NULL;
} else if (--info->keepalive) {
assert(info->type = SWAP_ALIVE || SWAP_THROTTLE);
info->type = SWAP_ALIVE;
info->queued = true;
DBG(("%s: requeing keepalive=%d\n",
__FUNCTION__, info->keepalive));
VG_CLEAR(vbl);
vbl.request.type =
DRM_VBLANK_RELATIVE |
DRM_VBLANK_EVENT;
vbl.request.sequence = 1;
vbl.request.signal = (uintptr_t)info;
return;
}
done:
@ -2468,6 +2487,7 @@ sna_dri2_immediate_blit(struct sna *sna,
info->type = SWAP_THROTTLE;
info->sync = sync;
info->keepalive = KEEPALIVE;
if (chain == info) {
union drm_wait_vblank vbl;