4 files changed, 4 insertions, 209 deletions

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 287cd82f9d75..3a8f7e6db295 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -703,7 +703,6 @@ int drm_connector_init(struct drm_device *dev,
         connector->connector_type = connector_type;
         connector->connector_type_id =
                 ++drm_connector_enum_list[connector_type].count; /* TODO */
-        INIT_LIST_HEAD(&connector->user_modes);
         INIT_LIST_HEAD(&connector->probed_modes);
         INIT_LIST_HEAD(&connector->modes);
         connector->edid_blob_ptr = NULL;
@@ -744,9 +743,6 @@ void drm_connector_cleanup(struct drm_connector *connector)
         list_for_each_entry_safe(mode, t, &connector->modes, head)
                 drm_mode_remove(connector, mode);
 
-        list_for_each_entry_safe(mode, t, &connector->user_modes, head)
-                drm_mode_remove(connector, mode);
-
         drm_mode_object_put(dev, &connector->base);
         list_del(&connector->head);
         dev->mode_config.num_connector--;
@@ -2613,192 +2609,6 @@ void drm_fb_release(struct drm_file *priv)
         mutex_unlock(&priv->fbs_lock);
 }
 
-/**
- * drm_mode_attachmode - add a mode to the user mode list
- * @dev: DRM device
- * @connector: connector to add the mode to
- * @mode: mode to add
- *
- * Add @mode to @connector's user mode list.
- */
-static void drm_mode_attachmode(struct drm_device *dev,
-                                struct drm_connector *connector,
-                                struct drm_display_mode *mode)
-{
-        list_add_tail(&mode->head, &connector->user_modes);
-}
-
-int drm_mode_attachmode_crtc(struct drm_device *dev, struct drm_crtc *crtc,
-                             const struct drm_display_mode *mode)
-{
-        struct drm_connector *connector;
-        int ret = 0;
-        struct drm_display_mode *dup_mode, *next;
-        LIST_HEAD(list);
-
-        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
-                if (!connector->encoder)
-                        continue;
-                if (connector->encoder->crtc == crtc) {
-                        dup_mode = drm_mode_duplicate(dev, mode);
-                        if (!dup_mode) {
-                                ret = -ENOMEM;
-                                goto out;
-                        }
-                        list_add_tail(&dup_mode->head, &list);
-                }
-        }
-
-        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
-                if (!connector->encoder)
-                        continue;
-                if (connector->encoder->crtc == crtc)
-                        list_move_tail(list.next, &connector->user_modes);
-        }
-
-        WARN_ON(!list_empty(&list));
-
- out:
-        list_for_each_entry_safe(dup_mode, next, &list, head)
-                drm_mode_destroy(dev, dup_mode);
-
-        return ret;
-}
-EXPORT_SYMBOL(drm_mode_attachmode_crtc);
-
-static int drm_mode_detachmode(struct drm_device *dev,
-                               struct drm_connector *connector,
-                               struct drm_display_mode *mode)
-{
-        int found = 0;
-        int ret = 0;
-        struct drm_display_mode *match_mode, *t;
-
-        list_for_each_entry_safe(match_mode, t, &connector->user_modes, head) {
-                if (drm_mode_equal(match_mode, mode)) {
-                        list_del(&match_mode->head);
-                        drm_mode_destroy(dev, match_mode);
-                        found = 1;
-                        break;
-                }
-        }
-
-        if (!found)
-                ret = -EINVAL;
-
-        return ret;
-}
-
-int drm_mode_detachmode_crtc(struct drm_device *dev, struct drm_display_mode *mode)
-{
-        struct drm_connector *connector;
-
-        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
-                drm_mode_detachmode(dev, connector, mode);
-        }
-        return 0;
-}
-EXPORT_SYMBOL(drm_mode_detachmode_crtc);
-
-/**
- * drm_fb_attachmode - Attach a user mode to an connector
- * @dev: drm device for the ioctl
- * @data: data pointer for the ioctl
- * @file_priv: drm file for the ioctl call
- *
- * This attaches a user specified mode to an connector.
- * Called by the user via ioctl.
- *
- * RETURNS:
- * Zero on success, errno on failure.
- */
-int drm_mode_attachmode_ioctl(struct drm_device *dev,
-                              void *data, struct drm_file *file_priv)
-{
-        struct drm_mode_mode_cmd *mode_cmd = data;
-        struct drm_connector *connector;
-        struct drm_display_mode *mode;
-        struct drm_mode_object *obj;
-        struct drm_mode_modeinfo *umode = &mode_cmd->mode;
-        int ret;
-
-        if (!drm_core_check_feature(dev, DRIVER_MODESET))
-                return -EINVAL;
-
-        drm_modeset_lock_all(dev);
-
-        obj = drm_mode_object_find(dev, mode_cmd->connector_id, DRM_MODE_OBJECT_CONNECTOR);
-        if (!obj) {
-                ret = -EINVAL;
-                goto out;
-        }
-        connector = obj_to_connector(obj);
-
-        mode = drm_mode_create(dev);
-        if (!mode) {
-                ret = -ENOMEM;
-                goto out;
-        }
-
-        ret = drm_crtc_convert_umode(mode, umode);
-        if (ret) {
-                DRM_DEBUG_KMS("Invalid mode\n");
-                drm_mode_destroy(dev, mode);
-                goto out;
-        }
-
-        drm_mode_attachmode(dev, connector, mode);
-out:
-        drm_modeset_unlock_all(dev);
-        return ret;
-}
-
-
-/**
- * drm_fb_detachmode - Detach a user specified mode from an connector
- * @dev: drm device for the ioctl
- * @data: data pointer for the ioctl
- * @file_priv: drm file for the ioctl call
- *
- * Called by the user via ioctl.
- *
- * RETURNS:
- * Zero on success, errno on failure.
- */
-int drm_mode_detachmode_ioctl(struct drm_device *dev,
-                              void *data, struct drm_file *file_priv)
-{
-        struct drm_mode_object *obj;
-        struct drm_mode_mode_cmd *mode_cmd = data;
-        struct drm_connector *connector;
-        struct drm_display_mode mode;
-        struct drm_mode_modeinfo *umode = &mode_cmd->mode;
-        int ret;
-
-        if (!drm_core_check_feature(dev, DRIVER_MODESET))
-                return -EINVAL;
-
-        drm_modeset_lock_all(dev);
-
-        obj = drm_mode_object_find(dev, mode_cmd->connector_id, DRM_MODE_OBJECT_CONNECTOR);
-        if (!obj) {
-                ret = -EINVAL;
-                goto out;
-        }
-        connector = obj_to_connector(obj);
-
-        ret = drm_crtc_convert_umode(&mode, umode);
-        if (ret) {
-                DRM_DEBUG_KMS("Invalid mode\n");
-                goto out;
-        }
-
-        ret = drm_mode_detachmode(dev, connector, &mode);
-out:
-        drm_modeset_unlock_all(dev);
-        return ret;
-}
-
 struct drm_property *drm_property_create(struct drm_device *dev, int flags,
                                          const char *name, int num_values)
 {
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 80c68957e7cf..8d4f29075af5 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -150,8 +150,8 @@ static const struct drm_ioctl_desc drm_ioctls[] = {
         DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETGAMMA, drm_mode_gamma_set_ioctl, DRM_MASTER|DRM_UNLOCKED),
         DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETENCODER, drm_mode_getencoder, DRM_CONTROL_ALLOW|DRM_UNLOCKED),
         DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETCONNECTOR, drm_mode_getconnector, DRM_CONTROL_ALLOW|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_IOCTL_MODE_ATTACHMODE, drm_mode_attachmode_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_IOCTL_MODE_DETACHMODE, drm_mode_detachmode_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
+        DRM_IOCTL_DEF(DRM_IOCTL_MODE_ATTACHMODE, drm_noop, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
+        DRM_IOCTL_DEF(DRM_IOCTL_MODE_DETACHMODE, drm_noop, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
         DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPROPERTY, drm_mode_getproperty_ioctl, DRM_CONTROL_ALLOW|DRM_UNLOCKED),
         DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETPROPERTY, drm_mode_connector_property_set_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
         DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPROPBLOB, drm_mode_getblob_ioctl, DRM_CONTROL_ALLOW|DRM_UNLOCKED),
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 {
  * @probed_modes: list of modes derived directly from the display
  * @display_info: information about attached display (e.g. from EDID)
  * @funcs: connector control functions
- * @user_modes: user added mode list
  * @edid_blob_ptr: DRM property containing EDID if present
  * @properties: property tracking for this connector
  * @polled: a %DRM_CONNECTOR_POLL_<foo> value for core driven polling
@@ -598,7 +597,6 @@ struct drm_connector {
         struct drm_display_info display_info;
         const struct drm_connector_funcs *funcs;
 
-        struct list_head user_modes;
         struct drm_property_blob *edid_blob_ptr;
         struct drm_object_properties properties;
 
@@ -927,11 +925,6 @@ extern int drm_mode_width(const struct drm_display_mode *mode);
 extern int drm_mode_height(const struct drm_display_mode *mode);
 
 /* for us by fb module */
-extern int drm_mode_attachmode_crtc(struct drm_device *dev,
-                                    struct drm_crtc *crtc,
-                                    const struct drm_display_mode *mode);
-extern int drm_mode_detachmode_crtc(struct drm_device *dev, struct drm_display_mode *mode);
-
 extern struct drm_display_mode *drm_mode_create(struct drm_device *dev);
 extern void drm_mode_destroy(struct drm_device *dev, struct drm_display_mode *mode);
 extern void drm_mode_list_concat(struct list_head *head,
@@ -1040,14 +1033,6 @@ extern int drm_mode_getfb(struct drm_device *dev,
                           void *data, struct drm_file *file_priv);
 extern int drm_mode_dirtyfb_ioctl(struct drm_device *dev,
                                   void *data, struct drm_file *file_priv);
-extern int drm_mode_addmode_ioctl(struct drm_device *dev,
-                                  void *data, struct drm_file *file_priv);
-extern int drm_mode_rmmode_ioctl(struct drm_device *dev,
-                                 void *data, struct drm_file *file_priv);
-extern int drm_mode_attachmode_ioctl(struct drm_device *dev,
-                                     void *data, struct drm_file *file_priv);
-extern int drm_mode_detachmode_ioctl(struct drm_device *dev,
-                                     void *data, struct drm_file *file_priv);
 
 extern int drm_mode_getproperty_ioctl(struct drm_device *dev,
                                       void *data, struct drm_file *file_priv);
diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h
index 73a99e4664be..5a57be68bab7 100644
--- a/include/uapi/drm/drm.h
+++ b/include/uapi/drm/drm.h
@@ -711,8 +711,8 @@ struct drm_prime_handle {
 #define DRM_IOCTL_MODE_SETGAMMA         DRM_IOWR(0xA5, struct drm_mode_crtc_lut)
 #define DRM_IOCTL_MODE_GETENCODER       DRM_IOWR(0xA6, struct drm_mode_get_encoder)
 #define DRM_IOCTL_MODE_GETCONNECTOR     DRM_IOWR(0xA7, struct drm_mode_get_connector)
-#define DRM_IOCTL_MODE_ATTACHMODE       DRM_IOWR(0xA8, struct drm_mode_mode_cmd)
-#define DRM_IOCTL_MODE_DETACHMODE       DRM_IOWR(0xA9, struct drm_mode_mode_cmd)
+#define DRM_IOCTL_MODE_ATTACHMODE       DRM_IOWR(0xA8, struct drm_mode_mode_cmd) /* deprecated (never worked) */
+#define DRM_IOCTL_MODE_DETACHMODE       DRM_IOWR(0xA9, struct drm_mode_mode_cmd) /* deprecated (never worked) */
 
 #define DRM_IOCTL_MODE_GETPROPERTY      DRM_IOWR(0xAA, struct drm_mode_get_property)
 #define DRM_IOCTL_MODE_SETPROPERTY      DRM_IOWR(0xAB, struct drm_mode_connector_set_property)