Fix build against released libdrm.

This commit is contained in:
Michel Dänzer 2007-03-12 19:00:14 +01:00
parent 7c561956a2
commit 7aa2571546
1 changed files with 17 additions and 17 deletions

View File

@ -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)
{