Wed Jul 24 02:46:11 2013 UTC ()
Ifdef out calls to drm_sysfs_connector_remove in drm_crtc.c.

Revisit later, perhaps.


(riastradh)
diff -r1.1.1.1.2.13 -r1.1.1.1.2.14 src/sys/external/bsd/drm2/dist/drm/drm_crtc.c

cvs diff -r1.1.1.1.2.13 -r1.1.1.1.2.14 src/sys/external/bsd/drm2/dist/drm/drm_crtc.c (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/dist/drm/drm_crtc.c 2013/07/24 02:21:59 1.1.1.1.2.13
+++ src/sys/external/bsd/drm2/dist/drm/drm_crtc.c 2013/07/24 02:46:11 1.1.1.1.2.14
@@ -622,31 +622,33 @@ void drm_connector_cleanup(struct drm_co @@ -622,31 +622,33 @@ void drm_connector_cleanup(struct drm_co
622 list_for_each_entry_safe(mode, t, &connector->user_modes, head) 622 list_for_each_entry_safe(mode, t, &connector->user_modes, head)
623 drm_mode_remove(connector, mode); 623 drm_mode_remove(connector, mode);
624 624
625 mutex_lock(&dev->mode_config.mutex); 625 mutex_lock(&dev->mode_config.mutex);
626 drm_mode_object_put(dev, &connector->base); 626 drm_mode_object_put(dev, &connector->base);
627 list_del(&connector->head); 627 list_del(&connector->head);
628 dev->mode_config.num_connector--; 628 dev->mode_config.num_connector--;
629 mutex_unlock(&dev->mode_config.mutex); 629 mutex_unlock(&dev->mode_config.mutex);
630} 630}
631EXPORT_SYMBOL(drm_connector_cleanup); 631EXPORT_SYMBOL(drm_connector_cleanup);
632 632
633void drm_connector_unplug_all(struct drm_device *dev) 633void drm_connector_unplug_all(struct drm_device *dev)
634{ 634{
 635#ifndef __NetBSD__
635 struct drm_connector *connector; 636 struct drm_connector *connector;
636 637
637 /* taking the mode config mutex ends up in a clash with sysfs */ 638 /* taking the mode config mutex ends up in a clash with sysfs */
638 list_for_each_entry(connector, &dev->mode_config.connector_list, head) 639 list_for_each_entry(connector, &dev->mode_config.connector_list, head)
639 drm_sysfs_connector_remove(connector); 640 drm_sysfs_connector_remove(connector);
 641#endif
640 642
641} 643}
642EXPORT_SYMBOL(drm_connector_unplug_all); 644EXPORT_SYMBOL(drm_connector_unplug_all);
643 645
644int drm_encoder_init(struct drm_device *dev, 646int drm_encoder_init(struct drm_device *dev,
645 struct drm_encoder *encoder, 647 struct drm_encoder *encoder,
646 const struct drm_encoder_funcs *funcs, 648 const struct drm_encoder_funcs *funcs,
647 int encoder_type) 649 int encoder_type)
648{ 650{
649 int ret; 651 int ret;
650 652
651 mutex_lock(&dev->mode_config.mutex); 653 mutex_lock(&dev->mode_config.mutex);
652 654