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

sna/dri: Fix cross-chaining of pageflip vs vblank 

And double-check that the drawable is still flippable before completing
the delay exchange.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2012-07-07 20:53:27 +01:00
parent 1454df8caa
commit 3bb7a530e7
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/sna/sna_dri.c
View File

@ -1083,9 +1083,17 @@ static void chain_swap(struct sna *sna,
int type;
assert(chain == sna_dri_window_get_chain((WindowPtr)draw));
DBG(("%s: chaining type=%d\n", __FUNCTION__, chain->type));
switch (chain->type) {
case DRI2_XCHG_THROTTLE:
case DRI2_SWAP_THROTTLE:
break;
default:
return;
}
/* In theory, it shoudln't be possible for cross-chaining to occur! */
if (chain->type == DRI2_XCHG_THROTTLE) {
if (chain->type == DRI2_XCHG_THROTTLE &&
can_exchange(sna, draw, chain->front, chain->back)) {
DBG(("%s: performing chained exchange\n", __FUNCTION__));
sna_dri_exchange_buffers(draw, chain->front, chain->back);
type = DRI2_EXCHANGE_COMPLETE;