Commit b3ca8a08 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2023-11-23' of... 

Merge tag 'drm-intel-fixes-2023-11-23' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

drm/i915 fixes for v6.7-rc3:
- Fix race between DP MST connectore registration and setup
- Fix GT memory leak on probe error path

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87y1eol98h.fsf@intel.com
parents 86921609 0561794b

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

+8 −8
Original line number Diff line number Diff line
@@ -1161,6 +1161,14 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo 
	intel_connector->port = port;

	drm_dp_mst_get_port_malloc(port);



	/*

	 * TODO: set the AUX for the actual MST port decompressing the stream.

	 * At the moment the driver only supports enabling this globally in the

	 * first downstream MST branch, via intel_dp's (root port) AUX.

	 */

	intel_connector->dp.dsc_decompression_aux = &intel_dp->aux;

	intel_dp_mst_read_decompression_port_dsc_caps(intel_dp, intel_connector);



	connector = &intel_connector->base;

	ret = drm_connector_init(dev, connector, &intel_dp_mst_connector_funcs,

				 DRM_MODE_CONNECTOR_DisplayPort);
@@ -1172,14 +1180,6 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo 


	drm_connector_helper_add(connector, &intel_dp_mst_connector_helper_funcs);



	/*

	 * TODO: set the AUX for the actual MST port decompressing the stream.

	 * At the moment the driver only supports enabling this globally in the

	 * first downstream MST branch, via intel_dp's (root port) AUX.

	 */

	intel_connector->dp.dsc_decompression_aux = &intel_dp->aux;

	intel_dp_mst_read_decompression_port_dsc_caps(intel_dp, intel_connector);



	for_each_pipe(dev_priv, pipe) {

		struct drm_encoder *enc =

			&intel_dp->mst_encoders[pipe]->base.base;

drivers/gpu/drm/i915/gt/intel_gt.c

+0 −11
Original line number Diff line number Diff line
@@ -982,8 +982,6 @@ int intel_gt_probe_all(struct drm_i915_private *i915) 


err:

	i915_probe_error(i915, "Failed to initialize %s! (%d)\n", gtdef->name, ret);

	intel_gt_release_all(i915);



	return ret;

}
@@ -1002,15 +1000,6 @@ int intel_gt_tiles_init(struct drm_i915_private *i915) 
	return 0;

}



void intel_gt_release_all(struct drm_i915_private *i915)

{

	struct intel_gt *gt;

	unsigned int id;



	for_each_gt(gt, i915, id)

		i915->gt[id] = NULL;

}



void intel_gt_info_print(const struct intel_gt_info *info,

			 struct drm_printer *p)

{

drivers/gpu/drm/i915/i915_driver.c

+1 −3
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	ret = i915_driver_mmio_probe(i915);

	if (ret < 0)

		goto out_tiles_cleanup;

		goto out_runtime_pm_put;



	ret = i915_driver_hw_probe(i915);

	if (ret < 0)
@@ -842,8 +842,6 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	i915_ggtt_driver_late_release(i915);

out_cleanup_mmio:

	i915_driver_mmio_release(i915);

out_tiles_cleanup:

	intel_gt_release_all(i915);

out_runtime_pm_put:

	enable_rpm_wakeref_asserts(&i915->runtime_pm);

	i915_driver_late_release(i915);