Merge tag 'topic/core-stuff-2014-06-30' of git://anongit.freedesktop.org/drm-intel into drm-next

misc core patches picked up by Daniel and Jani.

* tag 'topic/core-stuff-2014-06-30' of git://anongit.freedesktop.org/drm-intel:
  drm/fb-helper: Remove unnecessary list empty check in drm_fb_helper_debug_enter()
  drm/fb-helper: Redundant info->fix.type_aux setting in drm_fb_helper_fill_fix()
  drm/debugfs: add an "edid_override" file per connector
  drm/debugfs: add a "force" file per connector
  drm: add register and unregister functions for connectors
  drm: fix uninitialized acquire_ctx fields (v2)
  drm: Driver-specific ioctls range from 0x40 to 0x9f
  drm: Don't export internal module variables

57 files changed, 334 insertions, 98 deletions

diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl
index 7df3134ebc0e..b314a42bb18c 100644
--- a/Documentation/DocBook/drm.tmpl
+++ b/Documentation/DocBook/drm.tmpl
@@ -1610,7 +1610,7 @@ int max_width, max_height;</synopsis>
           The connector is then registered with a call to
           <function>drm_connector_init</function> with a pointer to the connector
           functions and a connector type, and exposed through sysfs with a call to
-          <function>drm_sysfs_connector_add</function>.
+          <function>drm_connector_register</function>.
         </para>
         <para>
           Supported connector types are
@@ -1768,7 +1768,7 @@ int max_width, max_height;</synopsis>
         (<function>drm_encoder_cleanup</function>) and connectors
         (<function>drm_connector_cleanup</function>). Furthermore, connectors
         that have been added to sysfs must be removed by a call to
-        <function>drm_sysfs_connector_remove</function> before calling
+        <function>drm_connector_unregister</function> before calling
         <function>drm_connector_cleanup</function>.
       </para>
       <para>
@@ -1813,7 +1813,7 @@ void intel_crt_init(struct drm_device *dev)
         drm_encoder_helper_add(&intel_output->enc, &intel_crt_helper_funcs);
         drm_connector_helper_add(connector, &intel_crt_connector_helper_funcs);
 
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
 }]]></programlisting>
       <para>
         In the example above (taken from the i915 driver), a CRTC, connector and
diff --git a/drivers/gpu/drm/armada/armada_output.c b/drivers/gpu/drm/armada/armada_output.c
index d685a5421485..abbc309fe539 100644
--- a/drivers/gpu/drm/armada/armada_output.c
+++ b/drivers/gpu/drm/armada/armada_output.c
@@ -48,7 +48,7 @@ static void armada_drm_connector_destroy(struct drm_connector *conn)
 {
         struct armada_connector *dconn = drm_to_armada_conn(conn);
 
-        drm_sysfs_connector_remove(conn);
+        drm_connector_unregister(conn);
         drm_connector_cleanup(conn);
         kfree(dconn);
 }
@@ -141,7 +141,7 @@ int armada_output_create(struct drm_device *dev,
         if (ret)
                 goto err_conn;
 
-        ret = drm_sysfs_connector_add(&dconn->conn);
+        ret = drm_connector_register(&dconn->conn);
         if (ret)
                 goto err_sysfs;
 
diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
index 114aee941d46..9896286ed262 100644
--- a/drivers/gpu/drm/ast/ast_mode.c
+++ b/drivers/gpu/drm/ast/ast_mode.c
@@ -829,7 +829,7 @@ static void ast_connector_destroy(struct drm_connector *connector)
 {
         struct ast_connector *ast_connector = to_ast_connector(connector);
         ast_i2c_destroy(ast_connector->i2c);
-        drm_sysfs_connector_remove(connector);
+        drm_connector_unregister(connector);
         drm_connector_cleanup(connector);
         kfree(connector);
 }
@@ -871,7 +871,7 @@ static int ast_connector_init(struct drm_device *dev)
         connector->interlace_allowed = 0;
         connector->doublescan_allowed = 0;
 
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
 
         connector->polled = DRM_CONNECTOR_POLL_CONNECT;
 
diff --git a/drivers/gpu/drm/bridge/ptn3460.c b/drivers/gpu/drm/bridge/ptn3460.c
index 98fd17ae4916..d466696ed5e8 100644
--- a/drivers/gpu/drm/bridge/ptn3460.c
+++ b/drivers/gpu/drm/bridge/ptn3460.c
@@ -328,7 +328,7 @@ int ptn3460_init(struct drm_device *dev, struct drm_encoder *encoder,
         }
         drm_connector_helper_add(&ptn_bridge->connector,
                         &ptn3460_connector_helper_funcs);
-        drm_sysfs_connector_add(&ptn_bridge->connector);
+        drm_connector_register(&ptn_bridge->connector);
         drm_mode_connector_attach_encoder(&ptn_bridge->connector, encoder);
 
         return 0;
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index fe94cc10cd35..7db6251c38e7 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -881,6 +881,8 @@ int drm_connector_init(struct drm_device *dev,
         drm_object_attach_property(&connector->base,
                                       dev->mode_config.dpms_property, 0);
 
+        connector->debugfs_entry = NULL;
+
 out_put:
         if (ret)
                 drm_mode_object_put(dev, &connector->base);
@@ -921,6 +923,47 @@ void drm_connector_cleanup(struct drm_connector *connector)
 EXPORT_SYMBOL(drm_connector_cleanup);
 
 /**
+ * drm_connector_register - register a connector
+ * @connector: the connector to register
+ *
+ * Register userspace interfaces for a connector
+ *
+ * Returns:
+ * Zero on success, error code on failure.
+ */
+int drm_connector_register(struct drm_connector *connector)
+{
+        int ret;
+
+        ret = drm_sysfs_connector_add(connector);
+        if (ret)
+                return ret;
+
+        ret = drm_debugfs_connector_add(connector);
+        if (ret) {
+                drm_sysfs_connector_remove(connector);
+                return ret;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL(drm_connector_register);
+
+/**
+ * drm_connector_unregister - unregister a connector
+ * @connector: the connector to unregister
+ *
+ * Unregister userspace interfaces for a connector
+ */
+void drm_connector_unregister(struct drm_connector *connector)
+{
+        drm_sysfs_connector_remove(connector);
+        drm_debugfs_connector_remove(connector);
+}
+EXPORT_SYMBOL(drm_connector_unregister);
+
+
+/**
  * drm_connector_unplug_all - unregister connector userspace interfaces
  * @dev: drm device
  *
@@ -934,7 +977,7 @@ void drm_connector_unplug_all(struct drm_device *dev)
 
         /* taking the mode config mutex ends up in a clash with sysfs */
         list_for_each_entry(connector, &dev->mode_config.connector_list, head)
-                drm_sysfs_connector_remove(connector);
+                drm_connector_unregister(connector);
 
 }
 EXPORT_SYMBOL(drm_connector_unplug_all);
@@ -3720,6 +3763,10 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector,
         struct drm_device *dev = connector->dev;
         int ret, size;
 
+        /* ignore requests to set edid when overridden */
+        if (connector->override_edid)
+                return 0;
+
         if (connector->edid_blob_ptr)
                 drm_property_destroy_blob(dev, connector->edid_blob_ptr);
 
diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c
index b4b51d46f339..13bd42923dd4 100644
--- a/drivers/gpu/drm/drm_debugfs.c
+++ b/drivers/gpu/drm/drm_debugfs.c
@@ -35,6 +35,7 @@
 #include <linux/slab.h>
 #include <linux/export.h>
 #include <drm/drmP.h>
+#include <drm/drm_edid.h>
 
 #if defined(CONFIG_DEBUG_FS)
 
@@ -237,5 +238,186 @@ int drm_debugfs_cleanup(struct drm_minor *minor)
         return 0;
 }
 
+static int connector_show(struct seq_file *m, void *data)
+{
+        struct drm_connector *connector = m->private;
+        const char *status;
+
+        switch (connector->force) {
+        case DRM_FORCE_ON:
+                status = "on\n";
+                break;
+
+        case DRM_FORCE_ON_DIGITAL:
+                status = "digital\n";
+                break;
+
+        case DRM_FORCE_OFF:
+                status = "off\n";
+                break;
+
+        case DRM_FORCE_UNSPECIFIED:
+                status = "unspecified\n";
+                break;
+
+        default:
+                return 0;
+        }
+
+        seq_puts(m, status);
+
+        return 0;
+}
+
+static int connector_open(struct inode *inode, struct file *file)
+{
+        struct drm_connector *dev = inode->i_private;
+
+        return single_open(file, connector_show, dev);
+}
+
+static ssize_t connector_write(struct file *file, const char __user *ubuf,
+                               size_t len, loff_t *offp)
+{
+        struct seq_file *m = file->private_data;
+        struct drm_connector *connector = m->private;
+        char buf[12];
+
+        if (len > sizeof(buf) - 1)
+                return -EINVAL;
+
+        if (copy_from_user(buf, ubuf, len))
+                return -EFAULT;
+
+        buf[len] = '\0';
+
+        if (!strcmp(buf, "on"))
+                connector->force = DRM_FORCE_ON;
+        else if (!strcmp(buf, "digital"))
+                connector->force = DRM_FORCE_ON_DIGITAL;
+        else if (!strcmp(buf, "off"))
+                connector->force = DRM_FORCE_OFF;
+        else if (!strcmp(buf, "unspecified"))
+                connector->force = DRM_FORCE_UNSPECIFIED;
+        else
+                return -EINVAL;
+
+        return len;
+}
+
+static int edid_show(struct seq_file *m, void *data)
+{
+        struct drm_connector *connector = m->private;
+        struct drm_property_blob *edid = connector->edid_blob_ptr;
+
+        if (connector->override_edid && edid)
+                seq_write(m, edid->data, edid->length);
+
+        return 0;
+}
+
+static int edid_open(struct inode *inode, struct file *file)
+{
+        struct drm_connector *dev = inode->i_private;
+
+        return single_open(file, edid_show, dev);
+}
+
+static ssize_t edid_write(struct file *file, const char __user *ubuf,
+                          size_t len, loff_t *offp)
+{
+        struct seq_file *m = file->private_data;
+        struct drm_connector *connector = m->private;
+        char *buf;
+        struct edid *edid;
+        int ret;
+
+        buf = memdup_user(ubuf, len);
+        if (IS_ERR(buf))
+                return PTR_ERR(buf);
+
+        edid = (struct edid *) buf;
+
+        if (len == 5 && !strncmp(buf, "reset", 5)) {
+                connector->override_edid = false;
+                ret = drm_mode_connector_update_edid_property(connector, NULL);
+        } else if (len < EDID_LENGTH ||
+                   EDID_LENGTH * (1 + edid->extensions) > len)
+                ret = -EINVAL;
+        else {
+                connector->override_edid = false;
+                ret = drm_mode_connector_update_edid_property(connector, edid);
+                if (!ret)
+                        connector->override_edid = true;
+        }
+
+        kfree(buf);
+
+        return (ret) ? ret : len;
+}
+
+static const struct file_operations drm_edid_fops = {
+        .owner = THIS_MODULE,
+        .open = edid_open,
+        .read = seq_read,
+        .llseek = seq_lseek,
+        .release = single_release,
+        .write = edid_write
+};
+
+
+static const struct file_operations drm_connector_fops = {
+        .owner = THIS_MODULE,
+        .open = connector_open,
+        .read = seq_read,
+        .llseek = seq_lseek,
+        .release = single_release,
+        .write = connector_write
+};
+
+int drm_debugfs_connector_add(struct drm_connector *connector)
+{
+        struct drm_minor *minor = connector->dev->primary;
+        struct dentry *root, *ent;
+
+        if (!minor->debugfs_root)
+                return -1;
+
+        root = debugfs_create_dir(connector->name, minor->debugfs_root);
+        if (!root)
+                return -ENOMEM;
+
+        connector->debugfs_entry = root;
+
+        /* force */
+        ent = debugfs_create_file("force", S_IRUGO | S_IWUSR, root, connector,
+                                  &drm_connector_fops);
+        if (!ent)
+                goto error;
+
+        /* edid */
+        ent = debugfs_create_file("edid_override", S_IRUGO | S_IWUSR, root,
+                                  connector, &drm_edid_fops);
+        if (!ent)
+                goto error;
+
+        return 0;
+
+error:
+        debugfs_remove_recursive(connector->debugfs_entry);
+        connector->debugfs_entry = NULL;
+        return -ENOMEM;
+}
+
+void drm_debugfs_connector_remove(struct drm_connector *connector)
+{
+        if (!connector->debugfs_entry)
+                return;
+
+        debugfs_remove_recursive(connector->debugfs_entry);
+
+        connector->debugfs_entry = NULL;
+}
+
 #endif /* CONFIG_DEBUG_FS */
 
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index d5d8cea1a679..5aab5ab8b584 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -199,9 +199,6 @@ int drm_fb_helper_debug_enter(struct fb_info *info)
         struct drm_crtc_helper_funcs *funcs;
         int i;
 
-        if (list_empty(&kernel_fb_helper_list))
-                return false;
-
         list_for_each_entry(helper, &kernel_fb_helper_list, kernel_fb_list) {
                 for (i = 0; i < helper->crtc_count; i++) {
                         struct drm_mode_set *mode_set =
@@ -1056,7 +1053,6 @@ void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch,
         info->fix.ypanstep = 1; /* doing it in hw */
         info->fix.ywrapstep = 0;
         info->fix.accel = FB_ACCEL_NONE;
-        info->fix.type_aux = 0;
 
         info->fix.line_length = pitch;
         return;
diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c
index d22676b89cbb..db7d250f7ac7 100644
--- a/drivers/gpu/drm/drm_probe_helper.c
+++ b/drivers/gpu/drm/drm_probe_helper.c
@@ -130,7 +130,14 @@ static int drm_helper_probe_single_connector_modes_merge_bits(struct drm_connect
         count = drm_load_edid_firmware(connector);
         if (count == 0)
 #endif
-                count = (*connector_funcs->get_modes)(connector);
+        {
+                if (connector->override_edid) {
+                        struct edid *edid = (struct edid *) connector->edid_blob_ptr->data;
+
+                        count = drm_add_edid_modes(connector, edid);
+                } else
+                        count = (*connector_funcs->get_modes)(connector);
+        }
 
         if (count == 0 && connector->status == connector_status_connected)
                 count = drm_add_modes_noedid(connector, 1024, 768);
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index 14d16464000a..f4148bfcb26d 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -38,17 +38,13 @@ unsigned int drm_debug = 0;	/* 1 to enable debug output */
 EXPORT_SYMBOL(drm_debug);
 
 unsigned int drm_rnodes = 0;    /* 1 to enable experimental render nodes API */
-EXPORT_SYMBOL(drm_rnodes);
 
 /* 1 to allow user space to request universal planes (experimental) */
 unsigned int drm_universal_planes = 0;
-EXPORT_SYMBOL(drm_universal_planes);
 
 unsigned int drm_vblank_offdelay = 5000;    /* Default to 5000 msecs. */
-EXPORT_SYMBOL(drm_vblank_offdelay);
 
 unsigned int drm_timestamp_precision = 20;  /* Default to 20 usecs. */
-EXPORT_SYMBOL(drm_timestamp_precision);
 
 /*
  * Default to use monotonic timestamps for wait-for-vblank and page-flip
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
index 369b26278e76..7827dad8fcf4 100644
--- a/drivers/gpu/drm/drm_sysfs.c
+++ b/drivers/gpu/drm/drm_sysfs.c
@@ -438,7 +438,6 @@ err_out_files:
 out:
         return ret;
 }
-EXPORT_SYMBOL(drm_sysfs_connector_add);
 
 /**
  * drm_sysfs_connector_remove - remove an connector device from sysfs
@@ -468,7 +467,6 @@ void drm_sysfs_connector_remove(struct drm_connector *connector)
         device_unregister(connector->kdev);
         connector->kdev = NULL;
 }
-EXPORT_SYMBOL(drm_sysfs_connector_remove);
 
 /**
  * drm_sysfs_hotplug_event - generate a DRM uevent
diff --git a/drivers/gpu/drm/exynos/exynos_dp_core.c b/drivers/gpu/drm/exynos/exynos_dp_core.c
index a8ffc8c1477b..86dc69d9eabb 100644
--- a/drivers/gpu/drm/exynos/exynos_dp_core.c
+++ b/drivers/gpu/drm/exynos/exynos_dp_core.c
@@ -1018,7 +1018,7 @@ static int exynos_dp_create_connector(struct exynos_drm_display *display,
         }
 
         drm_connector_helper_add(connector, &exynos_dp_connector_helper_funcs);
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
         drm_mode_connector_attach_encoder(connector, encoder);
 
         return 0;
diff --git a/drivers/gpu/drm/exynos/exynos_drm_connector.c b/drivers/gpu/drm/exynos/exynos_drm_connector.c
index 9a16dbe121d1..25c788832e2e 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_connector.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_connector.c
@@ -185,7 +185,7 @@ static void exynos_drm_connector_destroy(struct drm_connector *connector)
         struct exynos_drm_connector *exynos_connector =
                 to_exynos_connector(connector);
 
-        drm_sysfs_connector_remove(connector);
+        drm_connector_unregister(connector);
         drm_connector_cleanup(connector);
         kfree(exynos_connector);
 }
@@ -230,7 +230,7 @@ struct drm_connector *exynos_drm_connector_create(struct drm_device *dev,
         drm_connector_init(dev, connector, &exynos_connector_funcs, type);
         drm_connector_helper_add(connector, &exynos_connector_helper_funcs);
 
-        err = drm_sysfs_connector_add(connector);
+        err = drm_connector_register(connector);
         if (err)
                 goto err_connector;
 
@@ -250,7 +250,7 @@ struct drm_connector *exynos_drm_connector_create(struct drm_device *dev,
         return connector;
 
 err_sysfs:
-        drm_sysfs_connector_remove(connector);
+        drm_connector_unregister(connector);
 err_connector:
         drm_connector_cleanup(connector);
         kfree(exynos_connector);
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dpi.c b/drivers/gpu/drm/exynos/exynos_drm_dpi.c
index 9e530f205ad2..3aa1c7ebbfcc 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dpi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dpi.c
@@ -48,7 +48,7 @@ exynos_dpi_detect(struct drm_connector *connector, bool force)
 
 static void exynos_dpi_connector_destroy(struct drm_connector *connector)
 {
-        drm_sysfs_connector_remove(connector);
+        drm_connector_unregister(connector);
         drm_connector_cleanup(connector);
 }
 
@@ -117,7 +117,7 @@ static int exynos_dpi_create_connector(struct exynos_drm_display *display,
         }
 
         drm_connector_helper_add(connector, &exynos_dpi_connector_helper_funcs);
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
         drm_mode_connector_attach_encoder(connector, encoder);
 
         return 0;
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
index ab7d182063c3..d82e3cb8a70d 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -39,8 +39,6 @@
 #define DRIVER_MAJOR    1
 #define DRIVER_MINOR    0
 
-#define VBLANK_OFF_DELAY        50000
-
 static struct platform_device *exynos_drm_pdev;
 
 static DEFINE_MUTEX(drm_component_lock);
@@ -103,8 +101,6 @@ static int exynos_drm_load(struct drm_device *dev, unsigned long flags)
         /* setup possible_clones. */
         exynos_drm_encoder_setup(dev);
 
-        drm_vblank_offdelay = VBLANK_OFF_DELAY;
-
         platform_set_drvdata(dev->platformdev, dev);
 
         /* Try to bind all sub drivers. */
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h
index 06cde4506278..02f3b3dcb9f8 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
@@ -40,8 +40,6 @@ struct drm_device;
 struct exynos_drm_overlay;
 struct drm_connector;
 
-extern unsigned int drm_vblank_offdelay;
-
 /* This enumerates device type. */
 enum exynos_drm_device_type {
         EXYNOS_DEVICE_TYPE_NONE,
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
index 6302aa64f6c1..2df3592166de 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
@@ -1246,7 +1246,7 @@ static int exynos_dsi_create_connector(struct exynos_drm_display *display,
         }
 
         drm_connector_helper_add(connector, &exynos_dsi_connector_helper_funcs);
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
         drm_mode_connector_attach_encoder(connector, encoder);
 
         return 0;
diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
index 2fb8705d6461..9528d81d8004 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
@@ -562,7 +562,7 @@ static int vidi_create_connector(struct exynos_drm_display *display,
         }
 
         drm_connector_helper_add(connector, &vidi_connector_helper_funcs);
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
         drm_mode_connector_attach_encoder(connector, encoder);
 
         return 0;
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index aa259b0a873a..81df11d57673 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -1129,7 +1129,7 @@ static int hdmi_create_connector(struct exynos_drm_display *display,
         }
 
         drm_connector_helper_add(connector, &hdmi_connector_helper_funcs);
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
         drm_mode_connector_attach_encoder(connector, encoder);
 
         return 0;
diff --git a/drivers/gpu/drm/gma500/cdv_intel_crt.c b/drivers/gpu/drm/gma500/cdv_intel_crt.c
index c18268cd516e..248c33a35ebf 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_crt.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_crt.c
@@ -192,7 +192,7 @@ static void cdv_intel_crt_destroy(struct drm_connector *connector)
         struct gma_encoder *gma_encoder = gma_attached_encoder(connector);
 
         psb_intel_i2c_destroy(gma_encoder->ddc_bus);
-        drm_sysfs_connector_remove(connector);
+        drm_connector_unregister(connector);
         drm_connector_cleanup(connector);
         kfree(connector);
 }
@@ -304,7 +304,7 @@ void cdv_intel_crt_init(struct drm_device *dev,
         drm_connector_helper_add(connector,
                                         &cdv_intel_crt_connector_helper_funcs);
 
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
 
         return;
 failed_ddc:
diff --git a/drivers/gpu/drm/gma500/cdv_intel_dp.c b/drivers/gpu/drm/gma500/cdv_intel_dp.c
index 9ff30c2efadb..a4cc0e60a1be 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_dp.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_dp.c
@@ -1713,7 +1713,7 @@ cdv_intel_dp_destroy(struct drm_connector *connector)
                 }
         }
         i2c_del_adapter(&intel_dp->adapter);
-        drm_sysfs_connector_remove(connector);
+        drm_connector_unregister(connector);
         drm_connector_cleanup(connector);
         kfree(connector);
 }
@@ -1847,7 +1847,7 @@ cdv_intel_dp_init(struct drm_device *dev, struct psb_intel_mode_device *mode_dev
         connector->interlace_allowed = false;
         connector->doublescan_allowed = false;
 
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
 
         /* Set up the DDC bus. */
         switch (output_reg) {
diff --git a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
index b99084b3f706..4268bf210034 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
@@ -248,7 +248,7 @@ static void cdv_hdmi_destroy(struct drm_connector *connector)
 
         if (gma_encoder->i2c_bus)
                 psb_intel_i2c_destroy(gma_encoder->i2c_bus);
-        drm_sysfs_connector_remove(connector);
+        drm_connector_unregister(connector);
         drm_connector_cleanup(connector);
         kfree(connector);
 }
@@ -356,7 +356,7 @@ void cdv_hdmi_init(struct drm_device *dev,
 
         hdmi_priv->hdmi_i2c_adapter = &(gma_encoder->i2c_bus->adapter);
         hdmi_priv->dev = dev;
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
         return;
 
 failed_ddc:
diff --git a/drivers/gpu/drm/gma500/cdv_intel_lvds.c b/drivers/gpu/drm/gma500/cdv_intel_lvds.c
index 8ecc920fc26d..0b770396548c 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_lvds.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_lvds.c
@@ -446,7 +446,7 @@ static void cdv_intel_lvds_destroy(struct drm_connector *connector)
 
         if (gma_encoder->i2c_bus)
                 psb_intel_i2c_destroy(gma_encoder->i2c_bus);
-        drm_sysfs_connector_remove(connector);
+        drm_connector_unregister(connector);
         drm_connector_cleanup(connector);
         kfree(connector);
 }
@@ -774,7 +774,7 @@ void cdv_intel_lvds_init(struct drm_device *dev,
 
 out:
         mutex_unlock(&dev->mode_config.mutex);
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
         return;
 
 failed_find:
diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_output.c b/drivers/gpu/drm/gma500/mdfld_dsi_output.c
index 6e91b20ce2e5..abf2248da61e 100644
--- a/drivers/gpu/drm/gma500/mdfld_dsi_output.c
+++ b/drivers/gpu/drm/gma500/mdfld_dsi_output.c
@@ -318,7 +318,7 @@ static void mdfld_dsi_connector_destroy(struct drm_connector *connector)
 
         if (!dsi_connector)
                 return;
-        drm_sysfs_connector_remove(connector);
+        drm_connector_unregister(connector);
         drm_connector_cleanup(connector);
         sender = dsi_connector->pkg_sender;
         mdfld_dsi_pkg_sender_destroy(sender);
@@ -597,7 +597,7 @@ void mdfld_dsi_output_init(struct drm_device *dev,
         dsi_config->encoder = encoder;
         encoder->base.type = (pipe == 0) ? INTEL_OUTPUT_MIPI :
                 INTEL_OUTPUT_MIPI2;
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
         return;
 
         /*TODO: add code to destroy outputs on error*/
diff --git a/drivers/gpu/drm/gma500/oaktrail_hdmi.c b/drivers/gpu/drm/gma500/oaktrail_hdmi.c
index cf018ddcc5a6..e6f5c620a0a2 100644
--- a/drivers/gpu/drm/gma500/oaktrail_hdmi.c
+++ b/drivers/gpu/drm/gma500/oaktrail_hdmi.c
@@ -665,7 +665,7 @@ void oaktrail_hdmi_init(struct drm_device *dev,
         connector->display_info.subpixel_order = SubPixelHorizontalRGB;
         connector->interlace_allowed = false;
         connector->doublescan_allowed = false;
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
         dev_info(dev->dev, "HDMI initialised.\n");
 
         return;
diff --git a/drivers/gpu/drm/gma500/oaktrail_lvds.c b/drivers/gpu/drm/gma500/oaktrail_lvds.c
index 9b099468a5db..0d39da6e8b7a 100644
--- a/drivers/gpu/drm/gma500/oaktrail_lvds.c
+++ b/drivers/gpu/drm/gma500/oaktrail_lvds.c
@@ -404,7 +404,7 @@ void oaktrail_lvds_init(struct drm_device *dev,
 out:
         mutex_unlock(&dev->mode_config.mutex);
 
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
         return;
 
 failed_find:
diff --git a/drivers/gpu/drm/gma500/psb_intel_lvds.c b/drivers/gpu/drm/gma500/psb_intel_lvds.c
index d7778d0472c1..88aad95bde09 100644
--- a/drivers/gpu/drm/gma500/psb_intel_lvds.c
+++ b/drivers/gpu/drm/gma500/psb_intel_lvds.c
@@ -563,7 +563,7 @@ void psb_intel_lvds_destroy(struct drm_connector *connector)
 
         if (lvds_priv->ddc_bus)
                 psb_intel_i2c_destroy(lvds_priv->ddc_bus);
-        drm_sysfs_connector_remove(connector);
+        drm_connector_unregister(connector);
         drm_connector_cleanup(connector);
         kfree(connector);
 }
@@ -829,7 +829,7 @@ void psb_intel_lvds_init(struct drm_device *dev,
          */
 out:
         mutex_unlock(&dev->mode_config.mutex);
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
         return;
 
 failed_find:
diff --git a/drivers/gpu/drm/gma500/psb_intel_sdvo.c b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
index deeb0829b129..0be96fdb5e28 100644
--- a/drivers/gpu/drm/gma500/psb_intel_sdvo.c
+++ b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
@@ -1682,7 +1682,7 @@ static void psb_intel_sdvo_destroy(struct drm_connector *connector)
                                      psb_intel_sdvo_connector->tv_format);
 
         psb_intel_sdvo_destroy_enhance_property(connector);
-        drm_sysfs_connector_remove(connector);
+        drm_connector_unregister(connector);
         drm_connector_cleanup(connector);
         kfree(connector);
 }
@@ -2071,7 +2071,7 @@ psb_intel_sdvo_connector_init(struct psb_intel_sdvo_connector *connector,
         connector->base.base.display_info.subpixel_order = SubPixelHorizontalRGB;
 
         gma_connector_attach_encoder(&connector->base, &encoder->base);
-        drm_sysfs_connector_add(&connector->base.base);
+        drm_connector_register(&connector->base.base);
 }
 
 static void
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 5a045d3bd77e..8da5ef9f4828 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -869,7 +869,7 @@ void intel_crt_init(struct drm_device *dev)
 
         drm_connector_helper_add(connector, &intel_crt_connector_helper_funcs);
 
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
 
         if (!I915_HAS_HOTPLUG(dev))
                 intel_connector->polled = DRM_CONNECTOR_POLL_CONNECT;
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 556c916dbf9d..1112d9ecc226 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12260,7 +12260,7 @@ void intel_connector_unregister(struct intel_connector *intel_connector)
         struct drm_connector *connector = &intel_connector->base;
 
         intel_panel_destroy_backlight(connector);
-        drm_sysfs_connector_remove(connector);
+        drm_connector_unregister(connector);
 }
 
 void intel_modeset_cleanup(struct drm_device *dev)
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 52fda950fd2a..99f033f69189 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -4246,7 +4246,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
                           edp_panel_vdd_work);
 
         intel_connector_attach_encoder(intel_connector, intel_encoder);
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
 
         if (HAS_DDI(dev))
                 intel_connector->get_hw_state = intel_ddi_connector_get_hw_state;
@@ -4289,7 +4289,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
                         edp_panel_vdd_off_sync(intel_dp);
                         drm_modeset_unlock(&dev->mode_config.connection_mutex);
                 }
-                drm_sysfs_connector_remove(connector);
+                drm_connector_unregister(connector);
                 drm_connector_cleanup(connector);
                 return false;
         }
diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
index 02f99d768d49..7c07ee07a8ee 100644
--- a/drivers/gpu/drm/i915/intel_dsi.c
+++ b/drivers/gpu/drm/i915/intel_dsi.c
@@ -742,7 +742,7 @@ bool intel_dsi_init(struct drm_device *dev)
 
         intel_connector_attach_encoder(intel_connector, intel_encoder);
 
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
 
         fixed_mode = dsi->dev_ops->get_modes(&intel_dsi->dev);
         if (!fixed_mode) {
diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
index a3631c0a5c28..3fb71a04e14f 100644
--- a/drivers/gpu/drm/i915/intel_dvo.c
+++ b/drivers/gpu/drm/i915/intel_dvo.c
@@ -558,7 +558,7 @@ void intel_dvo_init(struct drm_device *dev)
                         intel_dvo->panel_wants_dither = true;
                 }
 
-                drm_sysfs_connector_add(connector);
+                drm_connector_register(connector);
                 return;
         }
 
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index eee2bbec2958..0b603102cb3b 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1490,7 +1490,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
         intel_hdmi_add_properties(intel_hdmi, connector);
 
         intel_connector_attach_encoder(intel_connector, intel_encoder);
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
 
         /* For G4X desktop chip, PEG_BAND_GAP_DATA 3:0 must first be written
          * 0xd.  Failure to do so will result in spurious interrupts being
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 23126023aeba..4d29a83fd163 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -1097,7 +1097,7 @@ out:
                 DRM_DEBUG_KMS("lid notifier registration failed\n");
                 lvds_connector->lid_notifier.notifier_call = NULL;
         }
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
 
         intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode);
         intel_panel_setup_backlight(connector);
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 20375cc7f82d..9350edd6728d 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -2433,7 +2433,7 @@ intel_sdvo_connector_init(struct intel_sdvo_connector *connector,
         connector->base.unregister = intel_sdvo_connector_unregister;
 
         intel_connector_attach_encoder(&connector->base, &encoder->base);
-        ret = drm_sysfs_connector_add(drm_connector);
+        ret = drm_connector_register(drm_connector);
         if (ret < 0)
                 goto err1;
 
@@ -2446,7 +2446,7 @@ intel_sdvo_connector_init(struct intel_sdvo_connector *connector,
         return 0;
 
 err2:
-        drm_sysfs_connector_remove(drm_connector);
+        drm_connector_unregister(drm_connector);
 err1:
         drm_connector_cleanup(drm_connector);
 
@@ -2559,7 +2559,7 @@ intel_sdvo_tv_init(struct intel_sdvo *intel_sdvo, int type)
         return true;
 
 err:
-        drm_sysfs_connector_remove(connector);
+        drm_connector_unregister(connector);
         intel_sdvo_destroy(connector);
         return false;
 }
@@ -2638,7 +2638,7 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
         return true;
 
 err:
-        drm_sysfs_connector_remove(connector);
+        drm_connector_unregister(connector);
         intel_sdvo_destroy(connector);
         return false;
 }
@@ -2711,7 +2711,7 @@ static void intel_sdvo_output_cleanup(struct intel_sdvo *intel_sdvo)
         list_for_each_entry_safe(connector, tmp,
                                  &dev->mode_config.connector_list, head) {
                 if (intel_attached_encoder(connector) == &intel_sdvo->base) {
-                        drm_sysfs_connector_remove(connector);
+                        drm_connector_unregister(connector);
                         intel_sdvo_destroy(connector);
                 }
         }
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index 67c6c9a2eb1c..e211eef4b7e4 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -1680,5 +1680,5 @@ intel_tv_init(struct drm_device *dev)
         drm_object_attach_property(&connector->base,
                                    dev->mode_config.tv_bottom_margin_property,
                                    intel_tv->margin[TV_MARGIN_BOTTOM]);
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
 }
diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
index a034ed408252..f9fe390920f1 100644
--- a/drivers/gpu/drm/mgag200/mgag200_mode.c
+++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
@@ -1621,7 +1621,7 @@ static struct drm_connector *mga_vga_init(struct drm_device *dev)
 
         drm_connector_helper_add(connector, &mga_vga_connector_helper_funcs);
 
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
 
         mga_connector->i2c = mgag200_i2c_create(dev);
         if (!mga_connector->i2c)
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
index 28f7e3ec6c28..76960faae38f 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
@@ -306,7 +306,7 @@ static void hdmi_connector_destroy(struct drm_connector *connector)
 
         hdp_disable(hdmi_connector);
 
-        drm_sysfs_connector_remove(connector);
+        drm_connector_unregister(connector);
         drm_connector_cleanup(connector);
 
         hdmi_unreference(hdmi_connector->hdmi);
@@ -416,7 +416,7 @@ struct drm_connector *hdmi_connector_init(struct hdmi *hdmi)
         connector->interlace_allowed = 1;
         connector->doublescan_allowed = 0;
 
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
 
         ret = hpd_enable(hdmi_connector);
         if (ret) {
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 1fa222e8f007..680f46d007a0 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -104,7 +104,7 @@ nouveau_connector_destroy(struct drm_connector *connector)
         struct nouveau_connector *nv_connector = nouveau_connector(connector);
         nouveau_event_ref(NULL, &nv_connector->hpd);
         kfree(nv_connector->edid);
-        drm_sysfs_connector_remove(connector);
+        drm_connector_unregister(connector);
         drm_connector_cleanup(connector);
         if (nv_connector->aux.transfer)
                 drm_dp_aux_unregister(&nv_connector->aux);
@@ -1236,6 +1236,6 @@ nouveau_connector_create(struct drm_device *dev, int index)
 
         INIT_WORK(&nv_connector->work, nouveau_connector_hotplug_work);
 
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
         return connector;
 }
diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c
index 86f4ead0441d..36bc5cc80816 100644
--- a/drivers/gpu/drm/omapdrm/omap_connector.c
+++ b/drivers/gpu/drm/omapdrm/omap_connector.c
@@ -130,7 +130,7 @@ static void omap_connector_destroy(struct drm_connector *connector)
         struct omap_dss_device *dssdev = omap_connector->dssdev;
 
         DBG("%s", omap_connector->dssdev->name);
-        drm_sysfs_connector_remove(connector);
+        drm_connector_unregister(connector);
         drm_connector_cleanup(connector);
         kfree(omap_connector);
 
@@ -307,7 +307,7 @@ struct drm_connector *omap_connector_init(struct drm_device *dev,
         connector->interlace_allowed = 1;
         connector->doublescan_allowed = 0;
 
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
 
         return connector;
 
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index 5d7ea2461852..b8ced08b6291 100644
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -835,7 +835,7 @@ static void qxl_conn_destroy(struct drm_connector *connector)
         struct qxl_output *qxl_output =
                 drm_connector_to_qxl_output(connector);
 
-        drm_sysfs_connector_remove(connector);
+        drm_connector_unregister(connector);
         drm_connector_cleanup(connector);
         kfree(qxl_output);
 }
@@ -902,7 +902,7 @@ static int qdev_output_init(struct drm_device *dev, int num_output)
 
         drm_object_attach_property(&connector->base,
                                    qdev->hotplug_mode_update_property, 0);
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
         return 0;
 }
 
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index 44831197e82e..8137b7a34696 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -740,7 +740,7 @@ static void radeon_connector_destroy(struct drm_connector *connector)
         if (radeon_connector->edid)
                 kfree(radeon_connector->edid);
         kfree(radeon_connector->con_priv);
-        drm_sysfs_connector_remove(connector);
+        drm_connector_unregister(connector);
         drm_connector_cleanup(connector);
         kfree(connector);
 }
@@ -2050,7 +2050,7 @@ radeon_add_atom_connector(struct drm_device *dev,
                 connector->polled = DRM_CONNECTOR_POLL_HPD;
 
         connector->display_info.subpixel_order = subpixel_order;
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
 
         if (has_aux)
                 radeon_dp_aux_init(radeon_connector);
@@ -2211,5 +2211,5 @@ radeon_add_legacy_connector(struct drm_device *dev,
         } else
                 connector->polled = DRM_CONNECTOR_POLL_HPD;
         connector->display_info.subpixel_order = subpixel_order;
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
 }
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c
index 289048d1c7b2..21426bd234eb 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c
@@ -64,7 +64,7 @@ static const struct drm_connector_helper_funcs connector_helper_funcs = {
 
 static void rcar_du_lvds_connector_destroy(struct drm_connector *connector)
 {
-        drm_sysfs_connector_remove(connector);
+        drm_connector_unregister(connector);
         drm_connector_cleanup(connector);
 }
 
@@ -105,7 +105,7 @@ int rcar_du_lvds_connector_init(struct rcar_du_device *rcdu,
                 return ret;
 
         drm_connector_helper_add(connector, &connector_helper_funcs);
-        ret = drm_sysfs_connector_add(connector);
+        ret = drm_connector_register(connector);
         if (ret < 0)
                 return ret;
 
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c b/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c
index ccfe64c7188f..8af3944d31b9 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c
@@ -32,7 +32,7 @@ static const struct drm_connector_helper_funcs connector_helper_funcs = {
 
 static void rcar_du_vga_connector_destroy(struct drm_connector *connector)
 {
-        drm_sysfs_connector_remove(connector);
+        drm_connector_unregister(connector);
         drm_connector_cleanup(connector);
 }
 
@@ -70,7 +70,7 @@ int rcar_du_vga_connector_init(struct rcar_du_device *rcdu,
                 return ret;
 
         drm_connector_helper_add(connector, &connector_helper_funcs);
-        ret = drm_sysfs_connector_add(connector);
+        ret = drm_connector_register(connector);
         if (ret < 0)
                 return ret;
 
diff --git a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
index faf176b2daf9..47875de89010 100644
--- a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
+++ b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
@@ -692,7 +692,7 @@ static void shmob_drm_connector_destroy(struct drm_connector *connector)
         struct shmob_drm_connector *scon = to_shmob_connector(connector);
 
         shmob_drm_backlight_exit(scon);
-        drm_sysfs_connector_remove(connector);
+        drm_connector_unregister(connector);
         drm_connector_cleanup(connector);
 }
 
@@ -726,7 +726,7 @@ int shmob_drm_connector_create(struct shmob_drm_device *sdev,
                 return ret;
 
         drm_connector_helper_add(connector, &connector_helper_funcs);
-        ret = drm_sysfs_connector_add(connector);
+        ret = drm_connector_register(connector);
         if (ret < 0)
                 goto err_cleanup;
 
@@ -749,7 +749,7 @@ int shmob_drm_connector_create(struct shmob_drm_device *sdev,
 err_backlight:
         shmob_drm_backlight_exit(&sdev->connector);
 err_sysfs:
-        drm_sysfs_connector_remove(connector);
+        drm_connector_unregister(connector);
 err_cleanup:
         drm_connector_cleanup(connector);
         return ret;
diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c
index a3e4f1eca6f7..446837e955b6 100644
--- a/drivers/gpu/drm/tegra/output.c
+++ b/drivers/gpu/drm/tegra/output.c
@@ -105,7 +105,7 @@ static void drm_connector_clear(struct drm_connector *connector)
 
 static void tegra_connector_destroy(struct drm_connector *connector)
 {
-        drm_sysfs_connector_remove(connector);
+        drm_connector_unregister(connector);
         drm_connector_cleanup(connector);
         drm_connector_clear(connector);
 }
@@ -318,7 +318,7 @@ int tegra_output_init(struct drm_device *drm, struct tegra_output *output)
         drm_encoder_helper_add(&output->encoder, &encoder_helper_funcs);
 
         drm_mode_connector_attach_encoder(&output->connector, &output->encoder);
-        drm_sysfs_connector_add(&output->connector);
+        drm_connector_register(&output->connector);
 
         output->encoder.possible_crtcs = 0x3;
 
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_panel.c b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
index 86c67329b605..0c0bce7e9007 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_panel.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
@@ -247,7 +247,7 @@ static struct drm_connector *panel_connector_create(struct drm_device *dev,
         if (ret)
                 goto fail;
 
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
 
         return connector;
 
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_slave.c b/drivers/gpu/drm/tilcdc/tilcdc_slave.c
index 595068ba2d5e..c578d144ce6d 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_slave.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_slave.c
@@ -261,7 +261,7 @@ static struct drm_connector *slave_connector_create(struct drm_device *dev,
         if (ret)
                 goto fail;
 
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
 
         return connector;
 
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
index c38b56b268ac..5324dfd0b5ed 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
@@ -261,7 +261,7 @@ static struct drm_connector *tfp410_connector_create(struct drm_device *dev,
         if (ret)
                 goto fail;
 
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
 
         return connector;
 
diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
index b44d548c56f8..dea38ab6c47d 100644
--- a/drivers/gpu/drm/udl/udl_connector.c
+++ b/drivers/gpu/drm/udl/udl_connector.c
@@ -124,7 +124,7 @@ static int udl_connector_set_property(struct drm_connector *connector,
 
 static void udl_connector_destroy(struct drm_connector *connector)
 {
-        drm_sysfs_connector_remove(connector);
+        drm_connector_unregister(connector);
         drm_connector_cleanup(connector);
         kfree(connector);
 }
@@ -154,7 +154,7 @@ int udl_connector_init(struct drm_device *dev, struct drm_encoder *encoder)
         drm_connector_init(dev, connector, &udl_connector_funcs, DRM_MODE_CONNECTOR_DVII);
         drm_connector_helper_add(connector, &udl_connector_helper_funcs);
 
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
         drm_mode_connector_attach_encoder(connector, encoder);
 
         drm_object_attach_property(&connector->base,
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
index 8f3edc4710f2..1a024e3b7285 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -75,7 +75,7 @@ void vmw_display_unit_cleanup(struct vmw_display_unit *du)
                 vmw_surface_unreference(&du->cursor_surface);
         if (du->cursor_dmabuf)
                 vmw_dmabuf_unreference(&du->cursor_dmabuf);
-        drm_sysfs_connector_remove(&du->connector);
+        drm_connector_unregister(&du->connector);
         drm_crtc_cleanup(&du->crtc);
         drm_encoder_cleanup(&du->encoder);
         drm_connector_cleanup(&du->connector);
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
index b2b9bd23aeee..15e185ae4c99 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
@@ -371,7 +371,7 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)
         encoder->possible_crtcs = (1 << unit);
         encoder->possible_clones = 0;
 
-        (void) drm_sysfs_connector_add(connector);
+        (void) drm_connector_register(connector);
 
         drm_crtc_init(dev, crtc, &vmw_legacy_crtc_funcs);
 
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
index a95d3a0cabe4..b295463a60b3 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
@@ -467,7 +467,7 @@ static int vmw_sou_init(struct vmw_private *dev_priv, unsigned unit)
         encoder->possible_crtcs = (1 << unit);
         encoder->possible_clones = 0;
 
-        (void) drm_sysfs_connector_add(connector);
+        (void) drm_connector_register(connector);
 
         drm_crtc_init(dev, crtc, &vmw_screen_object_crtc_funcs);
 
diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c
index def8280d7ee6..6f54ff4f9372 100644
--- a/drivers/staging/imx-drm/imx-drm-core.c
+++ b/drivers/staging/imx-drm/imx-drm-core.c
@@ -202,7 +202,7 @@ static const struct file_operations imx_drm_driver_fops = {
 
 void imx_drm_connector_destroy(struct drm_connector *connector)
 {
-        drm_sysfs_connector_remove(connector);
+        drm_connector_unregister(connector);
         drm_connector_cleanup(connector);
 }
 EXPORT_SYMBOL_GPL(imx_drm_connector_destroy);
@@ -293,10 +293,10 @@ static int imx_drm_driver_load(struct drm_device *drm, unsigned long flags)
          * userspace will expect to be able to access DRM at this point.
          */
         list_for_each_entry(connector, &drm->mode_config.connector_list, head) {
-                ret = drm_sysfs_connector_add(connector);
+                ret = drm_connector_register(connector);
                 if (ret) {
                         dev_err(drm->dev,
-                                "[CONNECTOR:%d:%s] drm_sysfs_connector_add failed: %d\n",
+                                "[CONNECTOR:%d:%s] drm_connector_register failed: %d\n",
                                 connector->base.id,
                                 connector->name, ret);
                         goto err_unbind;
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 8af71a8e2c00..57ecc421b19c 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -1419,6 +1419,8 @@ extern int drm_debugfs_create_files(const struct drm_info_list *files,
 extern int drm_debugfs_remove_files(const struct drm_info_list *files,
                                     int count, struct drm_minor *minor);
 extern int drm_debugfs_cleanup(struct drm_minor *minor);
+extern int drm_debugfs_connector_add(struct drm_connector *connector);
+extern void drm_debugfs_connector_remove(struct drm_connector *connector);
 #else
 static inline int drm_debugfs_init(struct drm_minor *minor, int minor_id,
                                    struct dentry *root)
@@ -1443,6 +1445,15 @@ static inline int drm_debugfs_cleanup(struct drm_minor *minor)
 {
         return 0;
 }
+
+static inline int drm_debugfs_connector_add(struct drm_connector *connector)
+{
+        return 0;
+}
+static inline void drm_debugfs_connector_remove(struct drm_connector *connector)
+{
+}
+
 #endif
 
                                 /* Info file support */
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 251b75e6bf7a..857bbb1551f8 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -533,6 +533,7 @@ struct drm_connector {
 
         /* forced on connector */
         enum drm_connector_force force;
+        bool override_edid;
         uint32_t encoder_ids[DRM_CONNECTOR_MAX_ENCODER];
         struct drm_encoder *encoder; /* currently active encoder */
 
@@ -545,6 +546,8 @@ struct drm_connector {
         int audio_latency[2];
         int null_edid_counter; /* needed to workaround some HW bugs where we get all 0s */
         unsigned bad_edid_counter;
+
+        struct dentry *debugfs_entry;
 };
 
 /**
@@ -878,6 +881,8 @@ extern int drm_connector_init(struct drm_device *dev,
                               struct drm_connector *connector,
                               const struct drm_connector_funcs *funcs,
                               int connector_type);
+int drm_connector_register(struct drm_connector *connector);
+void drm_connector_unregister(struct drm_connector *connector);
 
 extern void drm_connector_cleanup(struct drm_connector *connector);
 /* helper to unplug all connectors from sysfs for device */
diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h
index 9abbeb924cbb..b0b855613641 100644
--- a/include/uapi/drm/drm.h
+++ b/include/uapi/drm/drm.h
@@ -780,7 +780,7 @@ struct drm_prime_handle {
 
 /**
  * Device specific ioctls should only be in their respective headers
- * The device specific ioctl range is from 0x40 to 0x99.
+ * The device specific ioctl range is from 0x40 to 0x9f.
  * Generic IOCTLS restart at 0xA0.
  *
  * \sa drmCommandNone(), drmCommandRead(), drmCommandWrite(), and