diff options
| author | Chris Wilson | 2016-06-24 15:00:15 +0200 |
|---|---|---|
| committer | Chris Wilson | 2016-06-24 15:43:14 +0200 |
| commit | 1ebaa0b9c2d47ddc832a74254beaa518f64b9cb4 (patch) | |
| tree | c338f0cbaffe0cc0e98aa1c5a99ab44f23143b37 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Move registration actions to connector->late_register (diff) | |
| download | kernel-qcow2-linux-1ebaa0b9c2d47ddc832a74254beaa518f64b9cb4.tar.gz kernel-qcow2-linux-1ebaa0b9c2d47ddc832a74254beaa518f64b9cb4.tar.xz kernel-qcow2-linux-1ebaa0b9c2d47ddc832a74254beaa518f64b9cb4.zip | |
drm/i915: Move backlight registration to connector registration
Currently the backlight is being registered in the load phase (before
the display and its objects are registered). Move the backlight
registration into the analogous phase by performing it from the
connector registration, just after its creation.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1466773227-7994-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 | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 1141b8699dbe..12897d11df60 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -16314,8 +16314,21 @@ void intel_modeset_gem_init(struct drm_device *dev) c->state->plane_mask &= ~(1 << drm_plane_index(c->primary)); } } +} + +int intel_connector_register(struct drm_connector *connector) +{ + struct intel_connector *intel_connector = to_intel_connector(connector); + int ret; + + ret = intel_backlight_device_register(intel_connector); + if (ret) + goto err; + + return 0; - intel_backlight_register(dev); +err: + return ret; } void intel_connector_unregister(struct drm_connector *connector) |