Commit 6fe7b1d1 authored by Imre Deak's avatar Imre Deak
Browse files

drm/i915/dp_mst: Expose a connector to kernel users after it's properly initialized 



After a connector is added to the drm_mode_config::connector_list, it's
visible to any in-kernel users looking up connectors via the above list.
Make sure that the connector is properly initialized before such
look-ups, by initializing the connector with
drm_connector_dynamic_init() - which doesn't add the connector to the
list - and registering it with drm_connector_dynamic_register() - which
adds the connector to the list - after the initialization is complete.

v2:
- Rebase on the change which moves adding the connector to the
  connector list only later when calling
  drm_connector_dynamic_register().

v3:
- Rebase on drm-misc-next, due to a trivial conflict with
  commit 5503f811 ("drm/i915/mst: unify MST topology callback naming ..."),
  which is only in drm-intel-next.
- Fix s/drm_connector_dynamic_register()/drm_connector_dynamic_init()
  typo in the commit log.

Cc: Lyude Paul <lyude@redhat.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> (v1)
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241211230328.4012496-6-imre.deak@intel.com
parent 0f7c05b3

drivers/gpu/drm/i915/display/intel_dp_mst.c

+9 −8
Original line number Diff line number Diff line
@@ -1715,6 +1715,8 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo 
	if (!intel_connector)

		return NULL;



	connector = &intel_connector->base;



	intel_connector->get_hw_state = intel_dp_mst_get_hw_state;

	intel_connector->sync_state = intel_dp_connector_sync_state;

	intel_connector->mst_port = intel_dp;
@@ -1723,20 +1725,19 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo 


	intel_dp_init_modeset_retry_work(intel_connector);



	intel_connector->dp.dsc_decompression_aux = drm_dp_mst_dsc_aux_for_port(port);

	intel_dp_mst_read_decompression_port_dsc_caps(intel_dp, intel_connector);

	intel_connector->dp.dsc_hblank_expansion_quirk =

		detect_dsc_hblank_expansion_quirk(intel_connector);



	connector = &intel_connector->base;

	ret = drm_connector_init(dev, connector, &intel_dp_mst_connector_funcs,

				 DRM_MODE_CONNECTOR_DisplayPort);

	ret = drm_connector_dynamic_init(&dev_priv->drm, connector, &intel_dp_mst_connector_funcs,

					 DRM_MODE_CONNECTOR_DisplayPort, NULL);

	if (ret) {

		drm_dp_mst_put_port_malloc(port);

		intel_connector_free(intel_connector);

		return NULL;

	}



	intel_connector->dp.dsc_decompression_aux = drm_dp_mst_dsc_aux_for_port(port);

	intel_dp_mst_read_decompression_port_dsc_caps(intel_dp, intel_connector);

	intel_connector->dp.dsc_hblank_expansion_quirk =

		detect_dsc_hblank_expansion_quirk(intel_connector);



	drm_connector_helper_add(connector, &intel_dp_mst_connector_helper_funcs);



	for_each_pipe(dev_priv, pipe) {