diff options
| author | Chris Wilson | 2016-06-17 12:40:34 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2016-06-19 10:39:13 +0200 |
| commit | e63d87c0b02f2f0ee876ea79dcbe13a7235a2d55 (patch) | |
| tree | 447abf3e696131fb83f200bdf3f5d468884869c9 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Move intel_connector->unregister to connector->early_unregister (diff) | |
| download | kernel-qcow2-linux-e63d87c0b02f2f0ee876ea79dcbe13a7235a2d55.tar.gz kernel-qcow2-linux-e63d87c0b02f2f0ee876ea79dcbe13a7235a2d55.tar.xz kernel-qcow2-linux-e63d87c0b02f2f0ee876ea79dcbe13a7235a2d55.zip | |
drm/i915: Move backlight unregistration to connector unregistration
Currently the backlight is being unregistered in the unload phase (after
the display and its objects are unregistered). Move the backlight
unregistration into the analogous phase by performing it from the
connector unregistration, just prior to its deletion.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1466160034-12173-3-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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index e79f87138f90..b12085a8bfa6 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -16221,6 +16221,9 @@ void intel_modeset_gem_init(struct drm_device *dev) void intel_connector_unregister(struct drm_connector *connector) { + struct intel_connector *intel_connector = to_intel_connector(connector); + + intel_backlight_device_unregister(intel_connector); intel_panel_destroy_backlight(connector); } @@ -16230,8 +16233,6 @@ void intel_modeset_cleanup(struct drm_device *dev) intel_disable_gt_powersave(dev_priv); - intel_backlight_unregister(dev); - /* * Interrupts and polling as the first thing to avoid creating havoc. * Too much stuff here (turning of connectors, ...) would |