diff options
| author | David Dawes <dawes@xfree86.org> | 2000-11-08 00:07:17 +0000 |
|---|---|---|
| committer | David Dawes <dawes@xfree86.org> | 2000-11-08 00:07:17 +0000 |
| commit | 94071289a4c61a1083a3d6b3546b06cafeaeac44 (patch) | |
| tree | ac34ab78e6e4b842fa14d61d944f26ab1376aa2d /linux/drm.h | |
| parent | 5745cb7fa70cf312d371aac44de3beae2a8d6e47 (diff) | |
merge with 4.0.1dX_4_0_1e-20001107-mergeX_4_0_1d-20001107-merge
Diffstat (limited to 'linux/drm.h')
| -rw-r--r-- | linux/drm.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/linux/drm.h b/linux/drm.h index b182f2c9..57032d6e 100644 --- a/linux/drm.h +++ b/linux/drm.h @@ -82,6 +82,7 @@ typedef struct drm_clip_rect { #include "mga_drm.h" #include "i810_drm.h" #include "r128_drm.h" +#include "sis_drm.h" typedef struct drm_version { int version_major; /* Major version */ @@ -369,4 +370,14 @@ typedef struct drm_agp_info { #define DRM_IOCTL_R128_PACKET DRM_IOW( 0x44, drm_r128_packet_t) #define DRM_IOCTL_R128_VERTEX DRM_IOW( 0x45, drm_r128_vertex_t) +/* SiS specific ioctls */ +#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 |