xf86-video-intel: src/i830_dri.c

[Jesse Barnes]

 src/i830_dri.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
diff-tree 1845e7c6e9caf7a9ad7f46a8fbfa321ddec69a1e (from f3d92ab474de11babe507b0e3c15aca146b6cb66)
Author: Jesse Barnes <jesse.barnes at intel.com>
Date:   Fri Sep 28 10:12:11 2007 -0700

    Go back to using old drm_i915_flip_t field name
    
    This field shouldn't have been renamed in the first place.  Go back to using
    the old name so that the tree is backward and forward compatible again.

diff --git a/src/i830_dri.c b/src/i830_dri.c
index 6fe75e5..4cddf3b 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -91,7 +91,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define DRM_VBLANK_FLIP 0x8000000
 
 typedef struct drm_i915_flip {
-   int planes;
+   int pipes;
 } drm_i915_flip_t;
 
 #undef DRM_IOCTL_I915_FLIP
@@ -1256,20 +1256,20 @@ I830DRISwapContext(ScreenPtr pScreen, DR
 #ifdef DAMAGE
       /* Try flipping back to the front page if necessary */
       if (sPriv && !sPriv->pf_enabled && sPriv->pf_current_page != 0) {
-	 drm_i915_flip_t flip = { .planes = 0 };
+	 drm_i915_flip_t flip = { .pipes = 0 };
 
 	 if (sPriv->pf_current_page & (0x3 << 2)) {
 	    sPriv->pf_current_page = sPriv->pf_current_page & 0x3;
 	    sPriv->pf_current_page |= (sPriv->third_handle ? 2 : 1) << 2;
 
-	    flip.planes |= 0x2;
+	    flip.pipes |= 0x2;
 	 }
 
 	 if (sPriv->pf_current_page & 0x3) {
 	    sPriv->pf_current_page = sPriv->pf_current_page & (0x3 << 2);
 	    sPriv->pf_current_page |= sPriv->third_handle ? 2 : 1;
 
-	    flip.planes |= 0x1;
+	    flip.pipes |= 0x1;
 	 }
 
 	 drmCommandWrite(pI830->drmSubFD, DRM_I915_FLIP, &flip, sizeof(flip));