On Tue, Mar 10, 2020 at 02:28:54PM -0400, Lyude Paul wrote:
> 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.

> 
> 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(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c 
> b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> index d53978ed3c12..bcff2e06ead6 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> @@ -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,

Dunno if we want to lose the error injection...

> -     .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,
> -- 
> 2.24.1

-- 
Ville Syrjälä
Intel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to