From: Michel Dänzer <michel@daenzer.net>
Date: Fri, 29 Sep 2006 10:22:54 +0000 (+0000)
Subject: i915: Fix wait for scheduled swap on secondary display.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=46929c93d8c3b1a9682c24b3f3f6d6ed1878e422;p=mesa.git

i915: Fix wait for scheduled swap on secondary display.
---

diff --git a/src/mesa/drivers/dri/i915/intel_context.h b/src/mesa/drivers/dri/i915/intel_context.h
index 6cd6272053f..05195e76d65 100644
--- a/src/mesa/drivers/dri/i915/intel_context.h
+++ b/src/mesa/drivers/dri/i915/intel_context.h
@@ -34,6 +34,7 @@
 #include "drm.h"
 #include "mm.h"
 #include "texmem.h"
+#include "vblank.h"
 
 #include "intel_screen.h"
 #include "i915_drm.h"
@@ -326,6 +327,10 @@ do {							\
     if ((intel)->swap_scheduled) {			\
         drmVBlank vbl;					\
         vbl.request.type = DRM_VBLANK_ABSOLUTE;		\
+        if ((intel)->vblank_flags &			\
+            VBLANK_FLAG_SECONDARY) {			\
+            vbl.request.type |= DRM_VBLANK_SECONDARY;	\
+        }						\
         vbl.request.sequence = (intel)->vbl_seq;	\
         drmWaitVBlank((intel)->driFd, &vbl);		\
         (intel)->swap_scheduled = 0;			\