CHROMIUM: drm/exynos: Fixup init failure cleanup path

[cascardo/linux.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 51e7680..9462a85 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -95,7 +95,7 @@ static int exynos_drm_load(struct drm_device *dev, unsigned long flags)
        int nr;
        struct bridge_init bridge;
 
-       DRM_DEBUG_DRIVER("%s\n", __FILE__);
+       DRM_DEBUG("[DEV:%s] flags: 0x%lx\n", dev->devname, flags);
 
        private = kzalloc(sizeof(struct exynos_drm_private), GFP_KERNEL);
        if (!private) {
@@ -134,8 +134,12 @@ static int exynos_drm_load(struct drm_device *dev, unsigned long flags)
        }
 
        for (nr = 0; nr < MAX_PLANE; nr++) {
-               ret = exynos_plane_init(dev, nr);
-               if (ret)
+               struct drm_plane *plane;
+               unsigned int possible_crtcs =
+                       (1 << EXYNOS_DRM_DISPLAY_NUM_DISPLAYS) - 1;
+
+               plane = exynos_plane_init(dev, possible_crtcs, false);
+               if (!plane)
                        goto err_crtc;
        }
 
@@ -146,19 +150,19 @@ static int exynos_drm_load(struct drm_device *dev, unsigned long flags)
        ret = find_bridge("ptn3460-bridge", &bridge);
        if (ret) {
                DRM_ERROR("Could not get PTN3460 bridge %d\n", ret);
-               goto err_kds;
+               goto err_vblank;
        }
        if (bridge.valid) {
                ret = ptn3460_init(dev, bridge.client, bridge.node);
                if (ret) {
                        DRM_ERROR("Failed to initialize the ptn bridge\n");
-                       goto err_kds;
+                       goto err_vblank;
                }
        } else {
                ret = find_bridge("ps8622-bridge", &bridge);
                if (ret) {
                        DRM_ERROR("Could not get PS8622 bridge %d\n", ret);
-                       goto err_kds;
+                       goto err_vblank;
                }
 
                if (bridge.valid) {
@@ -166,7 +170,7 @@ static int exynos_drm_load(struct drm_device *dev, unsigned long flags)
                        if (ret) {
                                DRM_ERROR("Failed to initialize the Parade "
                                          "bridge\n");
-                               goto err_kds;
+                               goto err_vblank;
                        }
                }
        }
@@ -216,7 +220,7 @@ static int exynos_drm_unload(struct drm_device *dev)
 {
        struct exynos_drm_private *private = dev->dev_private;
 
-       DRM_DEBUG_DRIVER("%s\n", __FILE__);
+       DRM_DEBUG("[DEV:%s]\n", dev->devname);
 
        exynos_drm_fbdev_fini(dev);
        exynos_drm_device_unregister(dev);
@@ -237,7 +241,7 @@ static int exynos_drm_open(struct drm_device *dev, struct drm_file *file)
 {
        struct exynos_drm_file_private *file_private;
 
-       DRM_DEBUG_DRIVER("%s\n", __FILE__);
+       DRM_DEBUG("[DEV:%s]\n", dev->devname);
 
        file_private = kzalloc(sizeof(*file_private), GFP_KERNEL);
        if (!file_private) {
@@ -257,7 +261,7 @@ static void exynos_drm_preclose(struct drm_device *dev,
        struct exynos_drm_file_private *file_private = file->driver_priv;
        struct exynos_drm_gem_obj_node *cur, *d;
 
-       DRM_DEBUG_DRIVER("%s\n", __FILE__);
+       DRM_DEBUG("[DEV:%s]\n", dev->devname);
 
        mutex_lock(&dev->struct_mutex);
        /* release kds resource sets for outstanding GEM object acquires */
@@ -278,7 +282,7 @@ static void exynos_drm_preclose(struct drm_device *dev,
 
 static void exynos_drm_postclose(struct drm_device *dev, struct drm_file *file)
 {
-       DRM_DEBUG_DRIVER("%s\n", __FILE__);
+       DRM_DEBUG("[DEV:%s]\n", dev->devname);
 
        if (!file->driver_priv)
                return;
@@ -289,7 +293,7 @@ static void exynos_drm_postclose(struct drm_device *dev, struct drm_file *file)
 
 static void exynos_drm_lastclose(struct drm_device *dev)
 {
-       DRM_DEBUG_DRIVER("%s\n", __FILE__);
+       DRM_DEBUG("[DEV:%s]\n", dev->devname);
 
        exynos_drm_fbdev_restore_mode(dev);
 }
@@ -308,8 +312,6 @@ static struct drm_ioctl_desc exynos_ioctls[] = {
                        DRM_AUTH),
        DRM_IOCTL_DEF_DRV(EXYNOS_GEM_MMAP,
                        exynos_drm_gem_mmap_ioctl, DRM_UNLOCKED | DRM_AUTH),
-       DRM_IOCTL_DEF_DRV(EXYNOS_PLANE_SET_ZPOS, exynos_plane_set_zpos_ioctl,
-                       DRM_UNLOCKED | DRM_AUTH),
        DRM_IOCTL_DEF_DRV(EXYNOS_VIDI_CONNECTION,
                        vidi_connection_ioctl, DRM_UNLOCKED | DRM_AUTH),
        DRM_IOCTL_DEF_DRV(EXYNOS_GEM_CPU_ACQUIRE,
@@ -406,7 +408,7 @@ static int exynos_drm_platform_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        int ret;
 
-       DRM_DEBUG_DRIVER("%s\n", __FILE__);
+       DRM_DEBUG("[PDEV:%s]\n", pdev->name);
 
 #ifdef CONFIG_EXYNOS_IOMMU
        if (iommu_init(pdev)) {
@@ -434,7 +436,7 @@ static int __devexit exynos_drm_platform_remove(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
 
-       DRM_DEBUG_DRIVER("%s\n", __FILE__);
+       DRM_DEBUG("[PDEV:%s]\n", pdev->name);
 
        pm_vt_switch_unregister(dev);
        pm_runtime_disable(dev);
@@ -447,6 +449,20 @@ static int __devexit exynos_drm_platform_remove(struct platform_device *pdev)
        return 0;
 }
 
+const char *exynos_display_type_name(const struct exynos_drm_display *display)
+{
+       switch (display->display_type) {
+       case EXYNOS_DRM_DISPLAY_TYPE_FIMD:
+               return "FIMD";
+       case EXYNOS_DRM_DISPLAY_TYPE_MIXER:
+               return "MIXER";
+       case EXYNOS_DRM_DISPLAY_TYPE_VIDI:
+               return "VIDI";
+       default:
+               return "?";
+       }
+}
+
 void exynos_display_attach_panel(enum exynos_drm_display_type type,
                struct exynos_panel_ops *ops, void *ctx)
 {
@@ -626,7 +642,7 @@ static int __init exynos_drm_init(void)
 {
        int ret, i;
 
-       DRM_DEBUG_DRIVER("%s\n", __FILE__);
+       DRM_DEBUG_DRIVER("\n");
 
        for (i = 0; i < EXYNOS_DRM_DISPLAY_NUM_DISPLAYS; i++) {
                displays[i] = kzalloc(sizeof(*displays[i]), GFP_KERNEL);
@@ -707,7 +723,7 @@ static void __exit exynos_drm_exit(void)
 {
        int i;
 
-       DRM_DEBUG_DRIVER("%s\n", __FILE__);
+       DRM_DEBUG_DRIVER("\n");
 
        platform_driver_unregister(&exynos_drm_platform_driver);