diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-08-23 16:53:31 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-08-29 19:39:11 -0400 |
commit | 8f879194f88742d9c452f669482b6d6abdc1e1e7 (patch) | |
tree | d50a7d96a2150c2c7df7b116f4eb478a2c28f6cc /include/drm/drmP.h | |
parent | 4ac5ec40ec70022e4dea8cc6254d2dadd1e43d57 (diff) |
drm: replace drawable ioctl by noops
The information supplied by userspace through these ioctls is only
accessible by dev->drw_idr. But there's no in-tree user of that.
Also userspace does not really care about return values of these ioctls,
either. Only hw/xfree86/dri/dri.c from the xserver actually checks the
return from adddraw and keeps on trying to create a kernel drawable
every time somebody creates a dri drawable. But since that's now a noop,
who cares.
Therefore it's safe to replace these three ioctls with noops and rip
out the implementation.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm/drmP.h')
-rw-r--r-- | include/drm/drmP.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 45d09639e9d2..989cefe33c7b 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
@@ -1037,12 +1037,6 @@ struct drm_device { | |||
1037 | struct drm_minor *control; /**< Control node for card */ | 1037 | struct drm_minor *control; /**< Control node for card */ |
1038 | struct drm_minor *primary; /**< render type primary screen head */ | 1038 | struct drm_minor *primary; /**< render type primary screen head */ |
1039 | 1039 | ||
1040 | /** \name Drawable information */ | ||
1041 | /*@{ */ | ||
1042 | spinlock_t drw_lock; | ||
1043 | struct idr drw_idr; | ||
1044 | /*@} */ | ||
1045 | |||
1046 | struct drm_mode_config mode_config; /**< Current mode config */ | 1040 | struct drm_mode_config mode_config; /**< Current mode config */ |
1047 | 1041 | ||
1048 | /** \name GEM information */ | 1042 | /** \name GEM information */ |
@@ -1229,15 +1223,6 @@ extern int drm_setsareactx(struct drm_device *dev, void *data, | |||
1229 | extern int drm_getsareactx(struct drm_device *dev, void *data, | 1223 | extern int drm_getsareactx(struct drm_device *dev, void *data, |
1230 | struct drm_file *file_priv); | 1224 | struct drm_file *file_priv); |
1231 | 1225 | ||
1232 | /* Drawable IOCTL support (drm_drawable.h) */ | ||
1233 | extern int drm_adddraw(struct drm_device *dev, void *data, | ||
1234 | struct drm_file *file_priv); | ||
1235 | extern int drm_rmdraw(struct drm_device *dev, void *data, | ||
1236 | struct drm_file *file_priv); | ||
1237 | extern int drm_update_drawable_info(struct drm_device *dev, void *data, | ||
1238 | struct drm_file *file_priv); | ||
1239 | extern void drm_drawable_free_all(struct drm_device *dev); | ||
1240 | |||
1241 | /* Authentication IOCTL support (drm_auth.h) */ | 1226 | /* Authentication IOCTL support (drm_auth.h) */ |
1242 | extern int drm_getmagic(struct drm_device *dev, void *data, | 1227 | extern int drm_getmagic(struct drm_device *dev, void *data, |
1243 | struct drm_file *file_priv); | 1228 | struct drm_file *file_priv); |