[PATCH v2 08/14] drm/mediatek: Rename files "mtk_drm_ddp_comp.h" to "mtk_ddp_comp.h"

Tue Mar 19 18:42:42 PDT 2024

Hi, Shawn:

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

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

> 
> Reviewed-by: AngeloGiaocchino Del Regno <
> angelogioacchino.delregno at collabora.com>
> Signed-off-by: Hsiao Chien Sung <
> shawn.sung at mediatek.corp-partner.google.com>
> ---
>  drivers/gpu/drm/mediatek/mtk_crtc.c                             | 2
> +-
>  drivers/gpu/drm/mediatek/mtk_crtc.h                             | 2
> +-
>  drivers/gpu/drm/mediatek/{mtk_drm_ddp_comp.h => mtk_ddp_comp.h} | 0
>  drivers/gpu/drm/mediatek/mtk_disp_aal.c                         | 2
> +-
>  drivers/gpu/drm/mediatek/mtk_disp_ccorr.c                       | 2
> +-
>  drivers/gpu/drm/mediatek/mtk_disp_color.c                       | 2
> +-
>  drivers/gpu/drm/mediatek/mtk_disp_gamma.c                       | 2
> +-
>  drivers/gpu/drm/mediatek/mtk_disp_merge.c                       | 2
> +-
>  drivers/gpu/drm/mediatek/mtk_disp_ovl.c                         | 2
> +-
>  drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c                 | 2
> +-
>  drivers/gpu/drm/mediatek/mtk_disp_rdma.c                        | 2
> +-
>  drivers/gpu/drm/mediatek/mtk_dpi.c                              | 2
> +-
>  drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c                     | 2
> +-
>  drivers/gpu/drm/mediatek/mtk_drm_drv.c                          | 2
> +-
>  drivers/gpu/drm/mediatek/mtk_drm_drv.h                          | 2
> +-
>  drivers/gpu/drm/mediatek/mtk_drm_plane.c                        | 2
> +-
>  drivers/gpu/drm/mediatek/mtk_dsi.c                              | 2
> +-
>  drivers/gpu/drm/mediatek/mtk_ethdr.c                            | 2
> +-
>  drivers/gpu/drm/mediatek/mtk_padding.c                          | 2
> +-
>  19 files changed, 18 insertions(+), 18 deletions(-)
>  rename drivers/gpu/drm/mediatek/{mtk_drm_ddp_comp.h =>
> mtk_ddp_comp.h} (100%)
> 
> diff --git a/drivers/gpu/drm/mediatek/mtk_crtc.c
> b/drivers/gpu/drm/mediatek/mtk_crtc.c
> index 631c1ef2847ef..7710e539e3da1 100644
> --- a/drivers/gpu/drm/mediatek/mtk_crtc.c
> +++ b/drivers/gpu/drm/mediatek/mtk_crtc.c
> @@ -20,8 +20,8 @@
>  #include <drm/drm_vblank.h>
>  
>  #include "mtk_crtc.h"
> +#include "mtk_ddp_comp.h"
>  #include "mtk_drm_drv.h"
> -#include "mtk_drm_ddp_comp.h"
>  #include "mtk_drm_gem.h"
>  #include "mtk_drm_plane.h"
>  
> diff --git a/drivers/gpu/drm/mediatek/mtk_crtc.h
> b/drivers/gpu/drm/mediatek/mtk_crtc.h
> index 2d9f28f436aea..fd6c006f0c169 100644
> --- a/drivers/gpu/drm/mediatek/mtk_crtc.h
> +++ b/drivers/gpu/drm/mediatek/mtk_crtc.h
> @@ -7,7 +7,7 @@
>  #define MTK_CRTC_H
>  
>  #include <drm/drm_crtc.h>
> -#include "mtk_drm_ddp_comp.h"
> +#include "mtk_ddp_comp.h"
>  #include "mtk_drm_drv.h"
>  #include "mtk_drm_plane.h"
>  
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> b/drivers/gpu/drm/mediatek/mtk_ddp_comp.h
> similarity index 100%
> rename from drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> rename to drivers/gpu/drm/mediatek/mtk_ddp_comp.h
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_aal.c
> b/drivers/gpu/drm/mediatek/mtk_disp_aal.c
> index ba926e797af8a..92acdaddd648d 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_aal.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_aal.c
> @@ -12,8 +12,8 @@
>  #include <linux/soc/mediatek/mtk-cmdq.h>
>  
>  #include "mtk_crtc.h"
> +#include "mtk_ddp_comp.h"
>  #include "mtk_disp_drv.h"
> -#include "mtk_drm_ddp_comp.h"
>  #include "mtk_drm_drv.h"
>  
>  #define DISP_AAL_EN				0x0000
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c
> b/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c
> index 79bcd3c487563..975ee45a0f72c 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c
> @@ -11,8 +11,8 @@
>  #include <linux/soc/mediatek/mtk-cmdq.h>
>  
>  #include "mtk_crtc.h"
> +#include "mtk_ddp_comp.h"
>  #include "mtk_disp_drv.h"
> -#include "mtk_drm_ddp_comp.h"
>  #include "mtk_drm_drv.h"
>  
>  #define DISP_CCORR_EN				0x0000
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_color.c
> b/drivers/gpu/drm/mediatek/mtk_disp_color.c
> index 4aa41b1ff2602..91e7837a32c86 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_color.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_color.c
> @@ -11,8 +11,8 @@
>  #include <linux/soc/mediatek/mtk-cmdq.h>
>  
>  #include "mtk_crtc.h"
> +#include "mtk_ddp_comp.h"
>  #include "mtk_disp_drv.h"
> -#include "mtk_drm_ddp_comp.h"
>  #include "mtk_drm_drv.h"
>  
>  #define DISP_COLOR_CFG_MAIN			0x0400
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c
> b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c
> index 1a1ee77127ee9..51ae4f947c714 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c
> @@ -12,8 +12,8 @@
>  #include <linux/soc/mediatek/mtk-cmdq.h>
>  
>  #include "mtk_crtc.h"
> +#include "mtk_ddp_comp.h"
>  #include "mtk_disp_drv.h"
> -#include "mtk_drm_ddp_comp.h"
>  #include "mtk_drm_drv.h"
>  
>  #define DISP_GAMMA_EN				0x0000
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_merge.c
> b/drivers/gpu/drm/mediatek/mtk_disp_merge.c
> index 32a29924bd54c..3b1e04ecb9d45 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_merge.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_merge.c
> @@ -10,7 +10,7 @@
>  #include <linux/reset.h>
>  #include <linux/soc/mediatek/mtk-cmdq.h>
>  
> -#include "mtk_drm_ddp_comp.h"
> +#include "mtk_ddp_comp.h"
>  #include "mtk_drm_drv.h"
>  #include "mtk_disp_drv.h"
>  
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> index 7f2219c0119be..0ebeaf9830d83 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> @@ -16,8 +16,8 @@
>  #include <linux/soc/mediatek/mtk-cmdq.h>
>  
>  #include "mtk_crtc.h"
> +#include "mtk_ddp_comp.h"
>  #include "mtk_disp_drv.h"
> -#include "mtk_drm_ddp_comp.h"
>  #include "mtk_drm_drv.h"
>  
>  #define DISP_REG_OVL_INTEN			0x0004
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
> b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
> index 542dc2a20ea90..d957f5c8ccf92 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
> @@ -18,8 +18,8 @@
>  #include <linux/soc/mediatek/mtk-mutex.h>
>  
>  #include "mtk_crtc.h"
> +#include "mtk_ddp_comp.h"
>  #include "mtk_disp_drv.h"
> -#include "mtk_drm_ddp_comp.h"
>  #include "mtk_drm_drv.h"
>  #include "mtk_ethdr.h"
>  
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
> b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
> index 04f584372214f..f06b048c12479 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
> @@ -14,8 +14,8 @@
>  #include <linux/soc/mediatek/mtk-cmdq.h>
>  
>  #include "mtk_crtc.h"
> +#include "mtk_ddp_comp.h"
>  #include "mtk_disp_drv.h"
> -#include "mtk_drm_ddp_comp.h"
>  #include "mtk_drm_drv.h"
>  
>  #define DISP_REG_RDMA_INT_ENABLE		0x0000
> diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c
> b/drivers/gpu/drm/mediatek/mtk_dpi.c
> index beb7d9d08e971..fbf63e0441337 100644
> --- a/drivers/gpu/drm/mediatek/mtk_dpi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
> @@ -26,9 +26,9 @@
>  #include <drm/drm_of.h>
>  #include <drm/drm_simple_kms_helper.h>
>  
> +#include "mtk_ddp_comp.h"
>  #include "mtk_disp_drv.h"
>  #include "mtk_dpi_regs.h"
> -#include "mtk_drm_ddp_comp.h"
>  #include "mtk_drm_drv.h"
>  
>  enum mtk_dpi_out_bit_num {
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> index 24389c6c3561f..ab96b1001de3e 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> @@ -15,10 +15,10 @@
>  #include <drm/drm_print.h>
>  
>  #include "mtk_crtc.h"
> +#include "mtk_ddp_comp.h"
>  #include "mtk_disp_drv.h"
>  #include "mtk_drm_drv.h"
>  #include "mtk_drm_plane.h"
> -#include "mtk_drm_ddp_comp.h"
>  
>  
>  #define DISP_REG_DITHER_EN			0x0000
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> index 7be3b0546d3df..113fdbaac5a14 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> @@ -25,7 +25,7 @@
>  #include <drm/drm_vblank.h>
>  
>  #include "mtk_crtc.h"
> -#include "mtk_drm_ddp_comp.h"
> +#include "mtk_ddp_comp.h"
>  #include "mtk_drm_drv.h"
>  #include "mtk_drm_gem.h"
>  
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h
> b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
> index 24c4d59085bd6..78d698ede1bf8 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
> @@ -7,7 +7,7 @@
>  #define MTK_DRM_DRV_H
>  
>  #include <linux/io.h>
> -#include "mtk_drm_ddp_comp.h"
> +#include "mtk_ddp_comp.h"
>  
>  #define MAX_CONNECTOR	2
>  #define DDP_COMPONENT_DRM_OVL_ADAPTOR (DDP_COMPONENT_ID_MAX + 1)
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> index 720f6b4b08215..63a7a24468c13 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> @@ -14,7 +14,7 @@
>  #include <linux/align.h>
>  
>  #include "mtk_crtc.h"
> -#include "mtk_drm_ddp_comp.h"
> +#include "mtk_ddp_comp.h"
>  #include "mtk_drm_drv.h"
>  #include "mtk_drm_gem.h"
>  #include "mtk_drm_plane.h"
> diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c
> b/drivers/gpu/drm/mediatek/mtk_dsi.c
> index ec9d96396d7b2..e29c37fb5be09 100644
> --- a/drivers/gpu/drm/mediatek/mtk_dsi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
> @@ -28,8 +28,8 @@
>  #include <drm/drm_probe_helper.h>
>  #include <drm/drm_simple_kms_helper.h>
>  
> +#include "mtk_ddp_comp.h"
>  #include "mtk_disp_drv.h"
> -#include "mtk_drm_ddp_comp.h"
>  #include "mtk_drm_drv.h"
>  
>  #define DSI_START		0x00
> diff --git a/drivers/gpu/drm/mediatek/mtk_ethdr.c
> b/drivers/gpu/drm/mediatek/mtk_ethdr.c
> index 41efaafe26f1a..9b0264bd5e731 100644
> --- a/drivers/gpu/drm/mediatek/mtk_ethdr.c
> +++ b/drivers/gpu/drm/mediatek/mtk_ethdr.c
> @@ -15,7 +15,7 @@
>  #include <linux/soc/mediatek/mtk-mmsys.h>
>  
>  #include "mtk_crtc.h"
> -#include "mtk_drm_ddp_comp.h"
> +#include "mtk_ddp_comp.h"
>  #include "mtk_drm_drv.h"
>  #include "mtk_ethdr.h"
>  
> diff --git a/drivers/gpu/drm/mediatek/mtk_padding.c
> b/drivers/gpu/drm/mediatek/mtk_padding.c
> index ff6a5c695128c..1f91805cd9aac 100644
> --- a/drivers/gpu/drm/mediatek/mtk_padding.c
> +++ b/drivers/gpu/drm/mediatek/mtk_padding.c
> @@ -12,8 +12,8 @@
>  #include <linux/soc/mediatek/mtk-cmdq.h>
>  
>  #include "mtk_crtc.h"
> +#include "mtk_ddp_comp.h"
>  #include "mtk_disp_drv.h"
> -#include "mtk_drm_ddp_comp.h"
>  
>  #define PADDING_CONTROL_REG	0x00
>  #define PADDING_BYPASS			BIT(0)