aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2016-07-13 12:39:07 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2016-07-19 04:04:54 -0400
commit6100598c4a2772bfc7a7a6518a4fea377337952b (patch)
tree5fb14177bccf74e9d9f8ec5250746546fe00d5e7
parentdc96fe4f85507e0423a0f9749ac3eea45d6dbc9b (diff)
drm: Unexport drm_connector_unregister_all()
This has now been removed from all drivers as it is performed centrally as a part of device unregistration for modesetting drivers. With the last user gone, we can unexport it from the DRM module. That requires us to move the code slightly to avoid the need for a forward declaration. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: dri-devel@lists.freedesktop.org Reviewed-by: Sean Paul <seanpaul@chromium.org> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1468427947-28037-2-git-send-email-chris@chris-wilson.co.uk
-rw-r--r--drivers/gpu/drm/drm_crtc.c29
-rw-r--r--include/drm/drm_crtc.h3
2 files changed, 9 insertions, 23 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 578bd6f5ce83..1dfbad947910 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -1107,6 +1107,15 @@ void drm_connector_unregister(struct drm_connector *connector)
1107} 1107}
1108EXPORT_SYMBOL(drm_connector_unregister); 1108EXPORT_SYMBOL(drm_connector_unregister);
1109 1109
1110static void drm_connector_unregister_all(struct drm_device *dev)
1111{
1112 struct drm_connector *connector;
1113
1114 /* FIXME: taking the mode config mutex ends up in a clash with sysfs */
1115 list_for_each_entry(connector, &dev->mode_config.connector_list, head)
1116 drm_connector_unregister(connector);
1117}
1118
1110static int drm_connector_register_all(struct drm_device *dev) 1119static int drm_connector_register_all(struct drm_device *dev)
1111{ 1120{
1112 struct drm_connector *connector; 1121 struct drm_connector *connector;
@@ -1130,26 +1139,6 @@ err:
1130 return ret; 1139 return ret;
1131} 1140}
1132 1141
1133/**
1134 * drm_connector_unregister_all - unregister connector userspace interfaces
1135 * @dev: drm device
1136 *
1137 * This functions unregisters all connectors from sysfs and other places so
1138 * that userspace can no longer access them. Drivers should call this as the
1139 * first step tearing down the device instace, or when the underlying
1140 * physical device disappeared (e.g. USB unplug), right before calling
1141 * drm_dev_unregister().
1142 */
1143void drm_connector_unregister_all(struct drm_device *dev)
1144{
1145 struct drm_connector *connector;
1146
1147 /* FIXME: taking the mode config mutex ends up in a clash with sysfs */
1148 list_for_each_entry(connector, &dev->mode_config.connector_list, head)
1149 drm_connector_unregister(connector);
1150}
1151EXPORT_SYMBOL(drm_connector_unregister_all);
1152
1153static int drm_encoder_register_all(struct drm_device *dev) 1142static int drm_encoder_register_all(struct drm_device *dev)
1154{ 1143{
1155 struct drm_encoder *encoder; 1144 struct drm_encoder *encoder;
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 9e6ab4a0c274..6b9df1137818 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -2587,9 +2587,6 @@ static inline unsigned drm_connector_index(struct drm_connector *connector)
2587 return connector->connector_id; 2587 return connector->connector_id;
2588} 2588}
2589 2589
2590/* helpers to {un}register all connectors from sysfs for device */
2591extern void drm_connector_unregister_all(struct drm_device *dev);
2592
2593extern __printf(5, 6) 2590extern __printf(5, 6)
2594int drm_encoder_init(struct drm_device *dev, 2591int drm_encoder_init(struct drm_device *dev,
2595 struct drm_encoder *encoder, 2592 struct drm_encoder *encoder,