diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-06-24 13:00:20 (GMT) |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2016-06-24 13:44:27 (GMT) |
| commit | 2e5673e73d01fa26ded3888629e5fe22b75ee0a5 (patch) | |
| tree | 01f2d39931781567a26c592bd98b57952aa19c79 | |
| parent | 3e783bac8ade7dd66f97cb748582035356a210ba (diff) | |
| download | linux-2e5673e73d01fa26ded3888629e5fe22b75ee0a5.tar.xz | |
drm/i915: Remove redundant drm_connector_register_all()
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
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 10 |
3 files changed, 0 insertions, 14 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index a9c2f63..77c3e23 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -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); diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 3e94edb..520ee8a 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -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); diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 798c175..c325717 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -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 |