Commit 959294e4 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2023-06-05' of git://anongit.freedesktop.org/drm/drm-intel into drm-next 



drm/i915 features for v6.5:

Features and functionality:
- Meteorlake (MTL) display enabling (Mika, Radhakrishna, José, Ankit, Clint,
  Gustavo, Imre, Anusha, Juha-Pekka, Matt)
- Allow VRR to be toggled during fastsets (Ville)
- Allow arbitrary refresh rates with VRR eDP panels (Ville)
- Support async flips on linear buffers on display ver 12+  (Arun)
- New debugfs for display clock frequencies (Bhanuprakash)
- Taint kernel when force probing unsupported devices (Jani)
- Expose CRTC CTM property on ILK/SNB/VLV (Ville)

DRM subsystem changes:
- EDID changes to support further conversion to struct drm_edid (Jani)
- Move i915 DSC parameter code to common DRM helpers (Dmitry Baryshkov)

Refactoring and cleanups:
- CSC color refactoring (Ville)
- VRR cleanups (Ville)
- Finish i915 conversion to struct drm_edid (Jani)
- Start high level display driver file (Jani)
- Hotplug refactoring (Ville)
- Misc display refactoring and cleanups (Jani, Ville)
- Use device based logging for state checker warnings (Jani)
- Split out hotplug and display irq handling (Jani)
- Move display device info and probe under display/ (Matt)
- HDCP cleanups (Suraj)
- Use localized warning ignores instead of per file (Jani)
- Remove superfluous enum i915_drm_suspend_mode (Maarten)
- PSR, pfit, scaler and chicken register definition cleanups (Ville)
- Constify pointers to hwmon_channel_info (Krzysztof Kozlowski)
- Replace all non-returning strlcpy with strscpy (Azeem Shaikh)
- Refactor VBT aux channel and DDC pin mapping (Ville)
- Include cleanups (Jani)

Fixes:
- Fix modeset locking issue in DP MST HDCP (Suraj)
- Fix disconnected Type-C/DP-alt disable at probe (Imre)
- Fix HDMI PCON DSC usage and color conversions (Ankit)
- Fix g4x HDMI infoframe/audio transmission port usage (Ville)
- Avoid use-after-free when DP connector init fails (Maarten)
- Fix voltage level for 480 MHz CDCLK (Chaitanya)
- Check HPD live state during eDP probe (Ville)
- Fix active port PLL selection for secondary MST streams (Imre)
- Check pipe source size when using SKL+ scalers (Ville)
- Fix MIPI DSI sleep sequences (Hans de Goede)
- Fix DPCD register write order to match 128b/132b requirement (Arun)
- Increase AUX timeout for Type-C (Suraj)
- Communicate display power demands to pcode (Stan)
- Fix potential division by zero in DSC compute config (Nikita Zhandarovich)
- Fix fast wake AUX sync length (Jouni)
- Fix potential oops on intel_get_crtc_new_encoder() (Ville)

Merges:
- drm-next backmerges (Rodrigo, Jani)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87zg5eat32.fsf@intel.com
parents 45365b65 619a06db

drivers/gpu/drm/display/drm_dp_mst_topology.c

+43 −12
Original line number Diff line number Diff line
@@ -1823,7 +1823,7 @@ static void drm_dp_destroy_port(struct kref *kref) 
		return;

	}



	kfree(port->cached_edid);

	drm_edid_free(port->cached_edid);



	/*

	 * we can't destroy the connector here, as we might be holding the
@@ -2272,7 +2272,7 @@ drm_dp_mst_port_add_connector(struct drm_dp_mst_branch *mstb, 
	if (port->pdt != DP_PEER_DEVICE_NONE &&

	    drm_dp_mst_is_end_device(port->pdt, port->mcs) &&

	    port->port_num >= DP_MST_LOGICAL_PORT_0)

		port->cached_edid = drm_get_edid(port->connector,

		port->cached_edid = drm_edid_read_ddc(port->connector,

						      &port->aux.ddc);



	drm_connector_register(port->connector);
@@ -4133,7 +4133,7 @@ drm_dp_mst_detect_port(struct drm_connector *connector, 
		ret = connector_status_connected;

		/* for logical ports - cache the EDID */

		if (port->port_num >= DP_MST_LOGICAL_PORT_0 && !port->cached_edid)

			port->cached_edid = drm_get_edid(connector, &port->aux.ddc);

			port->cached_edid = drm_edid_read_ddc(connector, &port->aux.ddc);

		break;

	case DP_PEER_DEVICE_DP_LEGACY_CONV:

		if (port->ldps)
@@ -4147,7 +4147,7 @@ drm_dp_mst_detect_port(struct drm_connector *connector, 
EXPORT_SYMBOL(drm_dp_mst_detect_port);



/**

 * drm_dp_mst_get_edid() - get EDID for an MST port

 * drm_dp_mst_edid_read() - get EDID for an MST port

 * @connector: toplevel connector to get EDID for

 * @mgr: manager for this port

 * @port: unverified pointer to a port.
@@ -4156,9 +4156,11 @@ EXPORT_SYMBOL(drm_dp_mst_detect_port); 
 * It validates the pointer still exists so the caller doesn't require a

 * reference.

 */

struct edid *drm_dp_mst_get_edid(struct drm_connector *connector, struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port)

const struct drm_edid *drm_dp_mst_edid_read(struct drm_connector *connector,

					    struct drm_dp_mst_topology_mgr *mgr,

					    struct drm_dp_mst_port *port)

{

	struct edid *edid = NULL;

	const struct drm_edid *drm_edid;



	/* we need to search for the port in the mgr in case it's gone */

	port = drm_dp_mst_topology_get_port_validated(mgr, port);
@@ -4166,12 +4168,41 @@ struct edid *drm_dp_mst_get_edid(struct drm_connector *connector, struct drm_dp_ 
		return NULL;



	if (port->cached_edid)

		edid = drm_edid_duplicate(port->cached_edid);

	else {

		edid = drm_get_edid(connector, &port->aux.ddc);

	}

	port->has_audio = drm_detect_monitor_audio(edid);

		drm_edid = drm_edid_dup(port->cached_edid);

	else

		drm_edid = drm_edid_read_ddc(connector, &port->aux.ddc);



	drm_dp_mst_topology_put_port(port);



	return drm_edid;

}

EXPORT_SYMBOL(drm_dp_mst_edid_read);



/**

 * drm_dp_mst_get_edid() - get EDID for an MST port

 * @connector: toplevel connector to get EDID for

 * @mgr: manager for this port

 * @port: unverified pointer to a port.

 *

 * This function is deprecated; please use drm_dp_mst_edid_read() instead.

 *

 * This returns an EDID for the port connected to a connector,

 * It validates the pointer still exists so the caller doesn't require a

 * reference.

 */

struct edid *drm_dp_mst_get_edid(struct drm_connector *connector,

				 struct drm_dp_mst_topology_mgr *mgr,

				 struct drm_dp_mst_port *port)

{

	const struct drm_edid *drm_edid;

	struct edid *edid;



	drm_edid = drm_dp_mst_edid_read(connector, mgr, port);



	edid = drm_edid_duplicate(drm_edid_raw(drm_edid));



	drm_edid_free(drm_edid);



	return edid;

}

EXPORT_SYMBOL(drm_dp_mst_get_edid);