xf86-video-intel: src/sna/sna_dri.c
Chris Wilson
ickle at kemper.freedesktop.org
Thu Aug 30 14:42:57 PDT 2012
src/sna/sna_dri.c | 29 +++++++++++++----------------
1 file changed, 13 insertions(+), 16 deletions(-)
New commits:
commit 530b1d1516595cf14c5112d8833b870cd50eca46
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Thu Aug 30 22:21:57 2012 +0100
sna/dri: Use common routine for testing busyness after flush
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_dri.c b/src/sna/sna_dri.c
index 5fa17d7..0210d73 100644
--- a/src/sna/sna_dri.c
+++ b/src/sna/sna_dri.c
@@ -1206,24 +1206,21 @@ static void chain_swap(struct sna *sna,
static bool sna_dri_blit_complete(struct sna *sna,
struct sna_dri_frame_event *info)
{
- if (info->bo && kgem_bo_is_busy(info->bo)) {
- kgem_retire(&sna->kgem);
- if (kgem_bo_is_busy(info->bo)) {
- drmVBlank vbl;
+ if (info->bo && __kgem_bo_is_busy(&sna->kgem, info->bo)) {
+ drmVBlank vbl;
- DBG(("%s: vsync'ed blit is still busy, postponing\n",
- __FUNCTION__));
+ DBG(("%s: vsync'ed blit is still busy, postponing\n",
+ __FUNCTION__));
- VG_CLEAR(vbl);
- vbl.request.type =
- DRM_VBLANK_RELATIVE |
- DRM_VBLANK_EVENT |
- pipe_select(info->pipe);
- vbl.request.sequence = 1;
- vbl.request.signal = (unsigned long)info;
- if (!sna_wait_vblank(sna, &vbl))
- return false;
- }
+ VG_CLEAR(vbl);
+ vbl.request.type =
+ DRM_VBLANK_RELATIVE |
+ DRM_VBLANK_EVENT |
+ pipe_select(info->pipe);
+ vbl.request.sequence = 1;
+ vbl.request.signal = (unsigned long)info;
+ if (!sna_wait_vblank(sna, &vbl))
+ return false;
}
return true;
More information about the xorg-commit
mailing list