mwifiex: fix typo in PCIe adapter NULL check

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / exynos / exynos_drm_fb.c

diff --git a/drivers/gpu/drm/exynos/exynos_drm_fb.c b/drivers/gpu/drm/exynos/exynos_drm_fb.c
index 7190b64a368bd050ebd05f72ab3d5b4182d76ac0..5426cc5a5e8d53b30409a980aa5e8878a30e7c83 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_fb.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fb.c
@@ -36,6 +36,7 @@
 #include "exynos_drm_fb.h"
 #include "exynos_drm_gem.h"
 #include "exynos_drm_iommu.h"
+#include "exynos_drm_encoder.h"
 
 #define to_exynos_fb(x)        container_of(x, struct exynos_drm_fb, fb)
 
@@ -85,6 +86,9 @@ static void exynos_drm_fb_destroy(struct drm_framebuffer *fb)
 
        DRM_DEBUG_KMS("%s\n", __FILE__);
 
+       /* make sure that overlay data are updated before relesing fb. */
+       exynos_drm_encoder_complete_scanout(fb);
+
        drm_framebuffer_cleanup(fb);
 
        for (i = 0; i < ARRAY_SIZE(exynos_fb->exynos_gem_obj); i++) {
@@ -173,6 +177,7 @@ exynos_drm_framebuffer_init(struct drm_device *dev,
                return ERR_PTR(-ENOMEM);
        }
 
+       drm_helper_mode_fill_fb_struct(&exynos_fb->fb, mode_cmd);
        exynos_fb->exynos_gem_obj[0] = exynos_gem_obj;
 
        ret = drm_framebuffer_init(dev, &exynos_fb->fb, &exynos_drm_fb_funcs);
@@ -181,8 +186,6 @@ exynos_drm_framebuffer_init(struct drm_device *dev,
                return ERR_PTR(ret);
        }
 
-       drm_helper_mode_fill_fb_struct(&exynos_fb->fb, mode_cmd);
-
        return &exynos_fb->fb;
 }
 
@@ -228,9 +231,8 @@ exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv,
                      struct drm_mode_fb_cmd2 *mode_cmd)
 {
        struct drm_gem_object *obj;
-       struct drm_framebuffer *fb;
        struct exynos_drm_fb *exynos_fb;
-       int i;
+       int i, ret;
 
        DRM_DEBUG_KMS("%s\n", __FILE__);
 
@@ -240,13 +242,14 @@ exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv,
                return ERR_PTR(-ENOENT);
        }
 
-       fb = exynos_drm_framebuffer_init(dev, mode_cmd, obj);
-       if (IS_ERR(fb)) {
-               drm_gem_object_unreference_unlocked(obj);
-               return fb;
+       exynos_fb = kzalloc(sizeof(*exynos_fb), GFP_KERNEL);
+       if (!exynos_fb) {
+               DRM_ERROR("failed to allocate exynos drm framebuffer\n");
+               return ERR_PTR(-ENOMEM);
        }
 
-       exynos_fb = to_exynos_fb(fb);
+       drm_helper_mode_fill_fb_struct(&exynos_fb->fb, mode_cmd);
+       exynos_fb->exynos_gem_obj[0] = to_exynos_gem_obj(obj);
        exynos_fb->buf_cnt = exynos_drm_format_num_buffers(mode_cmd);
 
        DRM_DEBUG_KMS("buf_cnt = %d\n", exynos_fb->buf_cnt);
@@ -259,7 +262,7 @@ exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv,
                                mode_cmd->handles[i]);
                if (!obj) {
                        DRM_ERROR("failed to lookup gem object\n");
-                       exynos_drm_fb_destroy(fb);
+                       kfree(exynos_fb);
                        return ERR_PTR(-ENOENT);
                }
 
@@ -268,14 +271,27 @@ exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv,
                ret = check_fb_gem_memory_type(dev, exynos_gem_obj);
                if (ret < 0) {
                        DRM_ERROR("cannot use this gem memory type for fb.\n");
-                       exynos_drm_fb_destroy(fb);
+                       kfree(exynos_fb);
                        return ERR_PTR(ret);
                }
 
                exynos_fb->exynos_gem_obj[i] = to_exynos_gem_obj(obj);
        }
 
-       return fb;
+       ret = drm_framebuffer_init(dev, &exynos_fb->fb, &exynos_drm_fb_funcs);
+       if (ret) {
+               for (i = 0; i < exynos_fb->buf_cnt; i++) {
+                       struct exynos_drm_gem_obj *gem_obj;
+
+                       gem_obj = exynos_fb->exynos_gem_obj[i];
+                       drm_gem_object_unreference_unlocked(&gem_obj->base);
+               }
+
+               kfree(exynos_fb);
+               return ERR_PTR(ret);
+       }
+
+       return &exynos_fb->fb;
 }
 
 struct exynos_drm_gem_buf *exynos_drm_fb_buffer(struct drm_framebuffer *fb,
@@ -293,9 +309,7 @@ struct exynos_drm_gem_buf *exynos_drm_fb_buffer(struct drm_framebuffer *fb,
        if (!buffer)
                return NULL;
 
-       DRM_DEBUG_KMS("vaddr = 0x%lx, dma_addr = 0x%lx\n",
-                       (unsigned long)buffer->kvaddr,
-                       (unsigned long)buffer->dma_addr);
+       DRM_DEBUG_KMS("dma_addr = 0x%lx\n", (unsigned long)buffer->dma_addr);
 
        return buffer;
 }