drm/i915: fix port checks for MST support on gen >= 11 (10d987fd) · Commits · 戴 / test

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

+2 −5

Original line number	Diff line number	Diff line
		@@ -7468,9 +7468,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);

+16 −6

Original line number	Diff line number	Diff line
		@@ -655,21 +655,31 @@ intel_dp_mst_encoder_active_links(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;
		}