From: Jani Nikula <jani.nikula@intel.com>
Date: Tue, 7 Jan 2025 16:07:54 +0000 (+0200)
Subject: Merge drm/drm-next into drm-intel-next
X-Git-Tag: v6.14-rc1~174^2~8^2~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f0f335b73a9264050e031879ad04c551c05959c;p=thirdparty%2Fkernel%2Flinux.git

Merge drm/drm-next into drm-intel-next

Backmerge to get the DRM DP payload and ACT helpers to drm-intel-next.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---

6f0f335b73a9264050e031879ad04c551c05959c
diff --cc drivers/gpu/drm/i915/display/intel_dp_mst.c
index 7d9a164a7556d,56ca571e534c5..0433f2ff77e19
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@@ -1695,7 -1715,9 +1695,9 @@@ mst_topology_add_connector(struct drm_d
  	if (!intel_connector)
  		return NULL;
  
+ 	connector = &intel_connector->base;
+ 
 -	intel_connector->get_hw_state = intel_dp_mst_get_hw_state;
 +	intel_connector->get_hw_state = mst_connector_get_hw_state;
  	intel_connector->sync_state = intel_dp_connector_sync_state;
  	intel_connector->mst_port = intel_dp;
  	intel_connector->port = port;
@@@ -1703,33 -1725,22 +1705,22 @@@
  
  	intel_dp_init_modeset_retry_work(intel_connector);
  
- 	/*
- 	 * TODO: The following drm_connector specific initialization belongs
- 	 * to DRM core, however it happens atm too late in
- 	 * drm_connector_init(). That function will also expose the connector
- 	 * to in-kernel users, so it can't be called until the connector is
- 	 * sufficiently initialized; init the device pointer used by the
- 	 * following DSC setup, until a fix moving this to DRM core.
- 	 */
- 	intel_connector->base.dev = mgr->dev;
- 
- 	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(display->drm, connector, &mst_connector_funcs,
- 				 DRM_MODE_CONNECTOR_DisplayPort);
 -	ret = drm_connector_dynamic_init(&dev_priv->drm, connector, &intel_dp_mst_connector_funcs,
++	ret = drm_connector_dynamic_init(display->drm, connector, &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);
 +	drm_connector_helper_add(connector, &mst_connector_helper_funcs);
  
 -	for_each_pipe(dev_priv, pipe) {
 +	for_each_pipe(display, pipe) {
  		struct drm_encoder *enc =
  			&intel_dp->mst_encoders[pipe]->base.base;