diff options
author | Adam Jackson <ajax@nwnk.net> | 2005-11-30 18:30:05 +0000 |
---|---|---|
committer | Adam Jackson <ajax@nwnk.net> | 2005-11-30 18:30:05 +0000 |
commit | 192965e6558d6a2b78305f2fb6c0e6911abbd323 (patch) | |
tree | 71a910b2def1032d77e66ff2426cc12e86377446 /libdrm/xf86drm.h | |
parent | 35425a91ac615486bc26278674f5677156ed9a0a (diff) |
Resync from Xorg CVS: Fixes for mixed 32/64 client and server (Egbert Eich)
Diffstat (limited to 'libdrm/xf86drm.h')
-rw-r--r-- | libdrm/xf86drm.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libdrm/xf86drm.h b/libdrm/xf86drm.h index 30496d0d..4be417a6 100644 --- a/libdrm/xf86drm.h +++ b/libdrm/xf86drm.h @@ -577,11 +577,11 @@ extern int drmAgpRelease(int fd); extern int drmAgpEnable(int fd, unsigned long mode); extern int drmAgpAlloc(int fd, unsigned long size, unsigned long type, unsigned long *address, - unsigned long *handle); -extern int drmAgpFree(int fd, unsigned long handle); -extern int drmAgpBind(int fd, unsigned long handle, + drm_handle_t *handle); +extern int drmAgpFree(int fd, drm_handle_t handle); +extern int drmAgpBind(int fd, drm_handle_t handle, unsigned long offset); -extern int drmAgpUnbind(int fd, unsigned long handle); +extern int drmAgpUnbind(int fd, drm_handle_t handle); /* AGP/GART info: authenticated client and/or X */ extern int drmAgpVersionMajor(int fd); @@ -596,8 +596,8 @@ extern unsigned int drmAgpDeviceId(int fd); /* PCI scatter/gather support: X server (root) only */ extern int drmScatterGatherAlloc(int fd, unsigned long size, - unsigned long *handle); -extern int drmScatterGatherFree(int fd, unsigned long handle); + drm_handle_t *handle); +extern int drmScatterGatherFree(int fd, drm_handle_t handle); extern int drmWaitVBlank(int fd, drmVBlankPtr vbl); |