aboutsummaryrefslogtreecommitdiffstats
path: root/include/drm
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2013-04-26 10:40:28 -0400
committerDave Airlie <airlied@redhat.com>2013-04-29 20:03:07 -0400
commitc55b6b3da25aa3af36ec51a13a4ed15fef0d7a73 (patch)
tree240e093507676748e5cd1b52433d7e10523b5636 /include/drm
parentea9cbb063ce7509d98febdc756e77d6b69a10b56 (diff)
drm: Kill user_modes list and the associated ioctls
There is no way to use modes added to the user_modes list. We never look at the contents of said list in the kernel, and the only operations userspace can do are attach and detach. So the only "benefit" of this interface is wasting kernel memory. Fortunately it seems no real user space application ever used these ioctls. So just kill them. Also remove the prototypes for the non-existing drm_mode_addmode_ioctl() and drm_mode_rmmode_ioctl() functions. v2: Use drm_noop instead of completely removing the ioctls Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/drm_crtc.h15
1 files changed, 0 insertions, 15 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index cf474498cee0..adb3f9b625f6 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -554,7 +554,6 @@ enum drm_connector_force {
554 * @probed_modes: list of modes derived directly from the display 554 * @probed_modes: list of modes derived directly from the display
555 * @display_info: information about attached display (e.g. from EDID) 555 * @display_info: information about attached display (e.g. from EDID)
556 * @funcs: connector control functions 556 * @funcs: connector control functions
557 * @user_modes: user added mode list
558 * @edid_blob_ptr: DRM property containing EDID if present 557 * @edid_blob_ptr: DRM property containing EDID if present
559 * @properties: property tracking for this connector 558 * @properties: property tracking for this connector
560 * @polled: a %DRM_CONNECTOR_POLL_<foo> value for core driven polling 559 * @polled: a %DRM_CONNECTOR_POLL_<foo> value for core driven polling
@@ -598,7 +597,6 @@ struct drm_connector {
598 struct drm_display_info display_info; 597 struct drm_display_info display_info;
599 const struct drm_connector_funcs *funcs; 598 const struct drm_connector_funcs *funcs;
600 599
601 struct list_head user_modes;
602 struct drm_property_blob *edid_blob_ptr; 600 struct drm_property_blob *edid_blob_ptr;
603 struct drm_object_properties properties; 601 struct drm_object_properties properties;
604 602
@@ -927,11 +925,6 @@ extern int drm_mode_width(const struct drm_display_mode *mode);
927extern int drm_mode_height(const struct drm_display_mode *mode); 925extern int drm_mode_height(const struct drm_display_mode *mode);
928 926
929/* for us by fb module */ 927/* for us by fb module */
930extern int drm_mode_attachmode_crtc(struct drm_device *dev,
931 struct drm_crtc *crtc,
932 const struct drm_display_mode *mode);
933extern int drm_mode_detachmode_crtc(struct drm_device *dev, struct drm_display_mode *mode);
934
935extern struct drm_display_mode *drm_mode_create(struct drm_device *dev); 928extern struct drm_display_mode *drm_mode_create(struct drm_device *dev);
936extern void drm_mode_destroy(struct drm_device *dev, struct drm_display_mode *mode); 929extern void drm_mode_destroy(struct drm_device *dev, struct drm_display_mode *mode);
937extern void drm_mode_list_concat(struct list_head *head, 930extern void drm_mode_list_concat(struct list_head *head,
@@ -1040,14 +1033,6 @@ extern int drm_mode_getfb(struct drm_device *dev,
1040 void *data, struct drm_file *file_priv); 1033 void *data, struct drm_file *file_priv);
1041extern int drm_mode_dirtyfb_ioctl(struct drm_device *dev, 1034extern int drm_mode_dirtyfb_ioctl(struct drm_device *dev,
1042 void *data, struct drm_file *file_priv); 1035 void *data, struct drm_file *file_priv);
1043extern int drm_mode_addmode_ioctl(struct drm_device *dev,
1044 void *data, struct drm_file *file_priv);
1045extern int drm_mode_rmmode_ioctl(struct drm_device *dev,
1046 void *data, struct drm_file *file_priv);
1047extern int drm_mode_attachmode_ioctl(struct drm_device *dev,
1048 void *data, struct drm_file *file_priv);
1049extern int drm_mode_detachmode_ioctl(struct drm_device *dev,
1050 void *data, struct drm_file *file_priv);
1051 1036
1052extern int drm_mode_getproperty_ioctl(struct drm_device *dev, 1037extern int drm_mode_getproperty_ioctl(struct drm_device *dev,
1053 void *data, struct drm_file *file_priv); 1038 void *data, struct drm_file *file_priv);