summaryrefslogtreecommitdiff
path: root/shared-core
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2000-05-25 21:06:02 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2000-05-25 21:06:02 +0000
commitddcb28259f70d6808caf57e8eb9f74ca95b5f069 (patch)
tree4b55802bc1c48fdc509aa18584e543c53a1be186 /shared-core
parent2bb4f7ef4252007c356c0fbb8597925d395cb6b1 (diff)
Merged mga-0-0-3-branch
- New security model for i810 - Enable i810 dri by default - New indexed vertex path for mga - Mga kernel driver rework - Removed dead files in i810 driver
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/drm.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/shared-core/drm.h b/shared-core/drm.h
index 25e4cce4..74ef83f4 100644
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -341,13 +341,16 @@ typedef struct drm_agp_info {
#define DRM_IOCTL_MGA_ILOAD DRM_IOW( 0x43, drm_mga_iload_t)
#define DRM_IOCTL_MGA_VERTEX DRM_IOW( 0x44, drm_mga_vertex_t)
#define DRM_IOCTL_MGA_FLUSH DRM_IOW( 0x45, drm_lock_t )
+#define DRM_IOCTL_MGA_INDICES DRM_IOW( 0x46, drm_mga_indices_t)
/* I810 specific ioctls */
#define DRM_IOCTL_I810_INIT DRM_IOW( 0x40, drm_i810_init_t)
#define DRM_IOCTL_I810_VERTEX DRM_IOW( 0x41, drm_i810_vertex_t)
-#define DRM_IOCTL_I810_DMA DRM_IOW( 0x42, drm_i810_general_t)
+#define DRM_IOCTL_I810_CLEAR DRM_IOW( 0x42, drm_i810_clear_t)
#define DRM_IOCTL_I810_FLUSH DRM_IO ( 0x43)
#define DRM_IOCTL_I810_GETAGE DRM_IO ( 0x44)
+#define DRM_IOCTL_I810_GETBUF DRM_IOW( 0x45, drm_i810_dma_t)
+#define DRM_IOCTL_I810_SWAP DRM_IO ( 0x46)
/* Rage 128 specific ioctls */
#define DRM_IOCTL_R128_INIT DRM_IOW( 0x40, drm_r128_init_t)