From: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue, 2 Oct 2007 11:01:07 +0000 (+0200)
Subject: intel_winsys: Adapt to DRM changes (again).
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ce765a7fb77e12ff083a9068ec232a15bcf41f66;p=mesa.git

intel_winsys: Adapt to DRM changes (again).

It was decided after all to stick to 'pipes' here, even though the actual
meaning is now 'planes'.
---

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c b/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c
index 48c1f68d9c3..a6d0d43e4d0 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c
@@ -46,7 +46,7 @@
 #define DRM_VBLANK_FLIP 0x8000000
 
 typedef struct drm_i915_flip {
-   int planes;
+   int pipes;
 } drm_i915_flip_t;
 
 #undef DRM_IOCTL_I915_FLIP
@@ -314,7 +314,7 @@ intelWindowMoved(struct intel_context *intel)
 		  ((intel_fb->pf_current_page + intel_fb->pf_num_pages - 1) %
 		   intel_fb->pf_num_pages) << 2;
 
-	       flip.planes = 0x2;
+	       flip.pipes = 0x2;
 	    } else {
                intel->sarea->pf_current_page =
 		  intel->sarea->pf_current_page & (0x3 << 2);
@@ -322,7 +322,7 @@ intelWindowMoved(struct intel_context *intel)
 		  (intel_fb->pf_current_page + intel_fb->pf_num_pages - 1) %
 		  intel_fb->pf_num_pages;
 
-	       flip.planes = 0x1;
+	       flip.pipes = 0x1;
 	    }
 
 	    drmCommandWrite(intel->driFd, DRM_I915_FLIP, &flip, sizeof(flip));
@@ -449,7 +449,7 @@ intelPageFlip(const __DRIdrawablePrivate * dPriv)
    if (dPriv->numClipRects && intel_fb->pf_active) {
       drm_i915_flip_t flip;
 
-      flip.planes = intel_fb->pf_planes;
+      flip.pipes = intel_fb->pf_planes;
 
       ret = drmCommandWrite(intel->driFd, DRM_I915_FLIP, &flip, sizeof(flip));
    }