drm: Extract drm_encoder.[hc]

Same treatment as before. Only hiccup is drm_crtc_mask, which
unfortunately can't be resolved until drm_crtc.h is less of a monster.
Untangle the header loop with a forward declaration for that static
inline.

Reviewed-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20160829082757.17913-1-daniel.vetter@ffwll.ch

1 files changed, 0 insertions, 193 deletions

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 7f2510524f09..219cd4ee23b7 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -54,18 +54,6 @@ static const struct drm_prop_enum_list drm_plane_type_enum_list[] = {
         { DRM_PLANE_TYPE_CURSOR, "Cursor" },
 };
 
-static const struct drm_prop_enum_list drm_encoder_enum_list[] = {
-        { DRM_MODE_ENCODER_NONE, "None" },
-        { DRM_MODE_ENCODER_DAC, "DAC" },
-        { DRM_MODE_ENCODER_TMDS, "TMDS" },
-        { DRM_MODE_ENCODER_LVDS, "LVDS" },
-        { DRM_MODE_ENCODER_TVDAC, "TV" },
-        { DRM_MODE_ENCODER_VIRTUAL, "Virtual" },
-        { DRM_MODE_ENCODER_DSI, "DSI" },
-        { DRM_MODE_ENCODER_DPMST, "DP MST" },
-        { DRM_MODE_ENCODER_DPI, "DPI" },
-};
-
 /*
  * Optional properties
  */
@@ -419,117 +407,6 @@ void drm_crtc_cleanup(struct drm_crtc *crtc)
 }
 EXPORT_SYMBOL(drm_crtc_cleanup);
 
-static int drm_encoder_register_all(struct drm_device *dev)
-{
-        struct drm_encoder *encoder;
-        int ret = 0;
-
-        drm_for_each_encoder(encoder, dev) {
-                if (encoder->funcs->late_register)
-                        ret = encoder->funcs->late_register(encoder);
-                if (ret)
-                        return ret;
-        }
-
-        return 0;
-}
-
-static void drm_encoder_unregister_all(struct drm_device *dev)
-{
-        struct drm_encoder *encoder;
-
-        drm_for_each_encoder(encoder, dev) {
-                if (encoder->funcs->early_unregister)
-                        encoder->funcs->early_unregister(encoder);
-        }
-}
-
-/**
- * drm_encoder_init - Init a preallocated encoder
- * @dev: drm device
- * @encoder: the encoder to init
- * @funcs: callbacks for this encoder
- * @encoder_type: user visible type of the encoder
- * @name: printf style format string for the encoder name, or NULL for default name
- *
- * Initialises a preallocated encoder. Encoder should be
- * subclassed as part of driver encoder objects.
- *
- * Returns:
- * Zero on success, error code on failure.
- */
-int drm_encoder_init(struct drm_device *dev,
-                      struct drm_encoder *encoder,
-                      const struct drm_encoder_funcs *funcs,
-                      int encoder_type, const char *name, ...)
-{
-        int ret;
-
-        drm_modeset_lock_all(dev);
-
-        ret = drm_mode_object_get(dev, &encoder->base, DRM_MODE_OBJECT_ENCODER);
-        if (ret)
-                goto out_unlock;
-
-        encoder->dev = dev;
-        encoder->encoder_type = encoder_type;
-        encoder->funcs = funcs;
-        if (name) {
-                va_list ap;
-
-                va_start(ap, name);
-                encoder->name = kvasprintf(GFP_KERNEL, name, ap);
-                va_end(ap);
-        } else {
-                encoder->name = kasprintf(GFP_KERNEL, "%s-%d",
-                                          drm_encoder_enum_list[encoder_type].name,
-                                          encoder->base.id);
-        }
-        if (!encoder->name) {
-                ret = -ENOMEM;
-                goto out_put;
-        }
-
-        list_add_tail(&encoder->head, &dev->mode_config.encoder_list);
-        encoder->index = dev->mode_config.num_encoder++;
-
-out_put:
-        if (ret)
-                drm_mode_object_unregister(dev, &encoder->base);
-
-out_unlock:
-        drm_modeset_unlock_all(dev);
-
-        return ret;
-}
-EXPORT_SYMBOL(drm_encoder_init);
-
-/**
- * drm_encoder_cleanup - cleans up an initialised encoder
- * @encoder: encoder to cleanup
- *
- * Cleans up the encoder but doesn't free the object.
- */
-void drm_encoder_cleanup(struct drm_encoder *encoder)
-{
-        struct drm_device *dev = encoder->dev;
-
-        /* Note that the encoder_list is considered to be static; should we
-         * remove the drm_encoder at runtime we would have to decrement all
-         * the indices on the drm_encoder after us in the encoder_list.
-         */
-
-        drm_modeset_lock_all(dev);
-        drm_mode_object_unregister(dev, &encoder->base);
-        kfree(encoder->name);
-        list_del(&encoder->head);
-        dev->mode_config.num_encoder--;
-        drm_modeset_unlock_all(dev);
-
-        memset(encoder, 0, sizeof(*encoder));
-}
-EXPORT_SYMBOL(drm_encoder_cleanup);
-
 static unsigned int drm_num_planes(struct drm_device *dev)
 {
         unsigned int num = 0;
@@ -1172,76 +1049,6 @@ int drm_mode_object_get_properties(struct drm_mode_object *obj, bool atomic,
         return 0;
 }
 
-static struct drm_crtc *drm_encoder_get_crtc(struct drm_encoder *encoder)
-{
-        struct drm_connector *connector;
-        struct drm_device *dev = encoder->dev;
-        bool uses_atomic = false;
-
-        /* For atomic drivers only state objects are synchronously updated and
-         * protected by modeset locks, so check those first. */
-        drm_for_each_connector(connector, dev) {
-                if (!connector->state)
-                        continue;
-
-                uses_atomic = true;
-
-                if (connector->state->best_encoder != encoder)
-                        continue;
-
-                return connector->state->crtc;
-        }
-
-        /* Don't return stale data (e.g. pending async disable). */
-        if (uses_atomic)
-                return NULL;
-
-        return encoder->crtc;
-}
-
-/**
- * drm_mode_getencoder - get encoder configuration
- * @dev: drm device for the ioctl
- * @data: data pointer for the ioctl
- * @file_priv: drm file for the ioctl call
- *
- * Construct a encoder configuration structure to return to the user.
- *
- * Called by the user via ioctl.
- *
- * Returns:
- * Zero on success, negative errno on failure.
- */
-int drm_mode_getencoder(struct drm_device *dev, void *data,
-                        struct drm_file *file_priv)
-{
-        struct drm_mode_get_encoder *enc_resp = data;
-        struct drm_encoder *encoder;
-        struct drm_crtc *crtc;
-
-        if (!drm_core_check_feature(dev, DRIVER_MODESET))
-                return -EINVAL;
-
-        encoder = drm_encoder_find(dev, enc_resp->encoder_id);
-        if (!encoder)
-                return -ENOENT;
-
-        drm_modeset_lock(&dev->mode_config.connection_mutex, NULL);
-        crtc = drm_encoder_get_crtc(encoder);
-        if (crtc)
-                enc_resp->crtc_id = crtc->base.id;
-        else
-                enc_resp->crtc_id = 0;
-        drm_modeset_unlock(&dev->mode_config.connection_mutex);
-
-        enc_resp->encoder_type = encoder->encoder_type;
-        enc_resp->encoder_id = encoder->base.id;
-        enc_resp->possible_crtcs = encoder->possible_crtcs;
-        enc_resp->possible_clones = encoder->possible_clones;
-
-        return 0;
-}
-
 /**
  * drm_mode_getplane_res - enumerate all plane resources
  * @dev: DRM device