summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorJesse Barnes <jesse.barnes@intel.com>2007-09-28 10:11:52 -0700
committerJesse Barnes <jesse.barnes@intel.com>2007-09-28 10:11:52 -0700
commitd99f6c4a2aa8207a2fbacd9b3a5ec87dd25ba496 (patch)
tree4a9546fdfe35898a4e2c7bdc94bad65b2540c0e9 /src/mesa
parent35331a511fcd023a7b6f0eb298098d872b856a9f (diff)
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.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i915/intel_buffers.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_buffers.c b/src/mesa/drivers/dri/i915/intel_buffers.c
index cb151ab94d..938bed6da7 100644
--- a/src/mesa/drivers/dri/i915/intel_buffers.c
+++ b/src/mesa/drivers/dri/i915/intel_buffers.c
@@ -50,7 +50,7 @@
#define DRM_VBLANK_FLIP 0x8000000
typedef struct drm_i915_flip {
- int planes;
+ int pipes;
} drm_i915_flip_t;
#undef DRM_IOCTL_I915_FLIP
@@ -287,7 +287,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);
@@ -295,7 +295,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));
@@ -761,7 +761,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));
}