Hi, Shawn:
On Mon, 2024-02-26 at 16:50 +0800, Shawn Sung wrote:
> From: Hsiao Chien Sung <shawn.sung@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
>
> Rename all "mtk_drm_gem" to "mtk_gem":
> - To align the naming rule
> - To reduce the code size
Reviewed-by: CK Hu <ck.hu@xxxxxxxxxxxx>
>
> Signed-off-by: Hsiao Chien Sung <
> shawn.sung@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/mediatek/mtk_drm_drv.c | 8 +--
> drivers/gpu/drm/mediatek/mtk_drm_gem.c | 63 ++++++++++++--------
> ----
> drivers/gpu/drm/mediatek/mtk_drm_gem.h | 19 ++++---
> drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 +-
> 4 files changed, 45 insertions(+), 47 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> index c46773569b3c..81e8aa65abd6 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> @@ -576,8 +576,8 @@ DEFINE_DRM_GEM_FOPS(mtk_drm_fops);
> * We need to override this because the device used to import the
> memory is
> * not dev->dev, as drm_gem_prime_import() expects.
> */
> -static struct drm_gem_object *mtk_drm_gem_prime_import(struct
> drm_device *dev,
> - struct dma_buf
> *dma_buf)
> +static struct drm_gem_object *mtk_gem_prime_import(struct drm_device
> *dev,
> + struct dma_buf
> *dma_buf)
> {
> struct mtk_drm_private *private = dev->dev_private;
>
> @@ -587,9 +587,9 @@ static struct drm_gem_object
> *mtk_drm_gem_prime_import(struct drm_device *dev,
> static const struct drm_driver mtk_drm_driver = {
> .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,
>
> - .dumb_create = mtk_drm_gem_dumb_create,
> + .dumb_create = mtk_gem_dumb_create,
>
> - .gem_prime_import = mtk_drm_gem_prime_import,
> + .gem_prime_import = mtk_gem_prime_import,
> .gem_prime_import_sg_table = mtk_gem_prime_import_sg_table,
> .fops = &mtk_drm_fops,
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c
> b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
> index 4f2e3feabc0f..3ae1f12bfb46 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_gem.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
> @@ -14,26 +14,26 @@
> #include "mtk_drm_drv.h"
> #include "mtk_drm_gem.h"
>
> -static int mtk_drm_gem_object_mmap(struct drm_gem_object *obj,
> struct vm_area_struct *vma);
> +static int mtk_gem_object_mmap(struct drm_gem_object *obj, struct
> vm_area_struct *vma);
>
> static const struct vm_operations_struct vm_ops = {
> .open = drm_gem_vm_open,
> .close = drm_gem_vm_close,
> };
>
> -static const struct drm_gem_object_funcs mtk_drm_gem_object_funcs =
> {
> - .free = mtk_drm_gem_free_object,
> +static const struct drm_gem_object_funcs mtk_gem_object_funcs = {
> + .free = mtk_gem_free_object,
> .get_sg_table = mtk_gem_prime_get_sg_table,
> - .vmap = mtk_drm_gem_prime_vmap,
> - .vunmap = mtk_drm_gem_prime_vunmap,
> - .mmap = mtk_drm_gem_object_mmap,
> + .vmap = mtk_gem_prime_vmap,
> + .vunmap = mtk_gem_prime_vunmap,
> + .mmap = mtk_gem_object_mmap,
> .vm_ops = &vm_ops,
> };
>
> -static struct mtk_drm_gem_obj *mtk_drm_gem_init(struct drm_device
> *dev,
> - unsigned long size)
> +static struct mtk_gem_obj *mtk_gem_init(struct drm_device *dev,
> + unsigned long size)
> {
> - struct mtk_drm_gem_obj *mtk_gem_obj;
> + struct mtk_gem_obj *mtk_gem_obj;
> int ret;
>
> size = round_up(size, PAGE_SIZE);
> @@ -42,7 +42,7 @@ static struct mtk_drm_gem_obj
> *mtk_drm_gem_init(struct drm_device *dev,
> if (!mtk_gem_obj)
> return ERR_PTR(-ENOMEM);
>
> - mtk_gem_obj->base.funcs = &mtk_drm_gem_object_funcs;
> + mtk_gem_obj->base.funcs = &mtk_gem_object_funcs;
>
> ret = drm_gem_object_init(dev, &mtk_gem_obj->base, size);
> if (ret < 0) {
> @@ -54,15 +54,15 @@ static struct mtk_drm_gem_obj
> *mtk_drm_gem_init(struct drm_device *dev,
> return mtk_gem_obj;
> }
>
> -struct mtk_drm_gem_obj *mtk_drm_gem_create(struct drm_device *dev,
> - size_t size, bool
> alloc_kmap)
> +struct mtk_gem_obj *mtk_gem_create(struct drm_device *dev, size_t
> size,
> + bool alloc_kmap)
> {
> struct mtk_drm_private *priv = dev->dev_private;
> - struct mtk_drm_gem_obj *mtk_gem;
> + struct mtk_gem_obj *mtk_gem;
> struct drm_gem_object *obj;
> int ret;
>
> - mtk_gem = mtk_drm_gem_init(dev, size);
> + mtk_gem = mtk_gem_init(dev, size);
> if (IS_ERR(mtk_gem))
> return ERR_CAST(mtk_gem);
>
> @@ -97,9 +97,9 @@ struct mtk_drm_gem_obj *mtk_drm_gem_create(struct
> drm_device *dev,
> return ERR_PTR(ret);
> }
>
> -void mtk_drm_gem_free_object(struct drm_gem_object *obj)
> +void mtk_gem_free_object(struct drm_gem_object *obj)
> {
> - struct mtk_drm_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
> + struct mtk_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
> struct mtk_drm_private *priv = obj->dev->dev_private;
>
> if (mtk_gem->sg)
> @@ -114,10 +114,10 @@ void mtk_drm_gem_free_object(struct
> drm_gem_object *obj)
> kfree(mtk_gem);
> }
>
> -int mtk_drm_gem_dumb_create(struct drm_file *file_priv, struct
> drm_device *dev,
> - struct drm_mode_create_dumb *args)
> +int mtk_gem_dumb_create(struct drm_file *file_priv, struct
> drm_device *dev,
> + struct drm_mode_create_dumb *args)
> {
> - struct mtk_drm_gem_obj *mtk_gem;
> + struct mtk_gem_obj *mtk_gem;
> int ret;
>
> args->pitch = DIV_ROUND_UP(args->width * args->bpp, 8);
> @@ -130,7 +130,7 @@ int mtk_drm_gem_dumb_create(struct drm_file
> *file_priv, struct drm_device *dev,
> args->size = args->pitch;
> args->size *= args->height;
>
> - mtk_gem = mtk_drm_gem_create(dev, args->size, false);
> + mtk_gem = mtk_gem_create(dev, args->size, false);
> if (IS_ERR(mtk_gem))
> return PTR_ERR(mtk_gem);
>
> @@ -148,16 +148,16 @@ int mtk_drm_gem_dumb_create(struct drm_file
> *file_priv, struct drm_device *dev,
> return 0;
>
> err_handle_create:
> - mtk_drm_gem_free_object(&mtk_gem->base);
> + mtk_gem_free_object(&mtk_gem->base);
> return ret;
> }
>
> -static int mtk_drm_gem_object_mmap(struct drm_gem_object *obj,
> - struct vm_area_struct *vma)
> +static int mtk_gem_object_mmap(struct drm_gem_object *obj,
> + struct vm_area_struct *vma)
>
> {
> int ret;
> - struct mtk_drm_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
> + struct mtk_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
> struct mtk_drm_private *priv = obj->dev->dev_private;
>
> /*
> @@ -188,7 +188,7 @@ static int mtk_drm_gem_object_mmap(struct
> drm_gem_object *obj,
> */
> struct sg_table *mtk_gem_prime_get_sg_table(struct drm_gem_object
> *obj)
> {
> - struct mtk_drm_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
> + struct mtk_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
> struct mtk_drm_private *priv = obj->dev->dev_private;
> struct sg_table *sgt;
> int ret;
> @@ -212,7 +212,7 @@ struct sg_table
> *mtk_gem_prime_get_sg_table(struct drm_gem_object *obj)
> struct drm_gem_object *mtk_gem_prime_import_sg_table(struct
> drm_device *dev,
> struct dma_buf_attachment *attach, struct
> sg_table *sg)
> {
> - struct mtk_drm_gem_obj *mtk_gem;
> + struct mtk_gem_obj *mtk_gem;
>
> /* check if the entries in the sg_table are contiguous */
> if (drm_prime_get_contiguous_size(sg) < attach->dmabuf->size) {
> @@ -220,7 +220,7 @@ struct drm_gem_object
> *mtk_gem_prime_import_sg_table(struct drm_device *dev,
> return ERR_PTR(-EINVAL);
> }
>
> - mtk_gem = mtk_drm_gem_init(dev, attach->dmabuf->size);
> + mtk_gem = mtk_gem_init(dev, attach->dmabuf->size);
> if (IS_ERR(mtk_gem))
> return ERR_CAST(mtk_gem);
>
> @@ -230,9 +230,9 @@ struct drm_gem_object
> *mtk_gem_prime_import_sg_table(struct drm_device *dev,
> return &mtk_gem->base;
> }
>
> -int mtk_drm_gem_prime_vmap(struct drm_gem_object *obj, struct
> iosys_map *map)
> +int mtk_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map
> *map)
> {
> - struct mtk_drm_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
> + struct mtk_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
> struct sg_table *sgt = NULL;
> unsigned int npages;
>
> @@ -270,10 +270,9 @@ int mtk_drm_gem_prime_vmap(struct drm_gem_object
> *obj, struct iosys_map *map)
> return 0;
> }
>
> -void mtk_drm_gem_prime_vunmap(struct drm_gem_object *obj,
> - struct iosys_map *map)
> +void mtk_gem_prime_vunmap(struct drm_gem_object *obj, struct
> iosys_map *map)
> {
> - struct mtk_drm_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
> + struct mtk_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
> void *vaddr = map->vaddr;
>
> if (!mtk_gem->pages)
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.h
> b/drivers/gpu/drm/mediatek/mtk_drm_gem.h
> index 78f23b07a02e..8a5a760f5e6d 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_gem.h
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.h
> @@ -22,7 +22,7 @@
> * P.S. this object would be transferred to user as kms_bo.handle so
> * user can access the buffer through kms_bo.handle.
> */
> -struct mtk_drm_gem_obj {
> +struct mtk_gem_obj {
> struct drm_gem_object base;
> void *cookie;
> void *kvaddr;
> @@ -32,18 +32,17 @@ struct mtk_drm_gem_obj {
> struct page **pages;
> };
>
> -#define to_mtk_gem_obj(x) container_of(x, struct mtk_drm_gem_obj,
> base)
> +#define to_mtk_gem_obj(x) container_of(x, struct mtk_gem_obj, base)
>
> -void mtk_drm_gem_free_object(struct drm_gem_object *gem);
> -struct mtk_drm_gem_obj *mtk_drm_gem_create(struct drm_device *dev,
> size_t size,
> - bool alloc_kmap);
> -int mtk_drm_gem_dumb_create(struct drm_file *file_priv, struct
> drm_device *dev,
> - struct drm_mode_create_dumb *args);
> +void mtk_gem_free_object(struct drm_gem_object *gem);
> +struct mtk_gem_obj *mtk_gem_create(struct drm_device *dev, size_t
> size,
> + bool alloc_kmap);
> +int mtk_gem_dumb_create(struct drm_file *file_priv, struct
> drm_device *dev,
> + struct drm_mode_create_dumb *args);
> struct sg_table *mtk_gem_prime_get_sg_table(struct drm_gem_object
> *obj);
> struct drm_gem_object *mtk_gem_prime_import_sg_table(struct
> drm_device *dev,
> struct dma_buf_attachment *attach, struct
> sg_table *sg);
> -int mtk_drm_gem_prime_vmap(struct drm_gem_object *obj, struct
> iosys_map *map);
> -void mtk_drm_gem_prime_vunmap(struct drm_gem_object *obj,
> - struct iosys_map *map);
> +int mtk_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map
> *map);
> +void mtk_gem_prime_vunmap(struct drm_gem_object *obj, struct
> iosys_map *map);
>
> #endif
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> index 43137c46fc14..db63a32c407e 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> @@ -135,7 +135,7 @@ static void mtk_plane_update_new_state(struct
> drm_plane_state *new_state,
> {
> struct drm_framebuffer *fb = new_state->fb;
> struct drm_gem_object *gem;
> - struct mtk_drm_gem_obj *mtk_gem;
> + struct mtk_gem_obj *mtk_gem;
> unsigned int pitch, format;
> u64 modifier;
> dma_addr_t addr;
