Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f13a4453 authored by Lucas De Marchi's avatar Lucas De Marchi Committed by Greg Kroah-Hartman
Browse files

drm/i915: fix port checks for MST support on gen >= 11 



[ Upstream commit 10d987fd1b7baceaafa78d805e71427ab735b4e4 ]

Both Ice Lake and Elkhart Lake (gen 11) support MST on all external
connections except DDI A. Tiger Lake (gen 12) supports on all external
connections.

Move the check to happen inside intel_dp_mst_encoder_init() and add
specific platform checks.

v2: Replace != with == checks for ports on gen < 11 (Ville)

Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191015164029.18431-3-lucas.demarchi@intel.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ce8fd1a4

drivers/gpu/drm/i915/intel_dp.c

+2 −5
Original line number Diff line number Diff line
@@ -6288,9 +6288,6 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, 
		intel_connector->get_hw_state = intel_connector_get_hw_state;



	/* init MST on ports that can support it */

	if (HAS_DP_MST(dev_priv) && !intel_dp_is_edp(intel_dp) &&

	    (port == PORT_B || port == PORT_C ||

	     port == PORT_D || port == PORT_F))

	intel_dp_mst_encoder_init(intel_dig_port,

				  intel_connector->base.base.id);

drivers/gpu/drm/i915/intel_dp_mst.c

+16 −6
Original line number Diff line number Diff line
@@ -588,21 +588,31 @@ intel_dp_create_fake_mst_encoders(struct intel_digital_port *intel_dig_port) 
int

intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_base_id)

{

	struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev);

	struct intel_dp *intel_dp = &intel_dig_port->dp;

	struct drm_device *dev = intel_dig_port->base.base.dev;

	enum port port = intel_dig_port->base.port;

	int ret;



	intel_dp->can_mst = true;

	if (!HAS_DP_MST(i915) || intel_dp_is_edp(intel_dp))

		return 0;



	if (INTEL_GEN(i915) < 12 && port == PORT_A)

		return 0;



	if (INTEL_GEN(i915) < 11 && port == PORT_E)

		return 0;



	intel_dp->mst_mgr.cbs = &mst_cbs;



	/* create encoders */

	intel_dp_create_fake_mst_encoders(intel_dig_port);

	ret = drm_dp_mst_topology_mgr_init(&intel_dp->mst_mgr, dev,

	ret = drm_dp_mst_topology_mgr_init(&intel_dp->mst_mgr, &i915->drm,

					   &intel_dp->aux, 16, 3, conn_base_id);

	if (ret) {

		intel_dp->can_mst = false;

	if (ret)

		return ret;

	}



	intel_dp->can_mst = true;



	return 0;

}