| @@ -956,27 +956,29 @@ int drm_helper_resume_force_mode(struct | | | @@ -956,27 +956,29 @@ int drm_helper_resume_force_mode(struct |
| 956 | (*crtc_funcs->dpms) (crtc, | | 956 | (*crtc_funcs->dpms) (crtc, |
| 957 | drm_helper_choose_crtc_dpms(crtc)); | | 957 | drm_helper_choose_crtc_dpms(crtc)); |
| 958 | } | | 958 | } |
| 959 | } | | 959 | } |
| 960 | /* disable the unused connectors while restoring the modesetting */ | | 960 | /* disable the unused connectors while restoring the modesetting */ |
| 961 | drm_helper_disable_unused_functions(dev); | | 961 | drm_helper_disable_unused_functions(dev); |
| 962 | return 0; | | 962 | return 0; |
| 963 | } | | 963 | } |
| 964 | EXPORT_SYMBOL(drm_helper_resume_force_mode); | | 964 | EXPORT_SYMBOL(drm_helper_resume_force_mode); |
| 965 | | | 965 | |
| 966 | void drm_kms_helper_hotplug_event(struct drm_device *dev) | | 966 | void drm_kms_helper_hotplug_event(struct drm_device *dev) |
| 967 | { | | 967 | { |
| 968 | /* send a uevent + call fbdev */ | | 968 | /* send a uevent + call fbdev */ |
| | | 969 | #ifndef __NetBSD__ /* XXX pmf event or something? */ |
| 969 | drm_sysfs_hotplug_event(dev); | | 970 | drm_sysfs_hotplug_event(dev); |
| | | 971 | #endif |
| 970 | if (dev->mode_config.funcs->output_poll_changed) | | 972 | if (dev->mode_config.funcs->output_poll_changed) |
| 971 | dev->mode_config.funcs->output_poll_changed(dev); | | 973 | dev->mode_config.funcs->output_poll_changed(dev); |
| 972 | } | | 974 | } |
| 973 | EXPORT_SYMBOL(drm_kms_helper_hotplug_event); | | 975 | EXPORT_SYMBOL(drm_kms_helper_hotplug_event); |
| 974 | | | 976 | |
| 975 | #define DRM_OUTPUT_POLL_PERIOD (10*HZ) | | 977 | #define DRM_OUTPUT_POLL_PERIOD (10*HZ) |
| 976 | static void output_poll_execute(struct work_struct *work) | | 978 | static void output_poll_execute(struct work_struct *work) |
| 977 | { | | 979 | { |
| 978 | struct delayed_work *delayed_work = to_delayed_work(work); | | 980 | struct delayed_work *delayed_work = to_delayed_work(work); |
| 979 | struct drm_device *dev = container_of(delayed_work, struct drm_device, mode_config.output_poll_work); | | 981 | struct drm_device *dev = container_of(delayed_work, struct drm_device, mode_config.output_poll_work); |
| 980 | struct drm_connector *connector; | | 982 | struct drm_connector *connector; |
| 981 | enum drm_connector_status old_status; | | 983 | enum drm_connector_status old_status; |
| 982 | bool repoll = false, changed = false; | | 984 | bool repoll = false, changed = false; |