diff options
| author | David Dawes <dawes@xfree86.org> | 2002-02-14 02:00:26 +0000 |
|---|---|---|
| committer | David Dawes <dawes@xfree86.org> | 2002-02-14 02:00:26 +0000 |
| commit | ab87c5d0d1b5c35006ce8b99a9260e3116c732dc (patch) | |
| tree | 24d25b8fa4987897180d249b671ac2ab9e8edab1 /linux/drm.h | |
| parent | 65d25572deec33b7da13c211bf0aa78c361f535a (diff) | |
First pass of mesa-4-0 branch merge into trunk.
Diffstat (limited to 'linux/drm.h')
| -rw-r--r-- | linux/drm.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/linux/drm.h b/linux/drm.h index 0db586fc..79dd5814 100644 --- a/linux/drm.h +++ b/linux/drm.h @@ -106,6 +106,7 @@ typedef struct drm_tex_region { #include "radeon_drm.h" #include "sis_drm.h" #include "i830_drm.h" +#include "gamma_drm.h" typedef struct drm_version { int version_major; /* Major version */ @@ -471,6 +472,7 @@ typedef struct drm_scatter_gather { #define DRM_IOCTL_R128_STIPPLE DRM_IOW( 0x4d, drm_r128_stipple_t) #define DRM_IOCTL_R128_INDIRECT DRM_IOWR(0x4f, drm_r128_indirect_t) #define DRM_IOCTL_R128_FULLSCREEN DRM_IOW( 0x50, drm_r128_fullscreen_t) +#define DRM_IOCTL_R128_CLEAR2 DRM_IOW( 0x51, drm_r128_clear2_t) /* Radeon specific ioctls */ #define DRM_IOCTL_RADEON_CP_INIT DRM_IOW( 0x40, drm_radeon_init_t) @@ -487,6 +489,11 @@ typedef struct drm_scatter_gather { #define DRM_IOCTL_RADEON_STIPPLE DRM_IOW( 0x4c, drm_radeon_stipple_t) #define DRM_IOCTL_RADEON_INDIRECT DRM_IOWR(0x4d, drm_radeon_indirect_t) #define DRM_IOCTL_RADEON_TEXTURE DRM_IOWR(0x4e, drm_radeon_texture_t) +#define DRM_IOCTL_RADEON_VERTEX2 DRM_IOW( 0x4f, drm_radeon_vertex_t) + +/* Gamma specific ioctls */ +#define DRM_IOCTL_GAMMA_INIT DRM_IOW( 0x40, drm_gamma_init_t) +#define DRM_IOCTL_GAMMA_COPY DRM_IOW( 0x41, drm_gamma_copy_t) /* SiS specific ioctls */ #define SIS_IOCTL_FB_ALLOC DRM_IOWR(0x44, drm_sis_mem_t) |