diff options
| author | Michel Dänzer <michel@tungstengraphics.com> | 2007-03-12 19:00:14 +0100 |
|---|---|---|
| committer | Michel Dänzer <michel@tungstengraphics.com> | 2007-03-12 19:00:14 +0100 |
| commit | 7aa257154685bd2520649ce87a3a84e55644d02c (patch) | |
| tree | f240c6578a303c07c3d6850d42421b85db620421 | |
| parent | 7c561956a28e90667fef140bc3cfa0edca464f15 (diff) | |
Fix build against released libdrm.
| -rw-r--r-- | src/i830_dri.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/i830_dri.c b/src/i830_dri.c index 96061bd2..8fae4b7e 100644 --- a/src/i830_dri.c +++ b/src/i830_dri.c @@ -83,6 +83,23 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "i915_drm.h" +/* This block and the corresponding configure test can be removed when + * libdrm >= 2.3.1 is required. + */ +#ifndef HAVE_I915_FLIP + +#define DRM_VBLANK_FLIP 0x8000000 + +typedef struct drm_i915_flip { + int pipes; +} drm_i915_flip_t; + +#undef DRM_IOCTL_I915_FLIP +#define DRM_IOCTL_I915_FLIP DRM_IOW(DRM_COMMAND_BASE + DRM_I915_FLIP, \ + drm_i915_flip_t) + +#endif + #include "dristruct.h" static char I830KernelDriverName[] = "i915"; @@ -1510,23 +1527,6 @@ I830DRITransitionTo3d(ScreenPtr pScreen) I830DRISetPfMask(pScreen, pI830->allowPageFlip ? 0x3 : 0); } -/* This block and the corresponding configure test can be removed when - * libdrm >= 2.3.1 is required. - */ -#ifndef HAVE_I915_FLIP - -#define DRM_VBLANK_FLIP 0x8000000 - -typedef struct drm_i915_flip { - int pipes; -} drm_i915_flip_t; - -#undef DRM_IOCTL_I915_FLIP -#define DRM_IOCTL_I915_FLIP DRM_IOW(DRM_COMMAND_BASE + DRM_I915_FLIP, \ - drm_i915_flip_t) - -#endif - static void I830DRITransitionTo2d(ScreenPtr pScreen) { |