Merge branch 'pageflip' of git://people.freedesktop.org/~jbarnes/drm

Conflicts:
	include/drm/drm.h - RMFB had its signature changed to avoid uint32_t

diff --cc include/drm/drm.h
index 649c46f,c381874..5408c08
--- 1/include/drm/drm.h
--- 2/shared-core/drm.h
+++ b/include/drm/drm.h
@@@ -693,9 -791,13 +693,12 @@@ struct drm_gem_open 
  #define DRM_IOCTL_MODE_GETPROPERTY    DRM_IOWR(0xAA, struct drm_mode_get_property)
  #define DRM_IOCTL_MODE_SETPROPERTY    DRM_IOWR(0xAB, struct drm_mode_connector_set_property)
  #define DRM_IOCTL_MODE_GETPROPBLOB    DRM_IOWR(0xAC, struct drm_mode_get_blob)
 -
  #define DRM_IOCTL_MODE_GETFB          DRM_IOWR(0xAD, struct drm_mode_fb_cmd)
  #define DRM_IOCTL_MODE_ADDFB          DRM_IOWR(0xAE, struct drm_mode_fb_cmd)
 -#define DRM_IOCTL_MODE_RMFB           DRM_IOWR(0xAF, uint32_t)
 +#define DRM_IOCTL_MODE_RMFB           DRM_IOWR(0xAF, unsigned int)
+ #define DRM_IOCTL_MODE_PAGE_FLIP      DRM_IOWR(0xB0, struct drm_mode_crtc_page_flip)
+ 
+ /*@}*/
  
  /**
   * Device specific ioctls should only be in their respective headers

diff --cc include/drm/drm_mode.h
index 852505e,fceac3c..1fd3026
--- 1/include/drm/drm_mode.h
--- 2/shared-core/drm_mode.h
+++ b/include/drm/drm_mode.h
@@@ -256,13 -261,24 +256,24 @@@ struct drm_mode_cursor 
  };
  
  struct drm_mode_crtc_lut {
 -      uint32_t crtc_id;
 -      uint32_t gamma_size;
 +      __u32 crtc_id;
 +      __u32 gamma_size;
  
        /* pointers to arrays */
 -      uint64_t red;
 -      uint64_t green;
 -      uint64_t blue;
 +      __u64 red;
 +      __u64 green;
 +      __u64 blue;
  };
  
+ #define DRM_MODE_PAGE_FLIP_EVENT 0x01
+ #define DRM_MODE_PAGE_FLIP_FLAGS DRM_MODE_PAGE_FLIP_EVENT
+ 
+ struct drm_mode_crtc_page_flip {
+       uint32_t crtc_id;
+       uint32_t fb_id;
+       uint32_t flags;
+       uint32_t reserved;
+       uint64_t user_data;
+ };
+ 
  #endif

diff --cc include/drm/i915_drm.h
Simple merge

diff --cc xf86drm.h
Simple merge

diff --cc xf86drmMode.c
Simple merge

diff --cc xf86drmMode.h
Simple merge