diff options
| author | Kevin E Martin <kem@kem.org> | 2001-01-05 19:42:02 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2001-01-05 19:42:02 +0000 |
| commit | 0885a6be6dbe2d0e840aa32fba5ded2b038ec23a (patch) | |
| tree | 3a4471ab69109c3c22ccd1485725e8cb58c08107 /linux/drm.h | |
| parent | 71897876f193282dd49d3eb37f277377a3ec8bb2 (diff) | |
- Merge trunk into ati-5-0-0 branchati-5-0-0-20010105ati-5-0-0-branch
Diffstat (limited to 'linux/drm.h')
| -rw-r--r-- | linux/drm.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/linux/drm.h b/linux/drm.h index e8bccd86..dc3d262d 100644 --- a/linux/drm.h +++ b/linux/drm.h @@ -83,7 +83,9 @@ typedef struct drm_clip_rect { #include "i810_drm.h" #include "r128_drm.h" #include "radeon_drm.h" +#ifdef CONFIG_DRM_SIS #include "sis_drm.h" +#endif typedef struct drm_version { int version_major; /* Major version */ @@ -351,6 +353,7 @@ typedef struct drm_agp_info { #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) +#define DRM_IOCTL_MGA_BLIT DRM_IOW( 0x47, drm_mga_blit_t) /* I810 specific ioctls */ #define DRM_IOCTL_I810_INIT DRM_IOW( 0x40, drm_i810_init_t) @@ -396,6 +399,7 @@ typedef struct drm_agp_info { #define DRM_IOCTL_RADEON_STIPPLE DRM_IOW( 0x4c, drm_radeon_stipple_t) #define DRM_IOCTL_RADEON_INDIRECT DRM_IOWR(0x4d, drm_radeon_indirect_t) +#ifdef CONFIG_DRM_SIS /* 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) @@ -405,5 +409,6 @@ typedef struct drm_agp_info { #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 #endif |