Merge branch 'modesetting-dirty-libdrm'
authorJakob Bornecrantz <jakob@vmware.com>
Wed, 2 Dec 2009 18:40:58 +0000 (19:40 +0100)
committerJakob Bornecrantz <jakob@vmware.com>
Wed, 2 Dec 2009 18:40:58 +0000 (19:40 +0100)
Conflicts:
include/drm/drm.h

1  2 
include/drm/drm.h
include/drm/drm_mode.h
xf86drmMode.c
xf86drmMode.h

index 5408c08c7e70dbca90257b67e02366d3a78869d7,225ab6ce590e905cdbd385a730ce219178b8c5dc..48221599311b1e3ae817ae014e45c1302af06bf1
@@@ -696,10 -696,8 +696,11 @@@ struct drm_gem_open 
  #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, unsigned int)
 +#define DRM_IOCTL_MODE_PAGE_FLIP      DRM_IOWR(0xB0, struct drm_mode_crtc_page_flip)
+ #define DRM_IOCTL_MODE_DIRTYFB                DRM_IOWR(0xB1, struct drm_mode_fb_dirty_cmd)
  
 +/*@}*/
 +
  /**
   * Device specific ioctls should only be in their respective headers
   * The device specific ioctl range is from 0x40 to 0x99.
Simple merge
diff --cc xf86drmMode.c
Simple merge
diff --cc xf86drmMode.h
Simple merge