summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2005-07-16 02:03:03 +0000
committerDave Airlie <airlied@linux.ie>2005-07-16 02:03:03 +0000
commitd6d67dbf92d64a4c662dcad52d720883da9d5e19 (patch)
tree65807b4d77b3b22a28db8d56760d8a99e169097b
parent567113788c030b367a28ea9253fbf34beef2789e (diff)
Egbert noticed this issue, but changing the IOW to IOWR mess up
compatiblity with userspace..
-rw-r--r--shared-core/r128_drm.h6
-rw-r--r--shared-core/r128_state.c1
2 files changed, 5 insertions, 2 deletions
diff --git a/shared-core/r128_drm.h b/shared-core/r128_drm.h
index 607836ab..4bdb51ad 100644
--- a/shared-core/r128_drm.h
+++ b/shared-core/r128_drm.h
@@ -192,8 +192,9 @@ typedef struct drm_r128_sarea {
#define DRM_R128_INDIRECT 0x0f
#define DRM_R128_FULLSCREEN 0x10
#define DRM_R128_CLEAR2 0x11
-#define DRM_R128_GETPARAM 0x12
+#define DRM_R128_GETPARAM_OLD 0x12
#define DRM_R128_FLIP 0x13
+#define DRM_R128_GETPARAM 0x12
#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)
@@ -213,8 +214,9 @@ 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 DRM_IOW( DRM_COMMAND_BASE + DRM_R128_GETPARAM, drm_r128_getparam_t)
+#define DRM_IOCTL_R128_GETPARAM_OLD DRM_IOW( DRM_COMMAND_BASE + DRM_R128_GETPARAM_OLD, 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_state.c b/shared-core/r128_state.c
index 44466af0..e2e11723 100644
--- a/shared-core/r128_state.c
+++ b/shared-core/r128_state.c
@@ -1702,6 +1702,7 @@ 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},
};