WebSVN – Kolibri OS – Diff – /drivers/video/drm/i915/intel_dp_mst.c

  */
 #include
 #include "i915_drv.h"
+#include "intel_drv.h"
-#include "intel_drv.h"
+#include
 #include
 #include
 static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,
+					struct intel_crtc_state *pipe_config)
 					struct intel_crtc_config *pipe_config)
 	struct drm_device *dev = encoder->base.dev;
 	struct intel_dp_mst_encoder *intel_mst = enc_to_mst(&encoder->base);
 	struct intel_digital_port *intel_dig_port = intel_mst->primary;
 	struct intel_dp *intel_dp = &intel_dig_port->dp;
-	struct drm_device *dev = encoder->base.dev;
+	struct drm_atomic_state *state;
-	int bpp;
+	int bpp, i;
+	int lane_count, slots;
-	int lane_count, slots;
+	const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;
+	struct drm_connector *drm_connector;
-	struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode;
+	struct intel_connector *connector, *found = NULL;
-	struct intel_connector *found = NULL, *intel_connector;
+	struct drm_connector_state *connector_state;
 	int mst_pbn;
 	/*
 	 * for MST we always configure max link bw - the spec doesn't
 	 * seem to suggest we should do otherwise.
 	 */
 	lane_count = drm_dp_max_lane_count(intel_dp->dpcd);
-	intel_dp->link_bw = intel_dp_max_link_bw(intel_dp);
-	intel_dp->lane_count = lane_count;
+	pipe_config->lane_count = lane_count;
 	pipe_config->pipe_bpp = 24;
+	pipe_config->port_clock = intel_dp_max_link_rate(intel_dp);
-	pipe_config->port_clock = drm_dp_bw_code_to_link_rate(intel_dp->link_bw);
+	state = pipe_config->base.state;
+	for_each_connector_in_state(state, drm_connector, connector_state, i) {
+		connector = to_intel_connector(drm_connector);
-	list_for_each_entry(intel_connector, &dev->mode_config.connector_list, base.head) {
-		if (intel_connector->new_encoder == encoder) {
+		if (connector_state->best_encoder == &encoder->base) {
-			found = intel_connector;
+			found = connector;
 			break;
+		}
+	}
 	if (!found) {
 		DRM_ERROR("can't find connector\n");
 		return false;
+	}
-	mst_pbn = drm_dp_calc_pbn_mode(adjusted_mode->clock, bpp);
+	mst_pbn = drm_dp_calc_pbn_mode(adjusted_mode->crtc_clock, bpp);
 	pipe_config->pbn = mst_pbn;
 	slots = drm_dp_find_vcpi_slots(&intel_dp->mst_mgr, mst_pbn);
+	intel_link_compute_m_n(bpp, lane_count,
+			       adjusted_mode->crtc_clock,
+			       pipe_config->port_clock,
 			       &pipe_config->dp_m_n);
 	intel_link_compute_m_n(bpp, lane_count,
-			       adjusted_mode->crtc_clock,
+	pipe_config->dp_m_n.tu = slots;
 	struct drm_device *dev = encoder->base.dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	enum port port = intel_dig_port->port;
 	int ret;
 	uint32_t temp;
-	struct intel_connector *found = NULL, *intel_connector;
+	struct intel_connector *found = NULL, *connector;
 	int slots;
 	struct drm_crtc *crtc = encoder->base.crtc;
 	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-	list_for_each_entry(intel_connector, &dev->mode_config.connector_list, base.head) {
+	for_each_intel_connector(dev, connector) {
-		if (intel_connector->new_encoder == encoder) {
+		if (connector->base.state->best_encoder == &encoder->base) {
-			found = intel_connector;
+			found = connector;
 			break;
+		}
+	}
 	if (!found) {
 		DRM_ERROR("can't find connector\n");
+		return;
+	}
+	/* MST encoders are bound to a crtc, not to a connector,
+	 * force the mapping here for get_hw_state.
-		return;
+	 */
 	found->encoder = encoder;
 	DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links);
+	intel_mst->port = found->port;
+	if (intel_dp->active_mst_links == 0) {
+		enum port port = intel_ddi_get_encoder_port(encoder);
-	intel_mst->port = found->port;
+		intel_dp_set_link_params(intel_dp, intel_crtc->config);
-	if (intel_dp->active_mst_links == 0) {
+		/* FIXME: add support for SKL */
-		enum port port = intel_ddi_get_encoder_port(encoder);
+		if (INTEL_INFO(dev)->gen < 9)
-		I915_WRITE(PORT_CLK_SEL(port), intel_crtc->config.ddi_pll_sel);
+			I915_WRITE(PORT_CLK_SEL(port),
 				   intel_crtc->config->ddi_pll_sel);
 		intel_ddi_init_dp_buf_reg(&intel_dig_port->base);
+		intel_ddi_init_dp_buf_reg(&intel_dig_port->base);
 		intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);
 		intel_dp_start_link_train(intel_dp);
 		return true;
 	return false;
+}
 static void intel_dp_mst_enc_get_config(struct intel_encoder *encoder,
-					struct intel_crtc_config *pipe_config)
+					struct intel_crtc_state *pipe_config)
+{
 	struct intel_dp_mst_encoder *intel_mst = enc_to_mst(&encoder->base);
 	struct intel_digital_port *intel_dig_port = intel_mst->primary;
 	struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
 	struct drm_device *dev = encoder->base.dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
-	enum transcoder cpu_transcoder = crtc->config.cpu_transcoder;
+	enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;
 	u32 temp, flags = 0;
 		pipe_config->pipe_bpp = 36;
 		break;
 	default:
 		break;
+	}
-	pipe_config->adjusted_mode.flags |= flags;
+	pipe_config->base.adjusted_mode.flags |= flags;
+	pipe_config->lane_count =
+		((temp & DDI_PORT_WIDTH_MASK) >> DDI_PORT_WIDTH_SHIFT) + 1;
 	intel_dp_get_m_n(crtc, pipe_config);
 	intel_ddi_clock_get(&intel_dig_port->base, pipe_config);
 	drm_connector_cleanup(connector);
 	kfree(connector);
+}
 static const struct drm_connector_funcs intel_dp_mst_connector_funcs = {
-	.dpms = intel_connector_dpms,
+	.dpms = drm_atomic_helper_connector_dpms,
 	.detect = intel_dp_mst_detect,
 	.fill_modes = drm_helper_probe_single_connector_modes,
+	.set_property = intel_dp_mst_set_property,
-	.set_property = intel_dp_mst_set_property,
+	.atomic_get_property = intel_connector_atomic_get_property,
+	.destroy = intel_dp_mst_connector_destroy,
+	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
-	.destroy = intel_dp_mst_connector_destroy,
+	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
 };
 static int intel_dp_mst_get_modes(struct drm_connector *connector)
 		return MODE_H_ILLEGAL;
 	return MODE_OK;
+}
+static struct drm_encoder *intel_mst_atomic_best_encoder(struct drm_connector *connector,
+							 struct drm_connector_state *state)
+{
+	struct intel_connector *intel_connector = to_intel_connector(connector);
+	struct intel_dp *intel_dp = intel_connector->mst_port;
+	struct intel_crtc *crtc = to_intel_crtc(state->crtc);
+	return &intel_dp->mst_encoders[crtc->pipe]->base.base;
+}
 static struct drm_encoder *intel_mst_best_encoder(struct drm_connector *connector)
+{
 	struct intel_connector *intel_connector = to_intel_connector(connector);
 	struct intel_dp *intel_dp = intel_connector->mst_port;
 	return &intel_dp->mst_encoders[0]->base.base;
+}
+static const struct drm_connector_helper_funcs intel_dp_mst_connector_helper_funcs = {
-static const struct drm_connector_helper_funcs intel_dp_mst_connector_helper_funcs = {
+	.get_modes = intel_dp_mst_get_modes,
-	.get_modes = intel_dp_mst_get_modes,
+	.mode_valid = intel_dp_mst_mode_valid,
-	.mode_valid = intel_dp_mst_mode_valid,
+	.atomic_best_encoder = intel_mst_atomic_best_encoder,
 	.best_encoder = intel_mst_best_encoder,
 	.destroy = intel_dp_mst_encoder_destroy,
 };
 static bool intel_dp_mst_get_hw_state(struct intel_connector *connector)
 {
-	if (connector->encoder) {
+	if (connector->encoder && connector->base.state->crtc) {
 		enum pipe pipe;
 		if (!connector->encoder->get_hw_state(connector->encoder, &pipe))
 			return false;
 		return true;
+	}
 	return false;
+}
 static void intel_connector_add_to_fbdev(struct intel_connector *connector)
+{
-#ifdef CONFIG_DRM_I915_FBDEV
+#ifdef CONFIG_DRM_FBDEV_EMULATION
 	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
 	drm_fb_helper_add_one_connector(&dev_priv->fbdev->helper, &connector->base);
 #endif
+}
 static void intel_connector_remove_from_fbdev(struct intel_connector *connector)
+{
-#ifdef CONFIG_DRM_I915_FBDEV
+#ifdef CONFIG_DRM_FBDEV_EMULATION
 	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
 	struct drm_device *dev = intel_dig_port->base.base.dev;
 	struct intel_connector *intel_connector;
 	struct drm_connector *connector;
 	int i;
-	intel_connector = kzalloc(sizeof(*intel_connector), GFP_KERNEL);
+	intel_connector = intel_connector_alloc();
 	if (!intel_connector)
 		return NULL;
 	drm_object_attach_property(&connector->base, dev->mode_config.path_property, 0);
 	drm_object_attach_property(&connector->base, dev->mode_config.tile_property, 0);
+	drm_mode_connector_set_path_property(connector, pathprop);
+	return connector;
+}
+static void intel_dp_register_mst_connector(struct drm_connector *connector)
+{
-	drm_mode_connector_set_path_property(connector, pathprop);
+	struct intel_connector *intel_connector = to_intel_connector(connector);
-	drm_reinit_primary_mode_group(dev);
+	struct drm_device *dev = connector->dev;
-	mutex_lock(&dev->mode_config.mutex);
+	drm_modeset_lock_all(dev);
 	intel_connector_add_to_fbdev(intel_connector);
-	mutex_unlock(&dev->mode_config.mutex);
-	drm_connector_register(&intel_connector->base);
+	drm_modeset_unlock_all(dev);
-	return connector;
+	drm_connector_register(&intel_connector->base);
+}
 static void intel_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
 					   struct drm_connector *connector)
+{
 	struct intel_connector *intel_connector = to_intel_connector(connector);
+	struct drm_device *dev = connector->dev;
-	struct intel_connector *intel_connector = to_intel_connector(connector);
+	/* need to nuke the connector */
+	drm_modeset_lock_all(dev);
+	if (connector->state->crtc) {
+		struct drm_mode_set set;
-	struct drm_device *dev = connector->dev;
+		int ret;
-	/* need to nuke the connector */
+		memset(&set, 0, sizeof(set));
+		set.crtc = connector->state->crtc,
+		ret = drm_atomic_helper_set_config(&set);
-	mutex_lock(&dev->mode_config.mutex);
+		WARN(ret, "Disabling mst crtc failed with %i\n", ret);
-	intel_connector_dpms(connector, DRM_MODE_DPMS_OFF);
+	}
-	mutex_unlock(&dev->mode_config.mutex);
+	drm_modeset_unlock_all(dev);
-	intel_connector->unregister(intel_connector);
-	mutex_lock(&dev->mode_config.mutex);
+	intel_connector->unregister(intel_connector);
 	intel_connector_remove_from_fbdev(intel_connector);
-	drm_connector_cleanup(connector);
+	drm_modeset_lock_all(dev);
-	mutex_unlock(&dev->mode_config.mutex);
+	intel_connector_remove_from_fbdev(intel_connector);
 	drm_kms_helper_hotplug_event(dev);
+}
 static struct drm_dp_mst_topology_cbs mst_cbs = {
+	.add_connector = intel_dp_add_mst_connector,
-	.add_connector = intel_dp_add_mst_connector,
+	.register_connector = intel_dp_register_mst_connector,
 	.destroy_connector = intel_dp_destroy_mst_connector,
 	.hotplug = intel_dp_mst_hotplug,
 };

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/i915/intel_dp_mst.c @ 6660 – Rev 5354 → 6084