drm/i915: Assert that TypeC ports are not used for eDP (4e309baf) · Commits · 戴 / test

Add an assert that we don't use TypeC ports for eDP. That may in theory be possible on TypeC legacy ports, but I'm not sure if that's a practical scenario, so let's deal with that only if there's a use case. Adding support for that wouldn't be too difficult, since TypeC mode switching is not possible on TypeC legacy ports. Cc: Ville Syrjala <ville.syrjala@linux.intel.com> Signed-off-by:

Imre Deak <imre.deak@intel.com> Reviewed-by:

Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190509173446.31095-12-imre.deak@intel.com

drivers/gpu/drm/i915/intel_dp.c

+8 −2

Original line number	Original line	Diff line number	Diff line
	@@ -7206,10 +7206,16 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
	intel_dp->DP = I915_READ(intel_dp->output_reg);		intel_dp->DP = I915_READ(intel_dp->output_reg);
	intel_dp->attached_connector = intel_connector;		intel_dp->attached_connector = intel_connector;

	if (intel_dp_is_port_edp(dev_priv, port))		if (intel_dp_is_port_edp(dev_priv, port)) {
			/*
			* Currently we don't support eDP on TypeC ports, although in
			* theory it could work on TypeC legacy ports.
			*/
			WARN_ON(intel_port_is_tc(dev_priv, port));
	type = DRM_MODE_CONNECTOR_eDP;		type = DRM_MODE_CONNECTOR_eDP;
	else		} else {
	type = DRM_MODE_CONNECTOR_DisplayPort;		type = DRM_MODE_CONNECTOR_DisplayPort;
			}

	if (IS_VALLEYVIEW(dev_priv) \|\| IS_CHERRYVIEW(dev_priv))		if (IS_VALLEYVIEW(dev_priv) \|\| IS_CHERRYVIEW(dev_priv))
	intel_dp->active_pipe = vlv_active_pipe(intel_dp);		intel_dp->active_pipe = vlv_active_pipe(intel_dp);

Admin message