diff options
| author | Dave Airlie <airlied@linux.ie> | 2005-07-16 03:11:53 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-07-16 03:11:53 +0000 |
| commit | d3d3184fe4b2fa72ed55813bd7eac72659f2375e (patch) | |
| tree | 440552ee7a5cbd7b72b07f41fa5a0d036e349d6a | |
| parent | 9803eb179c8edd8d62b038f550c63a4aa589615e (diff) | |
revert last change due to me bring up too early
| -rw-r--r-- | shared-core/r128_drm.h | 6 | ||||
| -rw-r--r-- | shared-core/r128_drv.h | 3 | ||||
| -rw-r--r-- | shared-core/r128_state.c | 1 |
3 files changed, 3 insertions, 7 deletions
diff --git a/shared-core/r128_drm.h b/shared-core/r128_drm.h index 4bdb51ad..607836ab 100644 --- a/shared-core/r128_drm.h +++ b/shared-core/r128_drm.h @@ -192,9 +192,8 @@ typedef struct drm_r128_sarea { #define DRM_R128_INDIRECT 0x0f #define DRM_R128_FULLSCREEN 0x10 #define DRM_R128_CLEAR2 0x11 -#define DRM_R128_GETPARAM_OLD 0x12 -#define DRM_R128_FLIP 0x13 #define DRM_R128_GETPARAM 0x12 +#define DRM_R128_FLIP 0x13 #define DRM_IOCTL_R128_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_R128_INIT, drm_r128_init_t) #define DRM_IOCTL_R128_CCE_START DRM_IO( DRM_COMMAND_BASE + DRM_R128_CCE_START) @@ -214,9 +213,8 @@ typedef struct drm_r128_sarea { #define DRM_IOCTL_R128_INDIRECT DRM_IOWR(DRM_COMMAND_BASE + DRM_R128_INDIRECT, drm_r128_indirect_t) #define DRM_IOCTL_R128_FULLSCREEN DRM_IOW( DRM_COMMAND_BASE + DRM_R128_FULLSCREEN, drm_r128_fullscreen_t) #define DRM_IOCTL_R128_CLEAR2 DRM_IOW( DRM_COMMAND_BASE + DRM_R128_CLEAR2, drm_r128_clear2_t) -#define DRM_IOCTL_R128_GETPARAM_OLD DRM_IOW( DRM_COMMAND_BASE + DRM_R128_GETPARAM_OLD, drm_r128_getparam_t) +#define DRM_IOCTL_R128_GETPARAM DRM_IOW( DRM_COMMAND_BASE + DRM_R128_GETPARAM, drm_r128_getparam_t) #define DRM_IOCTL_R128_FLIP DRM_IO( DRM_COMMAND_BASE + DRM_R128_FLIP) -#define DRM_IOCTL_R128_GETPARAM DRM_IOWR( DRM_COMMAND_BASE + DRM_R128_GETPARAM, drm_r128_getparam_t) typedef struct drm_r128_init { enum { diff --git a/shared-core/r128_drv.h b/shared-core/r128_drv.h index 97072792..ae740548 100644 --- a/shared-core/r128_drv.h +++ b/shared-core/r128_drv.h @@ -47,11 +47,10 @@ * ?? - ?? * 2.4 - Add support for ycbcr textures (no new ioctls) * 2.5 - Add FLIP ioctl, disable FULLSCREEN. - * 2.5.1 - fix GETPARAM ioctl direction bits */ #define DRIVER_MAJOR 2 #define DRIVER_MINOR 5 -#define DRIVER_PATCHLEVEL 1 +#define DRIVER_PATCHLEVEL 0 #define GET_RING_HEAD(dev_priv) R128_READ( R128_PM4_BUFFER_DL_RPTR ) diff --git a/shared-core/r128_state.c b/shared-core/r128_state.c index e2e11723..44466af0 100644 --- a/shared-core/r128_state.c +++ b/shared-core/r128_state.c @@ -1702,7 +1702,6 @@ drm_ioctl_desc_t r128_ioctls[] = { [DRM_IOCTL_NR(DRM_R128_DEPTH)] = {r128_cce_depth, 1, 0}, [DRM_IOCTL_NR(DRM_R128_STIPPLE)] = {r128_cce_stipple, 1, 0}, [DRM_IOCTL_NR(DRM_R128_INDIRECT)] = {r128_cce_indirect, 1, 1}, - [DRM_IOCTL_NR(DRM_R128_GETPARAM_OLD)] = {r128_getparam, 1, 0}, [DRM_IOCTL_NR(DRM_R128_GETPARAM)] = {r128_getparam, 1, 0}, }; |