Message ID | 20240226085059.26850-7-shawn.sung@mediatek.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Rename mtk_drm_* to mtk_* | expand |
Il 26/02/24 09:50, Shawn Sung ha scritto: > From: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com> > > Rename files mtk_drm_crtc.* to mtk_crtc.*. > > Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com> Reviewed-by: AngeloGiaocchino Del Regno <angelogioacchino.delregno@collabora.com>
Hi, Shawn: On Mon, 2024-02-26 at 16:50 +0800, Shawn Sung wrote: > From: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com> > > Rename files mtk_drm_crtc.* to mtk_crtc.*. Reviewed-by: CK Hu <ck.hu@mediatek.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_crtc.c => mtk_crtc.c} | 2 +- > drivers/gpu/drm/mediatek/{mtk_drm_crtc.h => mtk_crtc.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_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_drm_ddp_comp.c | 2 +- > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- > drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 +- > drivers/gpu/drm/mediatek/mtk_ethdr.c | 2 +- > drivers/gpu/drm/mediatek/mtk_padding.c | 2 +- > 15 files changed, 14 insertions(+), 14 deletions(-) > rename drivers/gpu/drm/mediatek/{mtk_drm_crtc.c => mtk_crtc.c} (99%) > rename drivers/gpu/drm/mediatek/{mtk_drm_crtc.h => mtk_crtc.h} > (100%) > > diff --git a/drivers/gpu/drm/mediatek/Makefile > b/drivers/gpu/drm/mediatek/Makefile > index 5e4436403b8d..edad718082a9 100644 > --- a/drivers/gpu/drm/mediatek/Makefile > +++ b/drivers/gpu/drm/mediatek/Makefile > @@ -8,7 +8,7 @@ mediatek-drm-y := mtk_disp_aal.o \ > mtk_disp_ovl.o \ > mtk_disp_ovl_adaptor.o \ > mtk_disp_rdma.o \ > - mtk_drm_crtc.o \ > + mtk_crtc.o \ > mtk_drm_ddp_comp.o \ > mtk_drm_drv.o \ > mtk_drm_gem.o \ > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > b/drivers/gpu/drm/mediatek/mtk_crtc.c > similarity index 99% > rename from drivers/gpu/drm/mediatek/mtk_drm_crtc.c > rename to drivers/gpu/drm/mediatek/mtk_crtc.c > index d8b591aff3c2..503bdcd7e596 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > +++ b/drivers/gpu/drm/mediatek/mtk_crtc.c > @@ -20,7 +20,7 @@ > #include <drm/drm_vblank.h> > > #include "mtk_drm_drv.h" > -#include "mtk_drm_crtc.h" > +#include "mtk_crtc.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_drm_crtc.h > b/drivers/gpu/drm/mediatek/mtk_crtc.h > similarity index 100% > rename from drivers/gpu/drm/mediatek/mtk_drm_crtc.h > rename to drivers/gpu/drm/mediatek/mtk_crtc.h > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_aal.c > b/drivers/gpu/drm/mediatek/mtk_disp_aal.c > index 40fe403086c3..005fc9de2ee9 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_aal.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_aal.c > @@ -12,7 +12,7 @@ > #include <linux/soc/mediatek/mtk-cmdq.h> > > #include "mtk_disp_drv.h" > -#include "mtk_drm_crtc.h" > +#include "mtk_crtc.h" > #include "mtk_drm_ddp_comp.h" > #include "mtk_drm_drv.h" > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c > b/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c > index 465cddce0d32..cbdee3986120 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c > @@ -11,7 +11,7 @@ > #include <linux/soc/mediatek/mtk-cmdq.h> > > #include "mtk_disp_drv.h" > -#include "mtk_drm_crtc.h" > +#include "mtk_crtc.h" > #include "mtk_drm_ddp_comp.h" > #include "mtk_drm_drv.h" > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_color.c > b/drivers/gpu/drm/mediatek/mtk_disp_color.c > index 78ea99f1444f..e2124b447767 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_color.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_color.c > @@ -11,7 +11,7 @@ > #include <linux/soc/mediatek/mtk-cmdq.h> > > #include "mtk_disp_drv.h" > -#include "mtk_drm_crtc.h" > +#include "mtk_crtc.h" > #include "mtk_drm_ddp_comp.h" > #include "mtk_drm_drv.h" > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > index c1bc8b00d938..84b02064808b 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > @@ -12,7 +12,7 @@ > #include <linux/soc/mediatek/mtk-cmdq.h> > > #include "mtk_disp_drv.h" > -#include "mtk_drm_crtc.h" > +#include "mtk_crtc.h" > #include "mtk_drm_ddp_comp.h" > #include "mtk_drm_drv.h" > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > index 2bffe4245466..0ab680e11862 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > @@ -16,7 +16,7 @@ > #include <linux/soc/mediatek/mtk-cmdq.h> > > #include "mtk_disp_drv.h" > -#include "mtk_drm_crtc.h" > +#include "mtk_crtc.h" > #include "mtk_drm_ddp_comp.h" > #include "mtk_drm_drv.h" > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c > b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c > index 034d31824d4d..f2d9c372879a 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c > @@ -18,7 +18,7 @@ > #include <linux/soc/mediatek/mtk-mutex.h> > > #include "mtk_disp_drv.h" > -#include "mtk_drm_crtc.h" > +#include "mtk_crtc.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 faa907f2f443..af78240229e8 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c > @@ -14,7 +14,7 @@ > #include <linux/soc/mediatek/mtk-cmdq.h> > > #include "mtk_disp_drv.h" > -#include "mtk_drm_crtc.h" > +#include "mtk_crtc.h" > #include "mtk_drm_ddp_comp.h" > #include "mtk_drm_drv.h" > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > index a515e96cfefc..b2c0665867d3 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > @@ -18,7 +18,7 @@ > #include "mtk_drm_drv.h" > #include "mtk_drm_plane.h" > #include "mtk_drm_ddp_comp.h" > -#include "mtk_drm_crtc.h" > +#include "mtk_crtc.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 81e8aa65abd6..7be3b0546d3d 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > @@ -24,7 +24,7 @@ > #include <drm/drm_probe_helper.h> > #include <drm/drm_vblank.h> > > -#include "mtk_drm_crtc.h" > +#include "mtk_crtc.h" > #include "mtk_drm_ddp_comp.h" > #include "mtk_drm_drv.h" > #include "mtk_drm_gem.h" > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c > b/drivers/gpu/drm/mediatek/mtk_drm_plane.c > index db63a32c407e..720f6b4b0821 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c > @@ -13,7 +13,7 @@ > #include <drm/drm_gem_atomic_helper.h> > #include <linux/align.h> > > -#include "mtk_drm_crtc.h" > +#include "mtk_crtc.h" > #include "mtk_drm_ddp_comp.h" > #include "mtk_drm_drv.h" > #include "mtk_drm_gem.h" > diff --git a/drivers/gpu/drm/mediatek/mtk_ethdr.c > b/drivers/gpu/drm/mediatek/mtk_ethdr.c > index 6a5d0c345aab..41efaafe26f1 100644 > --- a/drivers/gpu/drm/mediatek/mtk_ethdr.c > +++ b/drivers/gpu/drm/mediatek/mtk_ethdr.c > @@ -14,7 +14,7 @@ > #include <linux/soc/mediatek/mtk-cmdq.h> > #include <linux/soc/mediatek/mtk-mmsys.h> > > -#include "mtk_drm_crtc.h" > +#include "mtk_crtc.h" > #include "mtk_drm_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 0d6451c149b6..cf233e43f95c 100644 > --- a/drivers/gpu/drm/mediatek/mtk_padding.c > +++ b/drivers/gpu/drm/mediatek/mtk_padding.c > @@ -12,7 +12,7 @@ > #include <linux/soc/mediatek/mtk-cmdq.h> > > #include "mtk_disp_drv.h" > -#include "mtk_drm_crtc.h" > +#include "mtk_crtc.h" > #include "mtk_drm_ddp_comp.h" > > #define PADDING_CONTROL_REG 0x00
Hi, Shawn: On Thu, 2024-03-14 at 14:40 +0800, CK Hu wrote: > Hi, Shawn: > > On Mon, 2024-02-26 at 16:50 +0800, Shawn Sung wrote: > > From: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com > > > > > > > Rename files mtk_drm_crtc.* to mtk_crtc.*. > > Reviewed-by: CK Hu <ck.hu@mediatek.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_crtc.c => mtk_crtc.c} | 2 +- > > drivers/gpu/drm/mediatek/{mtk_drm_crtc.h => mtk_crtc.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_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_drm_ddp_comp.c | 2 +- > > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- > > drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 +- > > drivers/gpu/drm/mediatek/mtk_ethdr.c | 2 +- > > drivers/gpu/drm/mediatek/mtk_padding.c | 2 +- > > 15 files changed, 14 insertions(+), 14 deletions(-) > > rename drivers/gpu/drm/mediatek/{mtk_drm_crtc.c => mtk_crtc.c} > > (99%) > > rename drivers/gpu/drm/mediatek/{mtk_drm_crtc.h => mtk_crtc.h} > > (100%) > > > > diff --git a/drivers/gpu/drm/mediatek/Makefile > > b/drivers/gpu/drm/mediatek/Makefile > > index 5e4436403b8d..edad718082a9 100644 > > --- a/drivers/gpu/drm/mediatek/Makefile > > +++ b/drivers/gpu/drm/mediatek/Makefile > > @@ -8,7 +8,7 @@ mediatek-drm-y := mtk_disp_aal.o \ > > mtk_disp_ovl.o \ > > mtk_disp_ovl_adaptor.o \ > > mtk_disp_rdma.o \ > > - mtk_drm_crtc.o \ > > + mtk_crtc.o \ > > mtk_drm_ddp_comp.o \ > > mtk_drm_drv.o \ > > mtk_drm_gem.o \ > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > > b/drivers/gpu/drm/mediatek/mtk_crtc.c > > similarity index 99% > > rename from drivers/gpu/drm/mediatek/mtk_drm_crtc.c > > rename to drivers/gpu/drm/mediatek/mtk_crtc.c > > index d8b591aff3c2..503bdcd7e596 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > > +++ b/drivers/gpu/drm/mediatek/mtk_crtc.c > > @@ -20,7 +20,7 @@ > > #include <drm/drm_vblank.h> > > > > #include "mtk_drm_drv.h" > > -#include "mtk_drm_crtc.h" > > +#include "mtk_crtc.h" Please remove my reviewed-by tag because the include list should be in alphabetic order. Regards, CK > > #include "mtk_drm_ddp_comp.h" > > #include "mtk_drm_gem.h" > > #include "mtk_drm_plane.h" > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h > > b/drivers/gpu/drm/mediatek/mtk_crtc.h > > similarity index 100% > > rename from drivers/gpu/drm/mediatek/mtk_drm_crtc.h > > rename to drivers/gpu/drm/mediatek/mtk_crtc.h > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_aal.c > > b/drivers/gpu/drm/mediatek/mtk_disp_aal.c > > index 40fe403086c3..005fc9de2ee9 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_disp_aal.c > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_aal.c > > @@ -12,7 +12,7 @@ > > #include <linux/soc/mediatek/mtk-cmdq.h> > > > > #include "mtk_disp_drv.h" > > -#include "mtk_drm_crtc.h" > > +#include "mtk_crtc.h" > > #include "mtk_drm_ddp_comp.h" > > #include "mtk_drm_drv.h" > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c > > b/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c > > index 465cddce0d32..cbdee3986120 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c > > @@ -11,7 +11,7 @@ > > #include <linux/soc/mediatek/mtk-cmdq.h> > > > > #include "mtk_disp_drv.h" > > -#include "mtk_drm_crtc.h" > > +#include "mtk_crtc.h" > > #include "mtk_drm_ddp_comp.h" > > #include "mtk_drm_drv.h" > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_color.c > > b/drivers/gpu/drm/mediatek/mtk_disp_color.c > > index 78ea99f1444f..e2124b447767 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_disp_color.c > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_color.c > > @@ -11,7 +11,7 @@ > > #include <linux/soc/mediatek/mtk-cmdq.h> > > > > #include "mtk_disp_drv.h" > > -#include "mtk_drm_crtc.h" > > +#include "mtk_crtc.h" > > #include "mtk_drm_ddp_comp.h" > > #include "mtk_drm_drv.h" > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > > b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > > index c1bc8b00d938..84b02064808b 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > > @@ -12,7 +12,7 @@ > > #include <linux/soc/mediatek/mtk-cmdq.h> > > > > #include "mtk_disp_drv.h" > > -#include "mtk_drm_crtc.h" > > +#include "mtk_crtc.h" > > #include "mtk_drm_ddp_comp.h" > > #include "mtk_drm_drv.h" > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > > b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > > index 2bffe4245466..0ab680e11862 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > > @@ -16,7 +16,7 @@ > > #include <linux/soc/mediatek/mtk-cmdq.h> > > > > #include "mtk_disp_drv.h" > > -#include "mtk_drm_crtc.h" > > +#include "mtk_crtc.h" > > #include "mtk_drm_ddp_comp.h" > > #include "mtk_drm_drv.h" > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c > > b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c > > index 034d31824d4d..f2d9c372879a 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c > > @@ -18,7 +18,7 @@ > > #include <linux/soc/mediatek/mtk-mutex.h> > > > > #include "mtk_disp_drv.h" > > -#include "mtk_drm_crtc.h" > > +#include "mtk_crtc.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 faa907f2f443..af78240229e8 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c > > @@ -14,7 +14,7 @@ > > #include <linux/soc/mediatek/mtk-cmdq.h> > > > > #include "mtk_disp_drv.h" > > -#include "mtk_drm_crtc.h" > > +#include "mtk_crtc.h" > > #include "mtk_drm_ddp_comp.h" > > #include "mtk_drm_drv.h" > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > > b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > > index a515e96cfefc..b2c0665867d3 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > > @@ -18,7 +18,7 @@ > > #include "mtk_drm_drv.h" > > #include "mtk_drm_plane.h" > > #include "mtk_drm_ddp_comp.h" > > -#include "mtk_drm_crtc.h" > > +#include "mtk_crtc.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 81e8aa65abd6..7be3b0546d3d 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > > @@ -24,7 +24,7 @@ > > #include <drm/drm_probe_helper.h> > > #include <drm/drm_vblank.h> > > > > -#include "mtk_drm_crtc.h" > > +#include "mtk_crtc.h" > > #include "mtk_drm_ddp_comp.h" > > #include "mtk_drm_drv.h" > > #include "mtk_drm_gem.h" > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c > > b/drivers/gpu/drm/mediatek/mtk_drm_plane.c > > index db63a32c407e..720f6b4b0821 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c > > +++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c > > @@ -13,7 +13,7 @@ > > #include <drm/drm_gem_atomic_helper.h> > > #include <linux/align.h> > > > > -#include "mtk_drm_crtc.h" > > +#include "mtk_crtc.h" > > #include "mtk_drm_ddp_comp.h" > > #include "mtk_drm_drv.h" > > #include "mtk_drm_gem.h" > > diff --git a/drivers/gpu/drm/mediatek/mtk_ethdr.c > > b/drivers/gpu/drm/mediatek/mtk_ethdr.c > > index 6a5d0c345aab..41efaafe26f1 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_ethdr.c > > +++ b/drivers/gpu/drm/mediatek/mtk_ethdr.c > > @@ -14,7 +14,7 @@ > > #include <linux/soc/mediatek/mtk-cmdq.h> > > #include <linux/soc/mediatek/mtk-mmsys.h> > > > > -#include "mtk_drm_crtc.h" > > +#include "mtk_crtc.h" > > #include "mtk_drm_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 0d6451c149b6..cf233e43f95c 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_padding.c > > +++ b/drivers/gpu/drm/mediatek/mtk_padding.c > > @@ -12,7 +12,7 @@ > > #include <linux/soc/mediatek/mtk-cmdq.h> > > > > #include "mtk_disp_drv.h" > > -#include "mtk_drm_crtc.h" > > +#include "mtk_crtc.h" > > #include "mtk_drm_ddp_comp.h" > > > > #define PADDING_CONTROL_REG 0x00
diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/Makefile index 5e4436403b8d..edad718082a9 100644 --- a/drivers/gpu/drm/mediatek/Makefile +++ b/drivers/gpu/drm/mediatek/Makefile @@ -8,7 +8,7 @@ mediatek-drm-y := mtk_disp_aal.o \ mtk_disp_ovl.o \ mtk_disp_ovl_adaptor.o \ mtk_disp_rdma.o \ - mtk_drm_crtc.o \ + mtk_crtc.o \ mtk_drm_ddp_comp.o \ mtk_drm_drv.o \ mtk_drm_gem.o \ diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_crtc.c similarity index 99% rename from drivers/gpu/drm/mediatek/mtk_drm_crtc.c rename to drivers/gpu/drm/mediatek/mtk_crtc.c index d8b591aff3c2..503bdcd7e596 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c +++ b/drivers/gpu/drm/mediatek/mtk_crtc.c @@ -20,7 +20,7 @@ #include <drm/drm_vblank.h> #include "mtk_drm_drv.h" -#include "mtk_drm_crtc.h" +#include "mtk_crtc.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_drm_crtc.h b/drivers/gpu/drm/mediatek/mtk_crtc.h similarity index 100% rename from drivers/gpu/drm/mediatek/mtk_drm_crtc.h rename to drivers/gpu/drm/mediatek/mtk_crtc.h diff --git a/drivers/gpu/drm/mediatek/mtk_disp_aal.c b/drivers/gpu/drm/mediatek/mtk_disp_aal.c index 40fe403086c3..005fc9de2ee9 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_aal.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_aal.c @@ -12,7 +12,7 @@ #include <linux/soc/mediatek/mtk-cmdq.h> #include "mtk_disp_drv.h" -#include "mtk_drm_crtc.h" +#include "mtk_crtc.h" #include "mtk_drm_ddp_comp.h" #include "mtk_drm_drv.h" diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c b/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c index 465cddce0d32..cbdee3986120 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c @@ -11,7 +11,7 @@ #include <linux/soc/mediatek/mtk-cmdq.h> #include "mtk_disp_drv.h" -#include "mtk_drm_crtc.h" +#include "mtk_crtc.h" #include "mtk_drm_ddp_comp.h" #include "mtk_drm_drv.h" diff --git a/drivers/gpu/drm/mediatek/mtk_disp_color.c b/drivers/gpu/drm/mediatek/mtk_disp_color.c index 78ea99f1444f..e2124b447767 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_color.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_color.c @@ -11,7 +11,7 @@ #include <linux/soc/mediatek/mtk-cmdq.h> #include "mtk_disp_drv.h" -#include "mtk_drm_crtc.h" +#include "mtk_crtc.h" #include "mtk_drm_ddp_comp.h" #include "mtk_drm_drv.h" diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c index c1bc8b00d938..84b02064808b 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c @@ -12,7 +12,7 @@ #include <linux/soc/mediatek/mtk-cmdq.h> #include "mtk_disp_drv.h" -#include "mtk_drm_crtc.h" +#include "mtk_crtc.h" #include "mtk_drm_ddp_comp.h" #include "mtk_drm_drv.h" diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c index 2bffe4245466..0ab680e11862 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c @@ -16,7 +16,7 @@ #include <linux/soc/mediatek/mtk-cmdq.h> #include "mtk_disp_drv.h" -#include "mtk_drm_crtc.h" +#include "mtk_crtc.h" #include "mtk_drm_ddp_comp.h" #include "mtk_drm_drv.h" diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c index 034d31824d4d..f2d9c372879a 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c @@ -18,7 +18,7 @@ #include <linux/soc/mediatek/mtk-mutex.h> #include "mtk_disp_drv.h" -#include "mtk_drm_crtc.h" +#include "mtk_crtc.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 faa907f2f443..af78240229e8 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c @@ -14,7 +14,7 @@ #include <linux/soc/mediatek/mtk-cmdq.h> #include "mtk_disp_drv.h" -#include "mtk_drm_crtc.h" +#include "mtk_crtc.h" #include "mtk_drm_ddp_comp.h" #include "mtk_drm_drv.h" diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c index a515e96cfefc..b2c0665867d3 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c @@ -18,7 +18,7 @@ #include "mtk_drm_drv.h" #include "mtk_drm_plane.h" #include "mtk_drm_ddp_comp.h" -#include "mtk_drm_crtc.h" +#include "mtk_crtc.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 81e8aa65abd6..7be3b0546d3d 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -24,7 +24,7 @@ #include <drm/drm_probe_helper.h> #include <drm/drm_vblank.h> -#include "mtk_drm_crtc.h" +#include "mtk_crtc.h" #include "mtk_drm_ddp_comp.h" #include "mtk_drm_drv.h" #include "mtk_drm_gem.h" diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/mediatek/mtk_drm_plane.c index db63a32c407e..720f6b4b0821 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c @@ -13,7 +13,7 @@ #include <drm/drm_gem_atomic_helper.h> #include <linux/align.h> -#include "mtk_drm_crtc.h" +#include "mtk_crtc.h" #include "mtk_drm_ddp_comp.h" #include "mtk_drm_drv.h" #include "mtk_drm_gem.h" diff --git a/drivers/gpu/drm/mediatek/mtk_ethdr.c b/drivers/gpu/drm/mediatek/mtk_ethdr.c index 6a5d0c345aab..41efaafe26f1 100644 --- a/drivers/gpu/drm/mediatek/mtk_ethdr.c +++ b/drivers/gpu/drm/mediatek/mtk_ethdr.c @@ -14,7 +14,7 @@ #include <linux/soc/mediatek/mtk-cmdq.h> #include <linux/soc/mediatek/mtk-mmsys.h> -#include "mtk_drm_crtc.h" +#include "mtk_crtc.h" #include "mtk_drm_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 0d6451c149b6..cf233e43f95c 100644 --- a/drivers/gpu/drm/mediatek/mtk_padding.c +++ b/drivers/gpu/drm/mediatek/mtk_padding.c @@ -12,7 +12,7 @@ #include <linux/soc/mediatek/mtk-cmdq.h> #include "mtk_disp_drv.h" -#include "mtk_drm_crtc.h" +#include "mtk_crtc.h" #include "mtk_drm_ddp_comp.h" #define PADDING_CONTROL_REG 0x00