diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-07-23 10:57:51 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-07-23 10:57:51 +0000 |
| commit | e540fa39ba7bcafec8c239428aad482126e7c043 (patch) | |
| tree | 284db782d898b643ed38cf394d2f1f937ef45daf /sys/dev | |
| parent | aa9665054a6f856276a30413301dcdf085dca762 (diff) | |
drm/i915: Move cec_notifier to intel_hdmi_connector_unregister, v2.
From Maarten Lankhorst
bc4727542c394ac99e1826e35d708d83088591d3 in linux 5.7.y/5.7.10
6647e6cdba753e71170be7da2acfead7154f56d8 in mainline linux
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/drm/i915/display/intel_hdmi.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sys/dev/pci/drm/i915/display/intel_hdmi.c b/sys/dev/pci/drm/i915/display/intel_hdmi.c index ece35066955..d602727571a 100644 --- a/sys/dev/pci/drm/i915/display/intel_hdmi.c +++ b/sys/dev/pci/drm/i915/display/intel_hdmi.c @@ -2825,19 +2825,13 @@ intel_hdmi_connector_register(struct drm_connector *connector) return ret; } -static void intel_hdmi_destroy(struct drm_connector *connector) +static void intel_hdmi_connector_unregister(struct drm_connector *connector) { struct cec_notifier *n = intel_attached_hdmi(to_intel_connector(connector))->cec_notifier; cec_notifier_conn_unregister(n); - intel_connector_destroy(connector); -} - -static void intel_hdmi_connector_unregister(struct drm_connector *connector) -{ intel_hdmi_remove_i2c_symlink(connector); - intel_connector_unregister(connector); } @@ -2849,7 +2843,7 @@ static const struct drm_connector_funcs intel_hdmi_connector_funcs = { .atomic_set_property = intel_digital_connector_atomic_set_property, .late_register = intel_hdmi_connector_register, .early_unregister = intel_hdmi_connector_unregister, - .destroy = intel_hdmi_destroy, + .destroy = intel_connector_destroy, .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, .atomic_duplicate_state = intel_digital_connector_duplicate_state, }; |