Import of XFree86 4.0.1fX_4_0_1f

1 files changed, 15 insertions, 3 deletions

diff --git a/linux/sis_drm.h b/linux/sis_drm.h
index f08e9ecce..73807f317 100644
--- a/linux/sis_drm.h
+++ b/linux/sis_drm.h
@@ -1,11 +1,12 @@
-#ifndef _sis_drm_h_
-#define _sis_drm_h_
+
+#ifndef _sis_drm_public_h_
+#define _sis_drm_public_h_
 
 typedef struct { 
   int context;
   unsigned int offset;
   unsigned int size;
-  unsigned long free;
+  unsigned int free;
 } drm_sis_mem_t; 
 
 typedef struct { 
@@ -16,4 +17,15 @@ typedef struct {
   unsigned int left, right;
 } drm_sis_flip_t; 
 
+#define SIS_IOCTL_FB_ALLOC     DRM_IOWR( 0x44, drm_sis_mem_t)
+#define SIS_IOCTL_FB_FREE      DRM_IOW( 0x45, drm_sis_mem_t)
+
+#define SIS_IOCTL_AGP_INIT     DRM_IOWR( 0x53, drm_sis_agp_t)
+#define SIS_IOCTL_AGP_ALLOC    DRM_IOWR( 0x54, drm_sis_mem_t)
+#define SIS_IOCTL_AGP_FREE     DRM_IOW( 0x55, drm_sis_mem_t)
+
+#define SIS_IOCTL_FLIP         DRM_IOW( 0x48, drm_sis_flip_t)
+#define SIS_IOCTL_FLIP_INIT    DRM_IO( 0x49)
+#define SIS_IOCTL_FLIP_FINAL   DRM_IO( 0x50)
+
 #endif