Rev 5060 | Rev 6084 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 5060 | Rev 5354 | ||
|---|---|---|---|
| Line 276... | Line 276... | ||
| 276 | 276 | ||
| 277 | return ret; |
277 | return ret; |
| Line 278... | Line 278... | ||
| 278 | } |
278 | } |
| 279 | 279 | ||
| 280 | static enum drm_connector_status |
280 | static enum drm_connector_status |
| 281 | intel_mst_port_dp_detect(struct drm_connector *connector) |
281 | intel_dp_mst_detect(struct drm_connector *connector, bool force) |
| 282 | { |
282 | { |
| Line 283... | Line 283... | ||
| 283 | struct intel_connector *intel_connector = to_intel_connector(connector); |
283 | struct intel_connector *intel_connector = to_intel_connector(connector); |
| 284 | struct intel_dp *intel_dp = intel_connector->mst_port; |
- | |
| 285 | - | ||
| 286 | return drm_dp_mst_detect_port(&intel_dp->mst_mgr, intel_connector->port); |
- | |
| 287 | } |
- | |
| 288 | - | ||
| 289 | static enum drm_connector_status |
- | |
| 290 | intel_dp_mst_detect(struct drm_connector *connector, bool force) |
- | |
| 291 | { |
- | |
| 292 | enum drm_connector_status status; |
284 | struct intel_dp *intel_dp = intel_connector->mst_port; |
| Line 293... | Line 285... | ||
| 293 | status = intel_mst_port_dp_detect(connector); |
285 | |
| 294 | return status; |
286 | return drm_dp_mst_detect_port(connector, &intel_dp->mst_mgr, intel_connector->port); |
| 295 | } |
287 | } |
| Line 391... | Line 383... | ||
| 391 | struct drm_i915_private *dev_priv = to_i915(connector->base.dev); |
383 | struct drm_i915_private *dev_priv = to_i915(connector->base.dev); |
| 392 | drm_fb_helper_remove_one_connector(&dev_priv->fbdev->helper, &connector->base); |
384 | drm_fb_helper_remove_one_connector(&dev_priv->fbdev->helper, &connector->base); |
| 393 | #endif |
385 | #endif |
| 394 | } |
386 | } |
| Line 395... | Line 387... | ||
| 395 | 387 | ||
| 396 | static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port, char *pathprop) |
388 | static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port, const char *pathprop) |
| 397 | { |
389 | { |
| 398 | struct intel_dp *intel_dp = container_of(mgr, struct intel_dp, mst_mgr); |
390 | struct intel_dp *intel_dp = container_of(mgr, struct intel_dp, mst_mgr); |
| 399 | struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); |
391 | struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); |
| 400 | struct drm_device *dev = intel_dig_port->base.base.dev; |
392 | struct drm_device *dev = intel_dig_port->base.base.dev; |
| Line 420... | Line 412... | ||
| 420 | &intel_dp->mst_encoders[i]->base.base); |
412 | &intel_dp->mst_encoders[i]->base.base); |
| 421 | } |
413 | } |
| 422 | intel_dp_add_properties(intel_dp, connector); |
414 | intel_dp_add_properties(intel_dp, connector); |
| Line 423... | Line 415... | ||
| 423 | 415 | ||
| - | 416 | drm_object_attach_property(&connector->base, dev->mode_config.path_property, 0); |
|
| - | 417 | drm_object_attach_property(&connector->base, dev->mode_config.tile_property, 0); |
|
| 424 | drm_object_attach_property(&connector->base, dev->mode_config.path_property, 0); |
418 | |
| 425 | drm_mode_connector_set_path_property(connector, pathprop); |
419 | drm_mode_connector_set_path_property(connector, pathprop); |
| 426 | drm_reinit_primary_mode_group(dev); |
420 | drm_reinit_primary_mode_group(dev); |
| 427 | mutex_lock(&dev->mode_config.mutex); |
421 | mutex_lock(&dev->mode_config.mutex); |
| 428 | intel_connector_add_to_fbdev(intel_connector); |
422 | intel_connector_add_to_fbdev(intel_connector); |