diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-06-24 08:29:45 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-06-24 08:29:45 +0200 |
| commit | 10bb667223f3d4e9c4eb53595f9d7f67a1018952 (patch) | |
| tree | eabb532439ac57e05d07d36f7432208e0782fde4 /drivers/gpu/drm/i915/intel_lvds.c | |
| parent | 64989ca4b27acb026b6496ec21e43bee66f86a5b (diff) | |
| parent | 2a3467063ae3b17264578626dec2377dd48cd1c3 (diff) | |
| download | op-kernel-dev-10bb667223f3d4e9c4eb53595f9d7f67a1018952.zip op-kernel-dev-10bb667223f3d4e9c4eb53595f9d7f67a1018952.tar.gz | |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Backmerge drm-next for the reworked device register/unregistering.
Chris Wilson needs that to be able to land his i915 load/unload
demidlayering.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lvds.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lvds.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index 72096fd..935b536 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c @@ -555,6 +555,7 @@ static const struct drm_connector_funcs intel_lvds_connector_funcs = { .fill_modes = drm_helper_probe_single_connector_modes, .set_property = intel_lvds_set_property, .atomic_get_property = intel_connector_atomic_get_property, + .early_unregister = intel_connector_unregister, .destroy = intel_lvds_destroy, .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, @@ -993,7 +994,6 @@ void intel_lvds_init(struct drm_device *dev) intel_encoder->get_hw_state = intel_lvds_get_hw_state; intel_encoder->get_config = intel_lvds_get_config; intel_connector->get_hw_state = intel_connector_get_hw_state; - intel_connector->unregister = intel_connector_unregister; intel_connector_attach_encoder(intel_connector, intel_encoder); intel_encoder->type = INTEL_OUTPUT_LVDS; |
