drm/mediatek: Rename files "mtk_drm_plane.h" to "mtk_plane.h"

Rename files mtk_drm_plane.h to mtk_plane.h.

Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: CK Hu <ck.hu@mediatek.com>
Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
Link: https://patchwork.kernel.org/project/dri-devel/patch/20240322091232.26387-11-shawn.sung@mediatek.com/
Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>

diff --git a/drivers/gpu/drm/mediatek/mtk_crtc.c b/drivers/gpu/drm/mediatek/mtk_crtc.c
index a34682c3de4a1b63ec2d5c7c821195632648dfd1..9bfaa683aab347e8db1f1f38045fdbc5d8d9c51a 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_crtc.c
@@ -23,7 +23,7 @@
 #include "mtk_ddp_comp.h"
 #include "mtk_drm_drv.h"
 #include "mtk_drm_gem.h"
-#include "mtk_drm_plane.h"
+#include "mtk_plane.h"
 
 /*
  * struct mtk_crtc - MediaTek specific crtc structure.

diff --git a/drivers/gpu/drm/mediatek/mtk_crtc.h b/drivers/gpu/drm/mediatek/mtk_crtc.h
index fd6c006f0c169451c9715bd5d1193d38c0d6c01c..388e900b6f4ded1b4047838f670fd18ee0700e54 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_crtc.h
+++ b/drivers/gpu/drm/mediatek/mtk_crtc.h
@@ -9,7 +9,7 @@
 #include <drm/drm_crtc.h>
 #include "mtk_ddp_comp.h"
 #include "mtk_drm_drv.h"
-#include "mtk_drm_plane.h"
+#include "mtk_plane.h"
 
 #define MTK_MAX_BPC    10
 #define MTK_MIN_BPC    3

diff --git a/drivers/gpu/drm/mediatek/mtk_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c
index ab96b1001de3e3b8df40ae40686e8c7c0bbc0d61..c3441508f452f42015f7fffe4cc0576a98bb8387 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_ddp_comp.c
+++ b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c
@@ -18,7 +18,7 @@
 #include "mtk_ddp_comp.h"
 #include "mtk_disp_drv.h"
 #include "mtk_drm_drv.h"
-#include "mtk_drm_plane.h"
+#include "mtk_plane.h"
 
 
 #define DISP_REG_DITHER_EN                     0x0000

diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h b/drivers/gpu/drm/mediatek/mtk_disp_drv.h
index 90e64467ea8f8bdd9547fbefa3a552bcfa5b7a50..082ac18fe04aab331fcabf4e4d3877a58f9261f2 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h
+++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h
@@ -9,8 +9,8 @@
 #include <linux/soc/mediatek/mtk-cmdq.h>
 #include <linux/soc/mediatek/mtk-mmsys.h>
 #include <linux/soc/mediatek/mtk-mutex.h>
-#include "mtk_drm_plane.h"
 #include "mtk_mdp_rdma.h"
+#include "mtk_plane.h"
 
 int mtk_aal_clk_enable(struct device *dev);
 void mtk_aal_clk_disable(struct device *dev);

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
index 63a7a24468c13f161979dce25d4d41f141eebf89..95a4328a9b0b60bbc4e4a2affeffbeabfd994581 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
@@ -17,7 +17,7 @@
 #include "mtk_ddp_comp.h"
 #include "mtk_drm_drv.h"
 #include "mtk_drm_gem.h"
-#include "mtk_drm_plane.h"
+#include "mtk_plane.h"
 
 static const u64 modifiers[] = {
        DRM_FORMAT_MOD_LINEAR,

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.h b/drivers/gpu/drm/mediatek/mtk_drm_plane.h
deleted file mode 100644 (file)
index 231bb7a..0000000
--- a/drivers/gpu/drm/mediatek/mtk_drm_plane.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (c) 2015 MediaTek Inc.
- * Author: CK Hu <ck.hu@mediatek.com>
- */
-
-#ifndef _MTK_PLANE_H_
-#define _MTK_PLANE_H_
-
-#include <drm/drm_crtc.h>
-#include <linux/types.h>
-
-#define AFBC_DATA_BLOCK_WIDTH 32
-#define AFBC_DATA_BLOCK_HEIGHT 8
-#define AFBC_HEADER_BLOCK_SIZE 16
-#define AFBC_HEADER_ALIGNMENT 1024
-
-struct mtk_plane_pending_state {
-       bool                            config;
-       bool                            enable;
-       dma_addr_t                      addr;
-       dma_addr_t                      hdr_addr;
-       unsigned int                    pitch;
-       unsigned int                    hdr_pitch;
-       unsigned int                    format;
-       unsigned long long              modifier;
-       unsigned int                    x;
-       unsigned int                    y;
-       unsigned int                    width;
-       unsigned int                    height;
-       unsigned int                    rotation;
-       bool                            dirty;
-       bool                            async_dirty;
-       bool                            async_config;
-       enum drm_color_encoding         color_encoding;
-};
-
-struct mtk_plane_state {
-       struct drm_plane_state          base;
-       struct mtk_plane_pending_state  pending;
-};
-
-static inline struct mtk_plane_state *
-to_mtk_plane_state(struct drm_plane_state *state)
-{
-       return container_of(state, struct mtk_plane_state, base);
-}
-
-int mtk_plane_init(struct drm_device *dev, struct drm_plane *plane,
-                  unsigned long possible_crtcs, enum drm_plane_type type,
-                  unsigned int supported_rotations, const u32 *formats,
-                  size_t num_formats);
-
-#endif

diff --git a/drivers/gpu/drm/mediatek/mtk_plane.h b/drivers/gpu/drm/mediatek/mtk_plane.h
new file mode 100644 (file)
index 0000000..231bb7a
--- /dev/null
+++ b/drivers/gpu/drm/mediatek/mtk_plane.h
@@ -0,0 +1,54 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (c) 2015 MediaTek Inc.
+ * Author: CK Hu <ck.hu@mediatek.com>
+ */
+
+#ifndef _MTK_PLANE_H_
+#define _MTK_PLANE_H_
+
+#include <drm/drm_crtc.h>
+#include <linux/types.h>
+
+#define AFBC_DATA_BLOCK_WIDTH 32
+#define AFBC_DATA_BLOCK_HEIGHT 8
+#define AFBC_HEADER_BLOCK_SIZE 16
+#define AFBC_HEADER_ALIGNMENT 1024
+
+struct mtk_plane_pending_state {
+       bool                            config;
+       bool                            enable;
+       dma_addr_t                      addr;
+       dma_addr_t                      hdr_addr;
+       unsigned int                    pitch;
+       unsigned int                    hdr_pitch;
+       unsigned int                    format;
+       unsigned long long              modifier;
+       unsigned int                    x;
+       unsigned int                    y;
+       unsigned int                    width;
+       unsigned int                    height;
+       unsigned int                    rotation;
+       bool                            dirty;
+       bool                            async_dirty;
+       bool                            async_config;
+       enum drm_color_encoding         color_encoding;
+};
+
+struct mtk_plane_state {
+       struct drm_plane_state          base;
+       struct mtk_plane_pending_state  pending;
+};
+
+static inline struct mtk_plane_state *
+to_mtk_plane_state(struct drm_plane_state *state)
+{
+       return container_of(state, struct mtk_plane_state, base);
+}
+
+int mtk_plane_init(struct drm_device *dev, struct drm_plane *plane,
+                  unsigned long possible_crtcs, enum drm_plane_type type,
+                  unsigned int supported_rotations, const u32 *formats,
+                  size_t num_formats);
+
+#endif