Merge tag 'topic/drm-fixes-2015-11-11' of git://anongit.freedesktop.org/drm-intel...

[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 084280859589669d17f5e3e04ac334f21710b4ac..fcea28bdbc42095244f2f08a5bafbb82ef43eeda 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_fb.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fb.c
@@ -32,15 +32,15 @@
  * exynos specific framebuffer structure.
  *
  * @fb: drm framebuffer obejct.
- * @exynos_gem_obj: array of exynos specific gem object containing a gem object.
+ * @exynos_gem: array of exynos specific gem object containing a gem object.
  */
 struct exynos_drm_fb {
-       struct drm_framebuffer          fb;
-       struct exynos_drm_gem_obj       *exynos_gem_obj[MAX_FB_BUFFER];
+       struct drm_framebuffer  fb;
+       struct exynos_drm_gem   *exynos_gem[MAX_FB_BUFFER];
 };
 
 static int check_fb_gem_memory_type(struct drm_device *drm_dev,
-                               struct exynos_drm_gem_obj *exynos_gem_obj)
+                                   struct exynos_drm_gem *exynos_gem)
 {
        unsigned int flags;
 
@@ -51,7 +51,7 @@ static int check_fb_gem_memory_type(struct drm_device *drm_dev,
        if (is_drm_iommu_supported(drm_dev))
                return 0;
 
-       flags = exynos_gem_obj->flags;
+       flags = exynos_gem->flags;
 
        /*
         * without iommu support, not support physically non-continuous memory
@@ -75,13 +75,13 @@ static void exynos_drm_fb_destroy(struct drm_framebuffer *fb)
 
        drm_framebuffer_cleanup(fb);
 
-       for (i = 0; i < ARRAY_SIZE(exynos_fb->exynos_gem_obj); i++) {
+       for (i = 0; i < ARRAY_SIZE(exynos_fb->exynos_gem); i++) {
                struct drm_gem_object *obj;
 
-               if (exynos_fb->exynos_gem_obj[i] == NULL)
+               if (exynos_fb->exynos_gem[i] == NULL)
                        continue;
 
-               obj = &exynos_fb->exynos_gem_obj[i]->base;
+               obj = &exynos_fb->exynos_gem[i]->base;
                drm_gem_object_unreference_unlocked(obj);
        }
 
@@ -96,7 +96,7 @@ static int exynos_drm_fb_create_handle(struct drm_framebuffer *fb,
        struct exynos_drm_fb *exynos_fb = to_exynos_fb(fb);
 
        return drm_gem_handle_create(file_priv,
-                       &exynos_fb->exynos_gem_obj[0]->base, handle);
+                                    &exynos_fb->exynos_gem[0]->base, handle);
 }
 
 static int exynos_drm_fb_dirty(struct drm_framebuffer *fb,
@@ -118,7 +118,7 @@ static struct drm_framebuffer_funcs exynos_drm_fb_funcs = {
 struct drm_framebuffer *
 exynos_drm_framebuffer_init(struct drm_device *dev,
                            struct drm_mode_fb_cmd2 *mode_cmd,
-                           struct exynos_drm_gem_obj **gem_obj,
+                           struct exynos_drm_gem **exynos_gem,
                            int count)
 {
        struct exynos_drm_fb *exynos_fb;
@@ -130,11 +130,11 @@ exynos_drm_framebuffer_init(struct drm_device *dev,
                return ERR_PTR(-ENOMEM);
 
        for (i = 0; i < count; i++) {
-               ret = check_fb_gem_memory_type(dev, gem_obj[i]);
+               ret = check_fb_gem_memory_type(dev, exynos_gem[i]);
                if (ret < 0)
                        goto err;
 
-               exynos_fb->exynos_gem_obj[i] = gem_obj[i];
+               exynos_fb->exynos_gem[i] = exynos_gem[i];
        }
 
        drm_helper_mode_fill_fb_struct(&exynos_fb->fb, mode_cmd);
@@ -156,7 +156,7 @@ static struct drm_framebuffer *
 exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv,
                      struct drm_mode_fb_cmd2 *mode_cmd)
 {
-       struct exynos_drm_gem_obj *gem_objs[MAX_FB_BUFFER];
+       struct exynos_drm_gem *exynos_gem[MAX_FB_BUFFER];
        struct drm_gem_object *obj;
        struct drm_framebuffer *fb;
        int i;
@@ -171,10 +171,10 @@ exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv,
                        goto err;
                }
 
-               gem_objs[i] = to_exynos_gem_obj(obj);
+               exynos_gem[i] = to_exynos_gem(obj);
        }
 
-       fb = exynos_drm_framebuffer_init(dev, mode_cmd, gem_objs, i);
+       fb = exynos_drm_framebuffer_init(dev, mode_cmd, exynos_gem, i);
        if (IS_ERR(fb)) {
                ret = PTR_ERR(fb);
                goto err;
@@ -184,27 +184,26 @@ exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv,
 
 err:
        while (i--)
-               drm_gem_object_unreference_unlocked(&gem_objs[i]->base);
+               drm_gem_object_unreference_unlocked(&exynos_gem[i]->base);
 
        return ERR_PTR(ret);
 }
 
-struct exynos_drm_gem_obj *exynos_drm_fb_gem_obj(struct drm_framebuffer *fb,
-                                                int index)
+struct exynos_drm_gem *exynos_drm_fb_gem(struct drm_framebuffer *fb, int index)
 {
        struct exynos_drm_fb *exynos_fb = to_exynos_fb(fb);
-       struct exynos_drm_gem_obj *obj;
+       struct exynos_drm_gem *exynos_gem;
 
        if (index >= MAX_FB_BUFFER)
                return NULL;
 
-       obj = exynos_fb->exynos_gem_obj[index];
-       if (!obj)
+       exynos_gem = exynos_fb->exynos_gem[index];
+       if (!exynos_gem)
                return NULL;
 
-       DRM_DEBUG_KMS("dma_addr = 0x%lx\n", (unsigned long)obj->dma_addr);
+       DRM_DEBUG_KMS("dma_addr: 0x%lx\n", (unsigned long)exynos_gem->dma_addr);
 
-       return obj;
+       return exynos_gem;
 }
 
 static void exynos_drm_output_poll_changed(struct drm_device *dev)