4 files changed, 0 insertions, 82 deletions

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 805ef2f408a7..e385014ed616 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -1679,70 +1679,6 @@ int drm_mode_create_suggested_offset_properties(struct drm_device *dev)
 }
 EXPORT_SYMBOL(drm_mode_create_suggested_offset_properties);
 
-static int drm_mode_group_init(struct drm_device *dev, struct drm_mode_group *group)
-{
-        uint32_t total_objects = 0;
-
-        total_objects += dev->mode_config.num_crtc;
-        total_objects += dev->mode_config.num_connector;
-        total_objects += dev->mode_config.num_encoder;
-
-        group->id_list = kcalloc(total_objects, sizeof(uint32_t), GFP_KERNEL);
-        if (!group->id_list)
-                return -ENOMEM;
-
-        group->num_crtcs = 0;
-        group->num_connectors = 0;
-        group->num_encoders = 0;
-        return 0;
-}
-
-void drm_mode_group_destroy(struct drm_mode_group *group)
-{
-        kfree(group->id_list);
-        group->id_list = NULL;
-}
-
-/*
- * NOTE: Driver's shouldn't ever call drm_mode_group_init_legacy_group - it is
- * the drm core's responsibility to set up mode control groups.
- */
-int drm_mode_group_init_legacy_group(struct drm_device *dev,
-                                     struct drm_mode_group *group)
-{
-        struct drm_crtc *crtc;
-        struct drm_encoder *encoder;
-        struct drm_connector *connector;
-        int ret;
-
-        ret = drm_mode_group_init(dev, group);
-        if (ret)
-                return ret;
-
-        drm_for_each_crtc(crtc, dev)
-                group->id_list[group->num_crtcs++] = crtc->base.id;
-
-        drm_for_each_encoder(encoder, dev)
-                group->id_list[group->num_crtcs + group->num_encoders++] =
-                encoder->base.id;
-
-        drm_for_each_connector(connector, dev)
-                group->id_list[group->num_crtcs + group->num_encoders +
-                               group->num_connectors++] = connector->base.id;
-
-        return 0;
-}
-EXPORT_SYMBOL(drm_mode_group_init_legacy_group);
-
-void drm_reinit_primary_mode_group(struct drm_device *dev)
-{
-        drm_modeset_lock_all(dev);
-        drm_mode_group_destroy(&dev->primary->mode_group);
-        drm_mode_group_init_legacy_group(dev, &dev->primary->mode_group);
-        drm_modeset_unlock_all(dev);
-}
-EXPORT_SYMBOL(drm_reinit_primary_mode_group);
-
 /**
  * drm_mode_getresources - get graphics configuration
  * @dev: drm device for the ioctl
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index b7bf4ce8c012..f7798c3b543e 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -285,7 +285,6 @@ static void drm_minor_free(struct drm_device *dev, unsigned int type)
         if (!minor)
                 return;
 
-        drm_mode_group_destroy(&minor->mode_group);
         put_device(minor->kdev);
 
         spin_lock_irqsave(&drm_minor_lock, flags);
@@ -705,20 +704,9 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags)
                         goto err_minors;
         }
 
-        /* setup grouping for legacy outputs */
-        if (drm_core_check_feature(dev, DRIVER_MODESET)) {
-                ret = drm_mode_group_init_legacy_group(dev,
-                                &dev->primary->mode_group);
-                if (ret)
-                        goto err_unload;
-        }
-
         ret = 0;
         goto out_unlock;
 
-err_unload:
-        if (dev->driver->unload)
-                dev->driver->unload(dev);
 err_minors:
         drm_minor_unregister(dev, DRM_MINOR_LEGACY);
         drm_minor_unregister(dev, DRM_MINOR_RENDER);
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index d0b2569c6241..585f0a45b3f1 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -441,7 +441,6 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
         drm_object_attach_property(&connector->base, dev->mode_config.tile_property, 0);
 
         drm_mode_connector_set_path_property(connector, pathprop);
-        drm_reinit_primary_mode_group(dev);
         drm_modeset_lock_all(dev);
         intel_connector_add_to_fbdev(intel_connector);
         drm_modeset_unlock_all(dev);
@@ -466,8 +465,6 @@ static void intel_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
         drm_connector_cleanup(connector);
         drm_modeset_unlock_all(dev);
 
-        drm_reinit_primary_mode_group(dev);
-
         kfree(intel_connector);
         DRM_DEBUG_KMS("\n");
 }
diff --git a/drivers/gpu/drm/radeon/radeon_dp_mst.c b/drivers/gpu/drm/radeon/radeon_dp_mst.c
index e649c8ff20a0..e4fc8f3bf58b 100644
--- a/drivers/gpu/drm/radeon/radeon_dp_mst.c
+++ b/drivers/gpu/drm/radeon/radeon_dp_mst.c
@@ -284,7 +284,6 @@ static struct drm_connector *radeon_dp_add_mst_connector(struct drm_dp_mst_topol
 
         drm_object_attach_property(&connector->base, dev->mode_config.path_property, 0);
         drm_mode_connector_set_path_property(connector, pathprop);
-        drm_reinit_primary_mode_group(dev);
 
         drm_modeset_lock_all(dev);
         radeon_fb_add_connector(rdev, connector);
@@ -309,8 +308,6 @@ static void radeon_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
 
         drm_connector_cleanup(connector);
         drm_modeset_unlock_all(dev);
-        drm_reinit_primary_mode_group(dev);
-
 
         kfree(connector);
         DRM_DEBUG_KMS("\n");