Rev 6084 | Rev 6937 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 6084 | Rev 6660 | ||
---|---|---|---|
Line 475... | Line 475... | ||
475 | struct drm_connector *connector) |
475 | struct drm_connector *connector) |
476 | { |
476 | { |
477 | struct intel_connector *intel_connector = to_intel_connector(connector); |
477 | struct intel_connector *intel_connector = to_intel_connector(connector); |
478 | struct drm_device *dev = connector->dev; |
478 | struct drm_device *dev = connector->dev; |
Line -... | Line 479... | ||
- | 479 | ||
- | 480 | intel_connector->unregister(intel_connector); |
|
479 | 481 | ||
480 | /* need to nuke the connector */ |
482 | /* need to nuke the connector */ |
481 | drm_modeset_lock_all(dev); |
483 | drm_modeset_lock_all(dev); |
482 | if (connector->state->crtc) { |
484 | if (connector->state->crtc) { |
483 | struct drm_mode_set set; |
485 | struct drm_mode_set set; |
Line 488... | Line 490... | ||
488 | 490 | ||
Line 489... | Line 491... | ||
489 | ret = drm_atomic_helper_set_config(&set); |
491 | ret = drm_atomic_helper_set_config(&set); |
490 | 492 | ||
491 | WARN(ret, "Disabling mst crtc failed with %i\n", ret); |
- | |
Line 492... | Line -... | ||
492 | } |
- | |
493 | drm_modeset_unlock_all(dev); |
- | |
494 | - | ||
495 | intel_connector->unregister(intel_connector); |
493 | WARN(ret, "Disabling mst crtc failed with %i\n", ret); |
496 | 494 | } |
|
497 | drm_modeset_lock_all(dev); |
495 | |
Line 498... | Line 496... | ||
498 | intel_connector_remove_from_fbdev(intel_connector); |
496 | intel_connector_remove_from_fbdev(intel_connector); |