mbox series

[v2,00/14] Rename mtk_drm_* to mtk_*

Message ID 20240319070257.6443-1-shawn.sung@mediatek.com
Headers show
Series Rename mtk_drm_* to mtk_* | expand

Message

Shawn Sung March 19, 2024, 7:02 a.m. UTC 
From: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>

Rename some unnecessary  "mtk_drm_*" to "mtk_*" because:
- Lower the matches when searching the native drm_* codes
- Reduce the code

Changes in v2:
- Sort header files alphabetically
- Seperate patches for renaming .c files to avoid conflicts

Hsiao Chien Sung (14):
  drm/mediatek: Rename "mtk_drm_crtc" to "mtk_crtc"
  drm/mediatek: Rename "mtk_drm_ddp_comp" to "mtk_ddp_comp"
  drm/mediatek: Rename "mtk_drm_plane" to "mtk_plane"
  drm/mediatek: Rename "mtk_drm_gem" to "mtk_gem"
  drm/mediatek: Rename "mtk_drm_hdmi" to "mtk_hdmi"
  drm/mediatek: Rename files "mtk_drm_crtc.h" to "mtk_crtc.h"
  drm/mediatek: Rename files "mtk_drm_crtc.c" to "mtk_crtc.c"
  drm/mediatek: Rename files "mtk_drm_ddp_comp.h" to "mtk_ddp_comp.h"
  drm/mediatek: Rename files "mtk_drm_ddp_comp.c" to "mtk_ddp_comp.c"
  drm/mediatek: Rename files "mtk_drm_plane.h" to "mtk_plane.h"
  drm/mediatek: Rename files "mtk_drm_plane.c" to "mtk_plane.c"
  drm/mediatek: Rename files "mtk_drm_gem.h" to "mtk_gem.h"
  drm/mediatek: Rename files "mtk_drm_gem.c" to "mtk_gem.c"
  drm/mediatek: Rename mtk_ddp_comp functions

 drivers/gpu/drm/mediatek/Makefile             |  12 +-
 .../mediatek/{mtk_drm_crtc.c => mtk_crtc.c}   | 213 +++++++++---------
 drivers/gpu/drm/mediatek/mtk_crtc.h           |  28 +++
 .../{mtk_drm_ddp_comp.c => mtk_ddp_comp.c}    |  51 +++--
 .../{mtk_drm_ddp_comp.h => mtk_ddp_comp.h}    |   9 +-
 drivers/gpu/drm/mediatek/mtk_disp_aal.c       |   4 +-
 drivers/gpu/drm/mediatek/mtk_disp_ccorr.c     |   4 +-
 drivers/gpu/drm/mediatek/mtk_disp_color.c     |   4 +-
 drivers/gpu/drm/mediatek/mtk_disp_drv.h       |   2 +-
 drivers/gpu/drm/mediatek/mtk_disp_gamma.c     |   4 +-
 drivers/gpu/drm/mediatek/mtk_disp_merge.c     |   2 +-
 drivers/gpu/drm/mediatek/mtk_disp_ovl.c       |   4 +-
 .../gpu/drm/mediatek/mtk_disp_ovl_adaptor.c   |   4 +-
 drivers/gpu/drm/mediatek/mtk_disp_rdma.c      |   4 +-
 drivers/gpu/drm/mediatek/mtk_dpi.c            |   4 +-
 drivers/gpu/drm/mediatek/mtk_drm_crtc.h       |  30 ---
 drivers/gpu/drm/mediatek/mtk_drm_drv.c        |  32 +--
 drivers/gpu/drm/mediatek/mtk_drm_drv.h        |   4 +-
 drivers/gpu/drm/mediatek/mtk_dsi.c            |   6 +-
 drivers/gpu/drm/mediatek/mtk_ethdr.c          |   4 +-
 .../drm/mediatek/{mtk_drm_gem.c => mtk_gem.c} |  65 +++---
 .../drm/mediatek/{mtk_drm_gem.h => mtk_gem.h} |  23 +-
 drivers/gpu/drm/mediatek/mtk_hdmi.c           |  14 +-
 drivers/gpu/drm/mediatek/mtk_padding.c        |   4 +-
 .../mediatek/{mtk_drm_plane.c => mtk_plane.c} |  26 +--
 .../mediatek/{mtk_drm_plane.h => mtk_plane.h} |   4 +-
 26 files changed, 275 insertions(+), 286 deletions(-)
 rename drivers/gpu/drm/mediatek/{mtk_drm_crtc.c => mtk_crtc.c} (82%)
 create mode 100644 drivers/gpu/drm/mediatek/mtk_crtc.h
 rename drivers/gpu/drm/mediatek/{mtk_drm_ddp_comp.c => mtk_ddp_comp.c} (94%)
 rename drivers/gpu/drm/mediatek/{mtk_drm_ddp_comp.h => mtk_ddp_comp.h} (98%)
 delete mode 100644 drivers/gpu/drm/mediatek/mtk_drm_crtc.h
 rename drivers/gpu/drm/mediatek/{mtk_drm_gem.c => mtk_gem.c} (76%)
 rename drivers/gpu/drm/mediatek/{mtk_drm_gem.h => mtk_gem.h} (62%)
 rename drivers/gpu/drm/mediatek/{mtk_drm_plane.c => mtk_plane.c} (94%)
 rename drivers/gpu/drm/mediatek/{mtk_drm_plane.h => mtk_plane.h} (95%)

--
2.18.0

Comments

CK Hu (胡俊光) March 20, 2024, 2:04 a.m. UTC | #1 
Hi, Shawn:

On Tue, 2024-03-19 at 15:02 +0800, Shawn Sung wrote:
> From: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
> 
> Rename files mtk_drm_plane.c to mtk_plane.c and
> modify the Makefile accordingly.
> 
> Signed-off-by: Hsiao Chien Sung <
> shawn.sung@mediatek.corp-partner.google.com>
> ---
>  drivers/gpu/drm/mediatek/Makefile                         | 4 ++--
>  drivers/gpu/drm/mediatek/{mtk_drm_plane.c => mtk_plane.c} | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
>  rename drivers/gpu/drm/mediatek/{mtk_drm_plane.c => mtk_plane.c}
> (99%)
> 
> diff --git a/drivers/gpu/drm/mediatek/Makefile
> b/drivers/gpu/drm/mediatek/Makefile
> index bdb71738e1f31..a47fbec7b9ce1 100644
> --- a/drivers/gpu/drm/mediatek/Makefile
> +++ b/drivers/gpu/drm/mediatek/Makefile
> @@ -12,12 +12,12 @@ mediatek-drm-y := mtk_crtc.o \
>  		  mtk_disp_rdma.o \
>  		  mtk_drm_drv.o \
>  		  mtk_drm_gem.o \
> -		  mtk_drm_plane.o \
>  		  mtk_dsi.o \
>  		  mtk_dpi.o \
>  		  mtk_ethdr.o \
>  		  mtk_mdp_rdma.o \
> -		  mtk_padding.o
> +		  mtk_padding.o \
> +		  mtk_plane.o
>  
>  obj-$(CONFIG_DRM_MEDIATEK) += mediatek-drm.o
>  
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> b/drivers/gpu/drm/mediatek/mtk_plane.c
> similarity index 99%
> rename from drivers/gpu/drm/mediatek/mtk_drm_plane.c
> rename to drivers/gpu/drm/mediatek/mtk_plane.c
> index 95a4328a9b0b6..4625deb21d406 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> +++ b/drivers/gpu/drm/mediatek/mtk_plane.c
> @@ -16,7 +16,7 @@
>  #include "mtk_crtc.h"
>  #include "mtk_ddp_comp.h"
>  #include "mtk_drm_drv.h"
> -#include "mtk_drm_gem.h"
> +#include "mtk_gem.h"

This should be another patch. After removing this,

Reviewed-by: CK Hu <ck.hu@mediatek.com>


>  #include "mtk_plane.h"
>  
>  static const u64 modifiers[] = {
CK Hu (胡俊光) March 20, 2024, 2:28 a.m. UTC | #2 
Hi, Shawn:

On Tue, 2024-03-19 at 15:02 +0800, Shawn Sung wrote:
> From: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
> 
> Rename files mtk_drm_gem.c to mtk_gem.c.

Reviewed-by: CK Hu <ck.hu@mediatek.com>

> 
> Reviewed-by: AngeloGiaocchino Del Regno <
> angelogioacchino.delregno@collabora.com>
> Signed-off-by: Hsiao Chien Sung <
> shawn.sung@mediatek.corp-partner.google.com>
> ---
>  drivers/gpu/drm/mediatek/Makefile                     | 2 +-
>  drivers/gpu/drm/mediatek/{mtk_drm_gem.c => mtk_gem.c} | 0
>  2 files changed, 1 insertion(+), 1 deletion(-)
>  rename drivers/gpu/drm/mediatek/{mtk_drm_gem.c => mtk_gem.c} (100%)
> 
> diff --git a/drivers/gpu/drm/mediatek/Makefile
> b/drivers/gpu/drm/mediatek/Makefile
> index a47fbec7b9ce1..32a2ed6c0cfef 100644
> --- a/drivers/gpu/drm/mediatek/Makefile
> +++ b/drivers/gpu/drm/mediatek/Makefile
> @@ -11,10 +11,10 @@ mediatek-drm-y := mtk_crtc.o \
>  		  mtk_disp_ovl_adaptor.o \
>  		  mtk_disp_rdma.o \
>  		  mtk_drm_drv.o \
> -		  mtk_drm_gem.o \
>  		  mtk_dsi.o \
>  		  mtk_dpi.o \
>  		  mtk_ethdr.o \
> +		  mtk_gem.o \
>  		  mtk_mdp_rdma.o \
>  		  mtk_padding.o \
>  		  mtk_plane.o
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c
> b/drivers/gpu/drm/mediatek/mtk_gem.c
> similarity index 100%
> rename from drivers/gpu/drm/mediatek/mtk_drm_gem.c
> rename to drivers/gpu/drm/mediatek/mtk_gem.c
Shawn Sung March 20, 2024, 2:48 a.m. UTC | #3 
Hi CK,

On Wed, 2024-03-20 at 02:04 +0000, CK Hu (胡俊光) wrote:
> Hi, Shawn:
> 
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> > b/drivers/gpu/drm/mediatek/mtk_plane.c
> > similarity index 99%
> > rename from drivers/gpu/drm/mediatek/mtk_drm_plane.c
> > rename to drivers/gpu/drm/mediatek/mtk_plane.c
> > index 95a4328a9b0b6..4625deb21d406 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_plane.c
> > @@ -16,7 +16,7 @@
> >  #include "mtk_crtc.h"
> >  #include "mtk_ddp_comp.h"
> >  #include "mtk_drm_drv.h"
> > -#include "mtk_drm_gem.h"
> > +#include "mtk_gem.h"
> 
> This should be another patch. After removing this,
> 
> Reviewed-by: CK Hu <ck.hu@mediatek.com>
> 

Thank you for the notification.
Will fix this error in the next version.

Regards,
Shawn