summaryrefslogtreecommitdiff
path: root/include/drm/drm.h
AgeCommit message (Collapse)Author
2009-12-02Merge branch 'modesetting-dirty-libdrm'Jakob Bornecrantz
Conflicts: include/drm/drm.h
2009-12-03Merge branch 'pageflip' of git://people.freedesktop.org/~jbarnes/drmJesse Barnes
Conflicts: include/drm/drm.h - RMFB had its signature changed to avoid uint32_t
2009-12-02Change the number on the dirty ioctl to match upstreamJakob Bornecrantz
2009-11-26Bring dirty code from old branchJakob Bornecrantz
2009-11-24More fixups to allow mesa to buildRobert Noland
2009-11-24Finish fixing the build on FreeBSDRobert Noland
2009-11-23Fix build on *BSDKristian Høgsberg
This adds a minimal #ifdef clause to drm.h that we'll push upstream. Once that goes in we can share drm.h between linux, libdrm, and the bsd's.
2009-11-17Copy headers from kernel v2.6.32-rc6-130-g5b8f0beKristian Høgsberg