drm/i915/mst: Hookup DRM DP MST late_register/early_unregister callbacks
Subsystems (3)
PATCH v2 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.
Changes since v1:
* Call intel_connector_register/unregister() from intel_dp_mst_connector_late_register/unregister() so we don't lose error injection - Ville Syrjälä
--- drivers/gpu/drm/i915/display/intel_dp_mst.c | 28 +++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_dp_mst.c +26 -2
@@ -548,12 +548,36 @@ 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); +int ret; + + ret =drm_dp_mst_connector_late_register (connector, + intel_connector->port); +if (ret <0 ) +return ret; + +return intel_connector_register (connector); +} + +static void +intel_dp_mst_connector_early_unregister (struct drm_connector *connector) +{ +struct intel_connector *intel_connector =to_intel_connector (connector); + +intel_connector_unregister (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 27 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.
Changes since v1:
* Call intel_connector_register/unregister() from intel_dp_mst_connector_late_register/unregister() so we don't lose error injection - Ville Syrjälä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 | 28 +++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/display/intel_dp_mst.c +2
-0@@ -548,12 +548,36 @@ 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)
drivers/gpu/drm/i915/display/intel_dp_mst.c static int intel_dp_mst_get_ddc_modes(struct drm_connector *connector) · line 562
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +10
-0+{ +struct intel_connector *intel_connector =to_intel_connector (connector); +int ret; + + ret =drm_dp_mst_connector_late_register (connector, + intel_connector->port); +if (ret <0 ) +return ret; + +return intel_connector_register (connector);
Don't we have to undo the damage if this fails?
Quoted 25 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +14
-2+} + +static void +intel_dp_mst_connector_early_unregister (struct drm_connector *connector) +{ +struct intel_connector *intel_connector =to_intel_connector (connector); + +intel_connector_unregister (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
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 29 lines · Ville Syrjälä
Quoted 28 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.Changes since v1:
* Call intel_connector_register/unregister() from intel_dp_mst_connector_late_register/unregister() so we don't lose error injection - Ville Syrjälä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 | 28 +++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/display/intel_dp_mst.c +0
-0@@ -548,12 +548,36 @@ static int intel_dp_mst_get_ddc_modes(struct drm_connector *connector)return ret; }
Quoted 15 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c static int intel_dp_mst_get_ddc_modes(struct drm_connector *connector) · line 562
Quoted 13 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +12
-0+static int +intel_dp_mst_connector_late_register (struct drm_connector *connector) +{ +struct intel_connector *intel_connector =to_intel_connector (connector); +int ret; + + ret =drm_dp_mst_connector_late_register (connector, + intel_connector->port); +if (ret <0 ) +return ret; + +return intel_connector_register (connector);Don't we have to undo the damage if this fails?
Yep, whoops. Will send out another respin with this fixed
Quoted 27 lines
Quoted 27 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +14
-2+} + +static void +intel_dp_mst_connector_early_unregister (struct drm_connector *connector) +{ +struct intel_connector *intel_connector =to_intel_connector (connector); + +intel_connector_unregister (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,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 · 8 lines
Cheers, Lyude Paul (she/her) Associate Software Engineer at Red Hat _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 1/1 drm/i915/mst: Hookup DRM DP MST late_register/early_unregister callbacks
In reply to Lyude Pauli915 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.
Changes since v1:
* Call intel_connector_register/unregister() from intel_dp_mst_connector_late_register/unregister() so we don't lose error injection - Ville Syrjälä
Changes since v2:
* Don't forget to clean up if intel_connector_register() fails - Ville
--- drivers/gpu/drm/i915/display/intel_dp_mst.c | 33 +++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_dp_mst.c +31 -2
@@ -548,12 +548,41 @@ 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); +int ret; + + ret =drm_dp_mst_connector_late_register (connector, + intel_connector->port); +if (ret <0 ) +return ret; + + ret =intel_connector_register (connector); +if (ret <0 ) +drm_dp_mst_connector_early_unregister (connector, + intel_connector->port); + +return ret; +} + +static void +intel_dp_mst_connector_early_unregister (struct drm_connector *connector) +{ +struct intel_connector *intel_connector =to_intel_connector (connector); + +intel_connector_unregister (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 · 6 lines
2.24.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 11 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.
Changes since v1:
* Call intel_connector_register/unregister() from intel_dp_mst_connector_late_register/unregister() so we don't lose error injection - Ville Syrjälä
Changes since v2:
* Don't forget to clean up ifintel_connector_register()fails - Ville
Quoted 4 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]>
Quoted 54 lines
--- drivers/gpu/drm/i915/display/intel_dp_mst.c | 33 +++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/display/intel_dp_mst.c +31
-2@@ -548,12 +548,41 @@ 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); +int ret; + + ret =drm_dp_mst_connector_late_register (connector, + intel_connector->port); +if (ret <0 ) +return ret; + + ret =intel_connector_register (connector); +if (ret <0 ) +drm_dp_mst_connector_early_unregister (connector, + intel_connector->port); + +return ret; +} + +static void +intel_dp_mst_connector_early_unregister (struct drm_connector *connector) +{ +struct intel_connector *intel_connector =to_intel_connector (connector); + +intel_connector_unregister (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
Signature · 2 lines
Ville Syrjälä Intel
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/mst: Hookup DRM DP MST late_register/early_unregister callbacks (rev3)
In reply to Lyude Paul== Series Details ==
== Series Details ==
Series: drm/i915/mst: Hookup DRM DP MST late_register/early_unregister callbacks (rev3)
URL : https://patchwork.freedesktop.org/series/74532/
State : failure
== Summary ==
Applying: drm/i915/mst: Hookup DRM DP MST late_register/early_unregister callbacks Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_dp_mst.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx