github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-10-16 04:39:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/exynos: Drop exynos_drm_gem.size field

Browse Source 
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>
This commit is contained in:
Chen-Yu Tsai 2026-03-26 17:43:05 +08:00 committed by Inki Dae
parent e457a1a958
commit 11e898373f
No known key found for this signature in database
GPG Key ID: C5601BECE83FF9B6
5 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/exynos/exynos_drm_fb.c
View File

@ -119,7 +119,7 @@ exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv,
goto err; goto err;
} }
if (size > exynos_gem[i]->size) { if (size > exynos_gem[i]->base.size) {
i++; i++;
ret = -EINVAL; ret = -EINVAL;
goto err; goto err;

2
drivers/gpu/drm/exynos/exynos_drm_g2d.c
View File

@ -720,7 +720,7 @@ static int g2d_map_cmdlist_gem(struct g2d_data *g2d,
} }
if (!g2d_check_buf_desc_is_valid(g2d, buf_desc, 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); exynos_drm_gem_put(exynos_gem);
ret = -EFAULT; ret = -EFAULT;
goto err; goto err;

17
drivers/gpu/drm/exynos/exynos_drm_gem.c
View File

@ -55,7 +55,7 @@ static int exynos_drm_alloc_buf(struct exynos_drm_gem *exynos_gem, bool kvmap)
attr |= DMA_ATTR_NO_KERNEL_MAPPING; attr |= DMA_ATTR_NO_KERNEL_MAPPING;
exynos_gem->dma_attrs = attr; 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_addr, GFP_KERNEL,
exynos_gem->dma_attrs); exynos_gem->dma_attrs);
if (!exynos_gem->cookie) { 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; exynos_gem->kvaddr = exynos_gem->cookie;
DRM_DEV_DEBUG_KMS(drm_dev_dma_dev(dev), "dma_addr(0x%lx), size(0x%lx)\n", 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; 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", 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, (dma_addr_t)exynos_gem->dma_addr,
exynos_gem->dma_attrs); exynos_gem->dma_attrs);
} }
@ -162,7 +162,6 @@ static struct exynos_drm_gem *exynos_drm_gem_init(struct drm_device *dev,
if (!exynos_gem) if (!exynos_gem)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
exynos_gem->size = size;
obj = &exynos_gem->base; obj = &exynos_gem->base;
obj->funcs = &exynos_drm_gem_object_funcs; 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; vm_size = vma->vm_end - vma->vm_start;
/* check if user-requested size is valid. */ /* check if user-requested size is valid. */
if (vm_size > exynos_gem->size) if (vm_size > exynos_gem->base.size)
return -EINVAL; return -EINVAL;
ret = dma_mmap_attrs(drm_dev_dma_dev(drm_dev), vma, exynos_gem->cookie, 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); exynos_gem->dma_attrs);
if (ret < 0) { if (ret < 0) {
DRM_ERROR("failed to mmap.\n"); 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); exynos_gem = to_exynos_gem(obj);
args->flags = exynos_gem->flags; args->flags = exynos_gem->flags;
args->size = exynos_gem->size; args->size = obj->size;
drm_gem_object_put(obj); 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); return ERR_PTR(-ENOMEM);
ret = dma_get_sgtable_attrs(drm_dev_dma_dev(drm_dev), sgt, exynos_gem->cookie, 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); exynos_gem->dma_attrs);
if (ret) { if (ret) {
DRM_ERROR("failed to get sgtable, %d\n", ret); DRM_ERROR("failed to get sgtable, %d\n", ret);

3
drivers/gpu/drm/exynos/exynos_drm_gem.h
View File

@ -22,8 +22,6 @@
* - a new handle to this gem object would be created * - a new handle to this gem object would be created
* by drm_gem_handle_create(). * by drm_gem_handle_create().
* @flags: indicate memory type to allocated buffer and cache attruibute. * @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 * @cookie: cookie returned by dma_alloc_attrs
* @kvaddr: kernel virtual address to allocated memory region (for fbdev) * @kvaddr: kernel virtual address to allocated memory region (for fbdev)
* @dma_addr: bus address(accessed by dma) to allocated memory region. * @dma_addr: bus address(accessed by dma) to allocated memory region.
@ -38,7 +36,6 @@
struct exynos_drm_gem { struct exynos_drm_gem {
struct drm_gem_object base; struct drm_gem_object base;
unsigned int flags; unsigned int flags;
unsigned long size;
void *cookie; void *cookie;
void *kvaddr; void *kvaddr;
dma_addr_t dma_addr; dma_addr_t dma_addr;

2
drivers/gpu/drm/exynos/exynos_drm_ipp.c
View File

@ -364,7 +364,7 @@ static int exynos_drm_ipp_task_setup_buffer(struct exynos_drm_ipp_buffer *buf,
} }
buf->exynos_gem[i] = gem; 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++; i++;
ret = -EINVAL; ret = -EINVAL;
goto gem_free; goto gem_free;