diff options
| author | Kevin E Martin <kem@kem.org> | 2001-03-07 19:14:39 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2001-03-07 19:14:39 +0000 |
| commit | 7e820fc7d89d06a11f448d7093469a0c765a84a6 (patch) | |
| tree | 0b0e71d032fedccb0ac40ddf7303cda2de53451a /linux/drm.h | |
| parent | 78b07aa0d7a25ffbc1a2c07737fcb7597c4e6694 (diff) | |
- Prepare for merge with trunksarea-1-0-0-20010307-freeze
- Change variable names to be more consistent
- Fix bug in per-context creation routine
- Fix root-only permissions for get/setsareactx IOCTLs
- Back out incomplete gamma changes
- Fix some compilation warning messages
- Various code cleanups
- Disable per-context SAREA example code for Radeon This can be re-enabled
when it is actually used by the driver. Look for '#ifdef
PER_CONTEXT_SAREA' in the client-side and ddx Radeon driver.
Diffstat (limited to 'linux/drm.h')
| -rw-r--r-- | linux/drm.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/linux/drm.h b/linux/drm.h index 6d366e7a..7c65f5fc 100644 --- a/linux/drm.h +++ b/linux/drm.h @@ -88,7 +88,6 @@ typedef struct drm_tex_region { #include "i810_drm.h" #include "r128_drm.h" #include "radeon_drm.h" -#include "gamma_drm.h" #ifdef CONFIG_DRM_SIS #include "sis_drm.h" #endif @@ -377,8 +376,8 @@ typedef struct drm_agp_info { #define DRM_IOCTL_RM_MAP DRM_IOW( 0x1b, drm_map_t) -#define DRM_IOCTL_CTX_SAREA DRM_IOW( 0x1c, drm_ctx_priv_map_t) -#define DRM_IOCTL_GET_CTX_SAREA DRM_IOWR(0x1d, drm_ctx_priv_map_t) +#define DRM_IOCTL_SET_SAREA_CTX DRM_IOW( 0x1c, drm_ctx_priv_map_t) +#define DRM_IOCTL_GET_SAREA_CTX DRM_IOWR(0x1d, drm_ctx_priv_map_t) #define DRM_IOCTL_ADD_CTX DRM_IOWR(0x20, drm_ctx_t) #define DRM_IOCTL_RM_CTX DRM_IOWR(0x21, drm_ctx_t) @@ -403,9 +402,6 @@ typedef struct drm_agp_info { #define DRM_IOCTL_AGP_BIND DRM_IOW( 0x36, drm_agp_binding_t) #define DRM_IOCTL_AGP_UNBIND DRM_IOW( 0x37, drm_agp_binding_t) -/* Gamma specific ioctls */ -#define DRM_IOCTL_GAMMA_INIT DRM_IOW( 0x40, drm_gamma_init_t) - /* MGA specific ioctls */ #define DRM_IOCTL_MGA_INIT DRM_IOW( 0x40, drm_mga_init_t) #define DRM_IOCTL_MGA_FLUSH DRM_IOW( 0x41, drm_lock_t) |