Merge remote-tracking branches 'spi/fix/atmel', 'spi/fix/bcm2835', 'spi/fix/doc'...

[karo-tx-linux.git] / drivers / gpu / drm / exynos / exynos_drm_core.c

diff --git a/drivers/gpu/drm/exynos/exynos_drm_core.c b/drivers/gpu/drm/exynos/exynos_drm_core.c
index 4c9f972eaa0771c0b2d9c5ff0f5480da3dc1e93d..c68a6a2a9b5794558015abdeefb0e58c4958049d 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_core.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_core.c
@@ -15,46 +15,10 @@
 #include <drm/drmP.h>
 #include "exynos_drm_drv.h"
 #include "exynos_drm_crtc.h"
-#include "exynos_drm_encoder.h"
 #include "exynos_drm_fbdev.h"
 
 static LIST_HEAD(exynos_drm_subdrv_list);
 
-int exynos_drm_create_enc_conn(struct drm_device *dev,
-                                       struct exynos_drm_display *display)
-{
-       struct drm_encoder *encoder;
-       int ret;
-       unsigned long possible_crtcs = 0;
-
-       ret = exynos_drm_crtc_get_pipe_from_type(dev, display->type);
-       if (ret < 0)
-               return ret;
-
-       possible_crtcs |= 1 << ret;
-
-       /* create and initialize a encoder for this sub driver. */
-       encoder = exynos_drm_encoder_create(dev, display, possible_crtcs);
-       if (!encoder) {
-               DRM_ERROR("failed to create encoder\n");
-               return -EFAULT;
-       }
-
-       display->encoder = encoder;
-
-       ret = display->ops->create_connector(display, encoder);
-       if (ret) {
-               DRM_ERROR("failed to create connector ret = %d\n", ret);
-               goto err_destroy_encoder;
-       }
-
-       return 0;
-
-err_destroy_encoder:
-       encoder->funcs->destroy(encoder);
-       return ret;
-}
-
 int exynos_drm_subdrv_register(struct exynos_drm_subdrv *subdrv)
 {
        if (!subdrv)