Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / exynos / exynos_drm_drv.c

diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
index 242bd50faa26018bee34e3ff54faf7b3eaa5dbac..b1f7299600f040947240618cf2cfc262d1847b70 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -145,8 +145,6 @@ static struct drm_driver exynos_drm_driver = {
        .gem_free_object_unlocked = exynos_drm_gem_free_object,
        .gem_vm_ops             = &exynos_drm_gem_vm_ops,
        .dumb_create            = exynos_drm_gem_dumb_create,
-       .dumb_map_offset        = exynos_drm_gem_dumb_map_offset,
-       .dumb_destroy           = drm_gem_dumb_destroy,
        .prime_handle_to_fd     = drm_gem_prime_handle_to_fd,
        .prime_fd_to_handle     = drm_gem_prime_fd_to_handle,
        .gem_prime_export       = drm_gem_prime_export,
@@ -395,8 +393,9 @@ static int exynos_drm_bind(struct device *dev)
        /* init kms poll for handling hpd */
        drm_kms_helper_poll_init(drm);
 
-       /* force connectors detection */
-       drm_helper_hpd_irq_event(drm);
+       ret = exynos_drm_fbdev_init(drm);
+       if (ret)
+               goto err_cleanup_poll;
 
        /* register the DRM device */
        ret = drm_dev_register(drm, 0);
@@ -407,6 +406,7 @@ static int exynos_drm_bind(struct device *dev)
 
 err_cleanup_fbdev:
        exynos_drm_fbdev_fini(drm);
+err_cleanup_poll:
        drm_kms_helper_poll_fini(drm);
        exynos_drm_device_subdrv_remove(drm);
 err_unbind_all: