diff options
| author | anholt <anholt@FreeBSD.org> | 2003-03-09 02:08:30 +0000 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2003-03-09 02:08:30 +0000 |
| commit | ccdf4ef2d9288d035e56820efb0e79db6acf5ba8 (patch) | |
| tree | ef9d3b03548e9f28bd5c265be746871660c0c16a /sys/dev/drm/mga_drm.h | |
| parent | 0b60094f80a8137660b368df0b80fb0179b92d04 (diff) | |
| download | FreeBSD-src-ccdf4ef2d9288d035e56820efb0e79db6acf5ba8.zip FreeBSD-src-ccdf4ef2d9288d035e56820efb0e79db6acf5ba8.tar.gz | |
Update the DRM to latest from DRI CVS. This is approximately the version
included in XFree86 4.3, but includes some fixes. Notable changes include
Radeon 8500-9100 support, PCI Radeon/Rage 128 support, transform & lighting
support for Radeons, and vblank syncing support for r128, radeon, and mga.
The gamma driver was removed due to lack of any users.
Diffstat (limited to 'sys/dev/drm/mga_drm.h')
| -rw-r--r-- | sys/dev/drm/mga_drm.h | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/sys/dev/drm/mga_drm.h b/sys/dev/drm/mga_drm.h index 50dc398..d511dac 100644 --- a/sys/dev/drm/mga_drm.h +++ b/sys/dev/drm/mga_drm.h @@ -26,7 +26,7 @@ * * Authors: * Jeff Hartmann <jhartmann@valinux.com> - * Keith Whitwell <keithw@valinux.com> + * Keith Whitwell <keith@tungstengraphics.com> * * Rewritten by: * Gareth Hughes <gareth@valinux.com> @@ -40,6 +40,7 @@ /* WARNING: If you change any of these defines, make sure to change the * defines in the Xserver file (mga_sarea.h) */ + #ifndef __MGA_SAREA_DEFINES__ #define __MGA_SAREA_DEFINES__ @@ -223,7 +224,14 @@ typedef struct _drm_mga_sarea { int ctxOwner; } drm_mga_sarea_t; -/* MGA specific ioctls */ + +/* WARNING: If you change any of these defines, make sure to change the + * defines in the Xserver file (xf86drmMga.h) + */ + +/* MGA specific ioctls + * The device specific ioctl range is 0x40 to 0x79. + */ #define DRM_IOCTL_MGA_INIT DRM_IOW( 0x40, drm_mga_init_t) #define DRM_IOCTL_MGA_FLUSH DRM_IOW( 0x41, drm_lock_t) #define DRM_IOCTL_MGA_RESET DRM_IO( 0x42) @@ -233,11 +241,8 @@ typedef struct _drm_mga_sarea { #define DRM_IOCTL_MGA_INDICES DRM_IOW( 0x46, drm_mga_indices_t) #define DRM_IOCTL_MGA_ILOAD DRM_IOW( 0x47, drm_mga_iload_t) #define DRM_IOCTL_MGA_BLIT DRM_IOW( 0x48, drm_mga_blit_t) +#define DRM_IOCTL_MGA_GETPARAM DRM_IOWR(0x49, drm_mga_getparam_t) - -/* WARNING: If you change any of these defines, make sure to change the - * defines in the Xserver file (xf86drmMga.h) - */ typedef struct _drm_mga_warp_index { int installed; unsigned long phys_addr; @@ -320,4 +325,14 @@ typedef struct _drm_mga_blit { int source_pitch, dest_pitch; } drm_mga_blit_t; +/* 3.1: An ioctl to get parameters that aren't available to the 3d + * client any other way. + */ +#define MGA_PARAM_IRQ_NR 1 + +typedef struct drm_mga_getparam { + int param; + int *value; +} drm_mga_getparam_t; + #endif |
