diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-07-09 17:44:37 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-07-22 11:29:38 -0400 |
commit | 3fdefa399e4644399ce3e74e65a75122d52dba6a (patch) | |
tree | 02458cf1ad47ca7262a25a64df9e84a2bc60d42d /drivers/gpu/drm/drm_drv.c | |
parent | 9c7060f7e3b09837621f93bd8666cf4cfac45001 (diff) |
drm: gc now dead mode_group code
Two nice things here:
- drm_dev_register will truly register everything in the right order
if the driver doesn't have a ->load callback. Before this we had to
init the primary mode_group after the device nodes where already
registered.
- Less things to keep track of when reworking the connector locking,
yay!
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/drm_drv.c')
-rw-r--r-- | drivers/gpu/drm/drm_drv.c | 12 |
1 files changed, 0 insertions, 12 deletions
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) | |||
285 | if (!minor) | 285 | if (!minor) |
286 | return; | 286 | return; |
287 | 287 | ||
288 | drm_mode_group_destroy(&minor->mode_group); | ||
289 | put_device(minor->kdev); | 288 | put_device(minor->kdev); |
290 | 289 | ||
291 | spin_lock_irqsave(&drm_minor_lock, flags); | 290 | spin_lock_irqsave(&drm_minor_lock, flags); |
@@ -705,20 +704,9 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags) | |||
705 | goto err_minors; | 704 | goto err_minors; |
706 | } | 705 | } |
707 | 706 | ||
708 | /* setup grouping for legacy outputs */ | ||
709 | if (drm_core_check_feature(dev, DRIVER_MODESET)) { | ||
710 | ret = drm_mode_group_init_legacy_group(dev, | ||
711 | &dev->primary->mode_group); | ||
712 | if (ret) | ||
713 | goto err_unload; | ||
714 | } | ||
715 | |||
716 | ret = 0; | 707 | ret = 0; |
717 | goto out_unlock; | 708 | goto out_unlock; |
718 | 709 | ||
719 | err_unload: | ||
720 | if (dev->driver->unload) | ||
721 | dev->driver->unload(dev); | ||
722 | err_minors: | 710 | err_minors: |
723 | drm_minor_unregister(dev, DRM_MINOR_LEGACY); | 711 | drm_minor_unregister(dev, DRM_MINOR_LEGACY); |
724 | drm_minor_unregister(dev, DRM_MINOR_RENDER); | 712 | drm_minor_unregister(dev, DRM_MINOR_RENDER); |