Commit e63d87c0 authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter

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: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1466160034-12173-3-git-send-email-chris@chris-wilson.co.uk
parent c191eca1
...@@ -16221,6 +16221,9 @@ void intel_modeset_gem_init(struct drm_device *dev) ...@@ -16221,6 +16221,9 @@ void intel_modeset_gem_init(struct drm_device *dev)
void intel_connector_unregister(struct drm_connector *connector) 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); intel_panel_destroy_backlight(connector);
} }
...@@ -16230,8 +16233,6 @@ void intel_modeset_cleanup(struct drm_device *dev) ...@@ -16230,8 +16233,6 @@ void intel_modeset_cleanup(struct drm_device *dev)
intel_disable_gt_powersave(dev_priv); intel_disable_gt_powersave(dev_priv);
intel_backlight_unregister(dev);
/* /*
* Interrupts and polling as the first thing to avoid creating havoc. * Interrupts and polling as the first thing to avoid creating havoc.
* Too much stuff here (turning of connectors, ...) would * Too much stuff here (turning of connectors, ...) would
......
...@@ -1488,7 +1488,14 @@ extern struct drm_display_mode *intel_find_panel_downclock( ...@@ -1488,7 +1488,14 @@ extern struct drm_display_mode *intel_find_panel_downclock(
struct drm_display_mode *fixed_mode, struct drm_display_mode *fixed_mode,
struct drm_connector *connector); struct drm_connector *connector);
void intel_backlight_register(struct drm_device *dev); void intel_backlight_register(struct drm_device *dev);
void intel_backlight_unregister(struct drm_device *dev);
#if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE)
void intel_backlight_device_unregister(struct intel_connector *connector);
#else /* CONFIG_BACKLIGHT_CLASS_DEVICE */
static inline void intel_backlight_device_unregister(struct intel_connector *connector)
{
}
#endif /* CONFIG_BACKLIGHT_CLASS_DEVICE */
/* intel_psr.c */ /* intel_psr.c */
......
...@@ -1216,7 +1216,7 @@ static int intel_backlight_device_register(struct intel_connector *connector) ...@@ -1216,7 +1216,7 @@ static int intel_backlight_device_register(struct intel_connector *connector)
return 0; return 0;
} }
static void intel_backlight_device_unregister(struct intel_connector *connector) void intel_backlight_device_unregister(struct intel_connector *connector)
{ {
struct intel_panel *panel = &connector->panel; struct intel_panel *panel = &connector->panel;
...@@ -1230,9 +1230,6 @@ static int intel_backlight_device_register(struct intel_connector *connector) ...@@ -1230,9 +1230,6 @@ static int intel_backlight_device_register(struct intel_connector *connector)
{ {
return 0; return 0;
} }
static void intel_backlight_device_unregister(struct intel_connector *connector)
{
}
#endif /* CONFIG_BACKLIGHT_CLASS_DEVICE */ #endif /* CONFIG_BACKLIGHT_CLASS_DEVICE */
/* /*
...@@ -1820,11 +1817,3 @@ void intel_backlight_register(struct drm_device *dev) ...@@ -1820,11 +1817,3 @@ void intel_backlight_register(struct drm_device *dev)
for_each_intel_connector(dev, connector) for_each_intel_connector(dev, connector)
intel_backlight_device_register(connector); intel_backlight_device_register(connector);
} }
void intel_backlight_unregister(struct drm_device *dev)
{
struct intel_connector *connector;
for_each_intel_connector(dev, connector)
intel_backlight_device_unregister(connector);
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment