xf86-video-intel: src/uxa/intel.h

[Chris Wilson]

 src/uxa/intel.h |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 197ab0cda06c44aa1a2b17bf69ac08612811b107
Author: Dave Airlie <airlied at gmail.com>
Date:   Tue May 20 07:45:14 2014 +0100

    uxa: fix pageflips on 3 head scenarios
    
    While fixing up UXA for MST I eventually fell over this bug.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>
    [ickle: replace constant with macro to track pipe-dependent code]

diff --git a/src/uxa/intel.h b/src/uxa/intel.h
index 6ac770e..a4cae13 100644
--- a/src/uxa/intel.h
+++ b/src/uxa/intel.h
@@ -87,6 +87,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define INTEL_PIXMAP_SHARING 1
 #endif
 
+#define MAX_PIPES 4 /* consider making all users dynamic */
+
 struct intel_pixmap {
 	dri_bo *bo;
 
@@ -334,7 +336,7 @@ typedef struct intel_screen_private {
 	Bool has_kernel_flush;
 	Bool needs_flush;
 
-	struct _DRI2FrameEvent *pending_flip[2];
+	struct _DRI2FrameEvent *pending_flip[MAX_PIPES];
 
 	/* Broken-out options. */
 	OptionInfoPtr Options;