drm/i915/mst: Hookup DRM DP MST late_register/early_unregister callbacks
Subsystems (3)
PATCH 1/1 drm/i915/mst: Hookup DRM DP MST late_register/early_unregister callbacks
i915 can enable aux device nodes for DP MST by calling drm_dp_mst_connector_late_register()/drm_dp_mst_connector_early_unregister(), so let's hook that up.
--- drivers/gpu/drm/i915/display/intel_dp_mst.c | 22 +++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_dp_mst.c +20 -2
@@ -548,12 +548,30 @@ static int intel_dp_mst_get_ddc_modes(struct drm_connector *connector)return ret; } +static int +intel_dp_mst_connector_late_register (struct drm_connector *connector) +{ +struct intel_connector *intel_connector =to_intel_connector (connector); + +return drm_dp_mst_connector_late_register (connector, + intel_connector->port); +} + +static void +intel_dp_mst_connector_early_unregister (struct drm_connector *connector) +{ +struct intel_connector *intel_connector =to_intel_connector (connector); + +drm_dp_mst_connector_early_unregister (connector, + intel_connector->port); +} +static const struct drm_connector_funcs intel_dp_mst_connector_funcs = { .fill_modes = drm_helper_probe_single_connector_modes, .atomic_get_property = intel_digital_connector_atomic_get_property, .atomic_set_property = intel_digital_connector_atomic_set_property, - .late_register = intel_connector_register, - .early_unregister = intel_connector_unregister, + .late_register = intel_dp_mst_connector_late_register, + .early_unregister = intel_dp_mst_connector_early_unregister, .destroy = intel_connector_destroy, .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, .atomic_duplicate_state = intel_digital_connector_duplicate_state,
Signature · 1 line
2.24.1
Quoted 3 lines · Lyude Paul
i915 can enable aux device nodes for DP MST by calling drm_dp_mst_connector_late_register()/drm_dp_mst_connector_early_unregister(), so let's hook that up.
Oh, we didn't have that yet? I thought it got hooked up for everyone but I guess not.
Quoted 30 lines
Cc Ville Syrjälä <[email protected]>Cc Manasi Navare <[email protected]>Cc "Lee, Shawn C" <[email protected]>Signed-off-by Lyude Paul <[email protected]>--- drivers/gpu/drm/i915/display/intel_dp_mst.c | 22 +++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/display/intel_dp_mst.c +13
-0@@ -548,12 +548,30 @@ static int intel_dp_mst_get_ddc_modes(struct drm_connector *connector)return ret; } +static int +intel_dp_mst_connector_late_register (struct drm_connector *connector) +{ +struct intel_connector *intel_connector =to_intel_connector (connector); + +return drm_dp_mst_connector_late_register (connector, + intel_connector->port); +} + +static void +intel_dp_mst_connector_early_unregister (struct drm_connector *connector) +{ +struct intel_connector *intel_connector =to_intel_connector (connector);
drivers/gpu/drm/i915/display/intel_dp_mst.c static int intel_dp_mst_get_ddc_modes(struct drm_connector *connector) · line 555
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +5
-1+ +drm_dp_mst_connector_early_unregister (connector, + intel_connector->port); +} +static const struct drm_connector_funcs intel_dp_mst_connector_funcs = { .fill_modes = drm_helper_probe_single_connector_modes, .atomic_get_property = intel_digital_connector_atomic_get_property, .atomic_set_property = intel_digital_connector_atomic_set_property, - .late_register = intel_connector_register,
Dunno if we want to lose the error injection...
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2
-1- .early_unregister = intel_connector_unregister, + .late_register = intel_dp_mst_connector_late_register, + .early_unregister = intel_dp_mst_connector_early_unregister, .destroy = intel_connector_destroy, .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, .atomic_duplicate_state = intel_digital_connector_duplicate_state,Signature · 1 line
2.24.1
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 46 lines · Ville Syrjälä
Quoted 4 lines · Lyude Paul
i915 can enable aux device nodes for DP MST by calling drm_dp_mst_connector_late_register()/drm_dp_mst_connector_early_unregister (),
so let's hook that up.Oh, we didn't have that yet? I thought it got hooked up for everyone but I guess not.
Quoted 37 lines
Cc Ville Syrjälä <[email protected]>Cc Manasi Navare <[email protected]>Cc "Lee, Shawn C" <[email protected]>Signed-off-by Lyude Paul <[email protected]>--- drivers/gpu/drm/i915/display/intel_dp_mst.c | 22 +++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/display/intel_dp_mst.c +17
-0@@ -548,12 +548,30 @@ static int intel_dp_mst_get_ddc_modes(struct drm_connector *connector)return ret; } +static int +intel_dp_mst_connector_late_register (struct drm_connector *connector) +{ +struct intel_connector *intel_connector =to_intel_connector (connector); + +return drm_dp_mst_connector_late_register (connector, + intel_connector->port); +} + +static void +intel_dp_mst_connector_early_unregister (struct drm_connector *connector) +{ +struct intel_connector *intel_connector =to_intel_connector (connector); + +drm_dp_mst_connector_early_unregister (connector, + intel_connector->port); +}
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c static int intel_dp_mst_get_ddc_modes(struct drm_connector *connector) · line 555
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +1
-1+static const struct drm_connector_funcs intel_dp_mst_connector_funcs = { .fill_modes = drm_helper_probe_single_connector_modes, .atomic_get_property = intel_digital_connector_atomic_get_property, .atomic_set_property = intel_digital_connector_atomic_set_property, - .late_register = intel_connector_register,Dunno if we want to lose the error injection...
Gotcha, will send out a fixed respin in just a moment
Quoted 9 lines
Quoted 9 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2
-1- .early_unregister = intel_connector_unregister, + .late_register = intel_dp_mst_connector_late_register, + .early_unregister = intel_dp_mst_connector_early_unregister,drivers/gpu/drm/i915/display/intel_dp_mst.c +0
-0.destroy = intel_connector_destroy, .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, .atomic_duplicate_state = intel_digital_connector_duplicate_state,Signature · 1 line
2.24.1
Signature · 3 lines
Cheers, Lyude Paul (she/her) Associate Software Engineer at Red Hat