diff options
| author | Chris Wilson | 2016-06-17 12:40:33 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2016-06-19 10:39:06 +0200 |
| commit | c191eca110a372897b23caeaa6e688fdbb78f01f (patch) | |
| tree | 67ddf7e715fbc5b14870d99d747d4c88eff068e9 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm: Protect drm_connector_register_all() under DRIVER_MODESET (diff) | |
| download | kernel-qcow2-linux-c191eca110a372897b23caeaa6e688fdbb78f01f.tar.gz kernel-qcow2-linux-c191eca110a372897b23caeaa6e688fdbb78f01f.tar.xz kernel-qcow2-linux-c191eca110a372897b23caeaa6e688fdbb78f01f.zip | |
drm/i915: Move intel_connector->unregister to connector->early_unregister
We now have a connector->func that serves the same purpose as our own
intel_connector->unregister vfunc allowing us to unwrap ourselves and
use drm_connector_register() (and friends) as the central function.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1466160034-12173-2-git-send-email-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 2bf6c58508da..e79f87138f90 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -16219,18 +16219,14 @@ void intel_modeset_gem_init(struct drm_device *dev) intel_backlight_register(dev); } -void intel_connector_unregister(struct intel_connector *intel_connector) +void intel_connector_unregister(struct drm_connector *connector) { - struct drm_connector *connector = &intel_connector->base; - intel_panel_destroy_backlight(connector); - drm_connector_unregister(connector); } void intel_modeset_cleanup(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; - struct intel_connector *connector; intel_disable_gt_powersave(dev_priv); @@ -16256,9 +16252,7 @@ void intel_modeset_cleanup(struct drm_device *dev) /* flush any delayed tasks or pending work */ flush_scheduled_work(); - /* destroy the backlight and sysfs files before encoders/connectors */ - for_each_intel_connector(dev, connector) - connector->unregister(connector); + drm_connector_unregister_all(dev); drm_mode_config_cleanup(dev); |