drm/exynos: Drop exynos_drm_gem.size field

A size field is already included in the base GEM object, and is
initialized through drm_gem_object_init() with the same value.

Drop the field in the subclass to save some space. More changes to
make exynos_drm_gem a subclass of drm_gem_dma_object will follow.

Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>

diff --git a/drivers/gpu/drm/exynos/exynos_drm_fb.c b/drivers/gpu/drm/exynos/exynos_drm_fb.c
index ab0e0c74ec47877c0bd7c63ea35e8fcb500aa857..125b87adfdc4f25269113c629689c4f112fc7a3f 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_fb.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fb.c
@@ -119,7 +119,7 @@ exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv,
                        goto err;
                }
 
-               if (size > exynos_gem[i]->size) {
+               if (size > exynos_gem[i]->base.size) {
                        i++;
                        ret = -EINVAL;
                        goto err;

diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
index 85a3a247dfcab4bbc591fed8b38817b92820e1f5..e92a4d872c410ce58f2977eac3d8a994417fcda2 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
@@ -720,7 +720,7 @@ static int g2d_map_cmdlist_gem(struct g2d_data *g2d,
                        }
 
                        if (!g2d_check_buf_desc_is_valid(g2d, buf_desc,
-                                                        reg_type, exynos_gem->size)) {
+                                                        reg_type, exynos_gem->base.size)) {
                                exynos_drm_gem_put(exynos_gem);
                                ret = -EFAULT;
                                goto err;

diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c
index 9ec76163609ff5fcd700274b59ec493665830f80..d9d42809a1a9a477e00a8ed087159530b55d8a05 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_gem.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c
@@ -55,7 +55,7 @@ static int exynos_drm_alloc_buf(struct exynos_drm_gem *exynos_gem, bool kvmap)
                attr |= DMA_ATTR_NO_KERNEL_MAPPING;
 
        exynos_gem->dma_attrs = attr;
-       exynos_gem->cookie = dma_alloc_attrs(drm_dev_dma_dev(dev), exynos_gem->size,
+       exynos_gem->cookie = dma_alloc_attrs(drm_dev_dma_dev(dev), exynos_gem->base.size,
                                             &exynos_gem->dma_addr, GFP_KERNEL,
                                             exynos_gem->dma_attrs);
        if (!exynos_gem->cookie) {
@@ -67,7 +67,7 @@ static int exynos_drm_alloc_buf(struct exynos_drm_gem *exynos_gem, bool kvmap)
                exynos_gem->kvaddr = exynos_gem->cookie;
 
        DRM_DEV_DEBUG_KMS(drm_dev_dma_dev(dev), "dma_addr(0x%lx), size(0x%lx)\n",
-                       (unsigned long)exynos_gem->dma_addr, exynos_gem->size);
+                       (unsigned long)exynos_gem->dma_addr, exynos_gem->base.size);
        return 0;
 }
 
@@ -81,9 +81,9 @@ static void exynos_drm_free_buf(struct exynos_drm_gem *exynos_gem)
        }
 
        DRM_DEV_DEBUG_KMS(dev->dev, "dma_addr(0x%lx), size(0x%lx)\n",
-                       (unsigned long)exynos_gem->dma_addr, exynos_gem->size);
+                       (unsigned long)exynos_gem->dma_addr, exynos_gem->base.size);
 
-       dma_free_attrs(drm_dev_dma_dev(dev), exynos_gem->size, exynos_gem->cookie,
+       dma_free_attrs(drm_dev_dma_dev(dev), exynos_gem->base.size, exynos_gem->cookie,
                        (dma_addr_t)exynos_gem->dma_addr,
                        exynos_gem->dma_attrs);
 }
@@ -162,7 +162,6 @@ static struct exynos_drm_gem *exynos_drm_gem_init(struct drm_device *dev,
        if (!exynos_gem)
                return ERR_PTR(-ENOMEM);
 
-       exynos_gem->size = size;
        obj = &exynos_gem->base;
 
        obj->funcs = &exynos_drm_gem_object_funcs;
@@ -287,11 +286,11 @@ static int exynos_drm_gem_mmap_buffer(struct exynos_drm_gem *exynos_gem,
        vm_size = vma->vm_end - vma->vm_start;
 
        /* check if user-requested size is valid. */
-       if (vm_size > exynos_gem->size)
+       if (vm_size > exynos_gem->base.size)
                return -EINVAL;
 
        ret = dma_mmap_attrs(drm_dev_dma_dev(drm_dev), vma, exynos_gem->cookie,
-                            exynos_gem->dma_addr, exynos_gem->size,
+                            exynos_gem->dma_addr, exynos_gem->base.size,
                             exynos_gem->dma_attrs);
        if (ret < 0) {
                DRM_ERROR("failed to mmap.\n");
@@ -317,7 +316,7 @@ int exynos_drm_gem_get_ioctl(struct drm_device *dev, void *data,
        exynos_gem = to_exynos_gem(obj);
 
        args->flags = exynos_gem->flags;
-       args->size = exynos_gem->size;
+       args->size = obj->size;
 
        drm_gem_object_put(obj);
 
@@ -411,7 +410,7 @@ struct sg_table *exynos_drm_gem_prime_get_sg_table(struct drm_gem_object *obj)
                return ERR_PTR(-ENOMEM);
 
        ret = dma_get_sgtable_attrs(drm_dev_dma_dev(drm_dev), sgt, exynos_gem->cookie,
-                                   exynos_gem->dma_addr, exynos_gem->size,
+                                   exynos_gem->dma_addr, obj->size,
                                    exynos_gem->dma_attrs);
        if (ret) {
                DRM_ERROR("failed to get sgtable, %d\n", ret);

diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.h b/drivers/gpu/drm/exynos/exynos_drm_gem.h
index b6785f1136abbb225c7f764c7f613abcfaee6ea7..3ff9fa9955ea52b0bfc7d4737ae8f93a2caa410b 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_gem.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_gem.h
@@ -22,8 +22,6 @@
  *     - a new handle to this gem object would be created
  *     by drm_gem_handle_create().
  * @flags: indicate memory type to allocated buffer and cache attruibute.
- * @size: size requested from user, in bytes and this size is aligned
- *     in page unit.
  * @cookie: cookie returned by dma_alloc_attrs
  * @kvaddr: kernel virtual address to allocated memory region (for fbdev)
  * @dma_addr: bus address(accessed by dma) to allocated memory region.
@@ -38,7 +36,6 @@
 struct exynos_drm_gem {
        struct drm_gem_object   base;
        unsigned int            flags;
-       unsigned long           size;
        void                    *cookie;
        void                    *kvaddr;
        dma_addr_t              dma_addr;

diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.c b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
index ee3d61345a66b7730c5bb9b2847fab900ef45e6a..43bc4f63bb845f0282dddf56c62125cd28171698 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_ipp.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
@@ -364,7 +364,7 @@ static int exynos_drm_ipp_task_setup_buffer(struct exynos_drm_ipp_buffer *buf,
                }
                buf->exynos_gem[i] = gem;
 
-               if (size + buf->buf.offset[i] > buf->exynos_gem[i]->size) {
+               if (size + buf->buf.offset[i] > buf->exynos_gem[i]->base.size) {
                        i++;
                        ret = -EINVAL;
                        goto gem_free;