drm/i915: Remove redundant drm_connector_register_all()
authorChris Wilson <chris@chris-wilson.co.uk>
Fri, 24 Jun 2016 13:00:20 +0000 (14:00 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Fri, 24 Jun 2016 13:44:27 +0000 (14:44 +0100)
drm_connector_register_all() is now automatically called by
drm_dev_register(), and so we no longer have to do so ourselves (via
intel_modeset_register() after calling drm_dev_register()). Similarly
for unregistering.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1466773227-7994-8-git-send-email-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_display.c

index a9c2f635aaab0de717c0ffb6bf88dd76d27065f5..77c3e2373ad945ab4fbb9d2688aa60827364f26e 100644 (file)
@@ -1403,7 +1403,6 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)
        if (drm_dev_register(dev, 0) == 0) {
                i915_debugfs_register(dev_priv);
                i915_setup_sysfs(dev);
-               intel_modeset_register(dev_priv);
        } else
                DRM_ERROR("Failed to register driver for userspace access!\n");
 
@@ -1440,7 +1439,6 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)
        acpi_video_unregister();
        intel_opregion_unregister(dev_priv);
 
-       intel_modeset_unregister(dev_priv);
        i915_teardown_sysfs(dev_priv->dev);
        i915_debugfs_unregister(dev_priv);
        drm_dev_unregister(dev_priv->dev);
index 3e94edb1a9e1fe464ec0ed7e8ce8a2982ab16948..520ee8a6bb7ababd6d389f4a0c15d81a0b3c55da 100644 (file)
@@ -3740,8 +3740,6 @@ extern void intel_modeset_init_hw(struct drm_device *dev);
 extern void intel_modeset_init(struct drm_device *dev);
 extern void intel_modeset_gem_init(struct drm_device *dev);
 extern void intel_modeset_cleanup(struct drm_device *dev);
-extern void intel_modeset_register(struct drm_i915_private *dev_priv);
-extern void intel_modeset_unregister(struct drm_i915_private *dev_priv);
 extern int intel_connector_register(struct drm_connector *);
 extern void intel_connector_unregister(struct drm_connector *);
 extern int intel_modeset_vga_set_state(struct drm_device *dev, bool state);
index 798c175c37bf4a863c4f563deee91fcbbdc21bc6..c3257177d527fd35b413f6e4336bc797c263bd0c 100644 (file)
@@ -15551,16 +15551,6 @@ void intel_modeset_init_hw(struct drm_device *dev)
        intel_enable_gt_powersave(dev_priv);
 }
 
-void intel_modeset_register(struct drm_i915_private *dev_priv)
-{
-       drm_connector_register_all(dev_priv->dev);
-}
-
-void intel_modeset_unregister(struct drm_i915_private *dev_priv)
-{
-       drm_connector_unregister_all(dev_priv->dev);
-}
-
 /*
  * Calculate what we think the watermarks should be for the state we've read
  * out of the hardware and then immediately program those watermarks so that