2024-02-26 09:32:12

by Shawn Sung

[permalink] [raw]
Subject: [PATCH 00/11] Rename mtk_drm_* to mtk_*

From: Hsiao Chien Sung <[email protected]>

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

Hsiao Chien Sung (11):
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.*" to "mtk_crtc.*"
drm/mediatek: Rename files "mtk_drm_ddp_comp.*" to "mtk_ddp_comp.*"
drm/mediatek: Rename files "mtk_drm_plane.*" to "mtk_plane.*"
drm/mediatek: Rename files "mtk_drm_gem.*" to "mtk_gem.*"
drm/mediatek: Rename mtk_ddp_comp functions
drm/mediatek: Rename "pending_needs_vblank" to "needs_vblank"

drivers/gpu/drm/mediatek/Makefile | 8 +-
.../mediatek/{mtk_drm_crtc.c => mtk_crtc.c} | 218 +++++++++---------
drivers/gpu/drm/mediatek/mtk_crtc.h | 30 +++
.../{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} | 19 +-
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, 277 insertions(+), 283 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} (65%)
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



2024-02-26 09:32:17

by Shawn Sung

[permalink] [raw]
Subject: [PATCH 10/11] drm/mediatek: Rename mtk_ddp_comp functions

From: Hsiao Chien Sung <[email protected]>

Rename functions of mtk_ddp_comp:
- To align the naming rule
- To reduce the code size

Signed-off-by: Hsiao Chien Sung <[email protected]>
---
drivers/gpu/drm/mediatek/mtk_ddp_comp.c | 45 ++++++++++++++-----------
drivers/gpu/drm/mediatek/mtk_ddp_comp.h | 3 +-
drivers/gpu/drm/mediatek/mtk_dpi.c | 2 +-
drivers/gpu/drm/mediatek/mtk_dsi.c | 2 +-
4 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c
index ab846a9f98c5..f6d482d27c63 100644
--- a/drivers/gpu/drm/mediatek/mtk_ddp_comp.c
+++ b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c
@@ -497,10 +497,10 @@ static const struct mtk_ddp_comp_match mtk_ddp_matches[DDP_COMPONENT_DRM_ID_MAX]
[DDP_COMPONENT_WDMA1] = { MTK_DISP_WDMA, 1, NULL },
};

-static bool mtk_drm_find_comp_in_ddp(struct device *dev,
- const unsigned int *path,
- unsigned int path_len,
- struct mtk_ddp_comp *ddp_comp)
+static bool mtk_ddp_comp_find(struct device *dev,
+ const unsigned int *path,
+ unsigned int path_len,
+ struct mtk_ddp_comp *ddp_comp)
{
unsigned int i;

@@ -514,10 +514,10 @@ static bool mtk_drm_find_comp_in_ddp(struct device *dev,
return false;
}

-static unsigned int mtk_drm_find_comp_in_ddp_conn_path(struct device *dev,
- const struct mtk_drm_route *routes,
- unsigned int num_routes,
- struct mtk_ddp_comp *ddp_comp)
+static unsigned int mtk_ddp_comp_find_in_route(struct device *dev,
+ const struct mtk_drm_route *routes,
+ unsigned int num_routes,
+ struct mtk_ddp_comp *ddp_comp)
{
int ret;
unsigned int i;
@@ -554,26 +554,31 @@ int mtk_ddp_comp_get_id(struct device_node *node,
return -EINVAL;
}

-unsigned int mtk_drm_find_possible_crtc_by_comp(struct drm_device *drm,
- struct device *dev)
+unsigned int mtk_find_possible_crtcs(struct drm_device *drm, struct device *dev)
{
struct mtk_drm_private *private = drm->dev_private;
unsigned int ret = 0;

- if (mtk_drm_find_comp_in_ddp(dev, private->data->main_path, private->data->main_len,
- private->ddp_comp))
+ if (mtk_ddp_comp_find(dev,
+ private->data->main_path,
+ private->data->main_len,
+ private->ddp_comp))
ret = BIT(0);
- else if (mtk_drm_find_comp_in_ddp(dev, private->data->ext_path,
- private->data->ext_len, private->ddp_comp))
+ else if (mtk_ddp_comp_find(dev,
+ private->data->ext_path,
+ private->data->ext_len,
+ private->ddp_comp))
ret = BIT(1);
- else if (mtk_drm_find_comp_in_ddp(dev, private->data->third_path,
- private->data->third_len, private->ddp_comp))
+ else if (mtk_ddp_comp_find(dev,
+ private->data->third_path,
+ private->data->third_len,
+ private->ddp_comp))
ret = BIT(2);
else
- ret = mtk_drm_find_comp_in_ddp_conn_path(dev,
- private->data->conn_routes,
- private->data->num_conn_routes,
- private->ddp_comp);
+ ret = mtk_ddp_comp_find_in_route(dev,
+ private->data->conn_routes,
+ private->data->num_conn_routes,
+ private->ddp_comp);

return ret;
}
diff --git a/drivers/gpu/drm/mediatek/mtk_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_ddp_comp.h
index ba985206fdd2..26236691ce4c 100644
--- a/drivers/gpu/drm/mediatek/mtk_ddp_comp.h
+++ b/drivers/gpu/drm/mediatek/mtk_ddp_comp.h
@@ -326,8 +326,7 @@ static inline void mtk_ddp_comp_encoder_index_set(struct mtk_ddp_comp *comp)

int mtk_ddp_comp_get_id(struct device_node *node,
enum mtk_ddp_comp_type comp_type);
-unsigned int mtk_drm_find_possible_crtc_by_comp(struct drm_device *drm,
- struct device *dev);
+unsigned int mtk_find_possible_crtcs(struct drm_device *drm, struct device *dev);
int mtk_ddp_comp_init(struct device_node *comp_node, struct mtk_ddp_comp *comp,
unsigned int comp_id);
enum mtk_ddp_comp_type mtk_ddp_comp_get_type(unsigned int comp_id);
diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c
index 84745ec9dd7c..0c83a4400088 100644
--- a/drivers/gpu/drm/mediatek/mtk_dpi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
@@ -805,7 +805,7 @@ static int mtk_dpi_bind(struct device *dev, struct device *master, void *data)
return ret;
}

- dpi->encoder.possible_crtcs = mtk_drm_find_possible_crtc_by_comp(drm_dev, dpi->dev);
+ dpi->encoder.possible_crtcs = mtk_find_possible_crtcs(drm_dev, dpi->dev);

ret = drm_bridge_attach(&dpi->encoder, &dpi->bridge, NULL,
DRM_BRIDGE_ATTACH_NO_CONNECTOR);
diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
index a9071c4dce0e..811b7305668f 100644
--- a/drivers/gpu/drm/mediatek/mtk_dsi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
@@ -836,7 +836,7 @@ static int mtk_dsi_encoder_init(struct drm_device *drm, struct mtk_dsi *dsi)
return ret;
}

- dsi->encoder.possible_crtcs = mtk_drm_find_possible_crtc_by_comp(drm, dsi->host.dev);
+ dsi->encoder.possible_crtcs = mtk_find_possible_crtcs(drm, dsi->host.dev);

ret = drm_bridge_attach(&dsi->encoder, &dsi->bridge, NULL,
DRM_BRIDGE_ATTACH_NO_CONNECTOR);
--
2.18.0


2024-02-26 09:32:21

by Shawn Sung

[permalink] [raw]
Subject: [PATCH 06/11] drm/mediatek: Rename files "mtk_drm_crtc.*" to "mtk_crtc.*"

From: Hsiao Chien Sung <[email protected]>

Rename files mtk_drm_crtc.* to mtk_crtc.*.

Signed-off-by: Hsiao Chien Sung <[email protected]>
---
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
--
2.18.0


2024-02-26 09:32:38

by Shawn Sung

[permalink] [raw]
Subject: [PATCH 11/11] drm/mediatek: Rename "pending_needs_vblank" to "needs_vblank"

From: Hsiao Chien Sung <[email protected]>

Rename "pending_needs_vblank" to "needs_vblank" to reduce the code size.

Signed-off-by: Hsiao Chien Sung <[email protected]>
---
drivers/gpu/drm/mediatek/mtk_crtc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_crtc.c b/drivers/gpu/drm/mediatek/mtk_crtc.c
index 7fe234de83a3..a1fb6c67681d 100644
--- a/drivers/gpu/drm/mediatek/mtk_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_crtc.c
@@ -42,7 +42,7 @@ struct mtk_crtc {
struct drm_crtc base;
bool enabled;

- bool pending_needs_vblank;
+ bool needs_vblank;
struct drm_pending_vblank_event *event;

struct drm_plane *planes;
@@ -105,9 +105,9 @@ static void mtk_crtc_finish_page_flip(struct mtk_crtc *mtk_crtc)
static void mtk_drm_finish_page_flip(struct mtk_crtc *mtk_crtc)
{
drm_crtc_handle_vblank(&mtk_crtc->base);
- if (!mtk_crtc->config_updating && mtk_crtc->pending_needs_vblank) {
+ if (!mtk_crtc->config_updating && mtk_crtc->needs_vblank) {
mtk_crtc_finish_page_flip(mtk_crtc);
- mtk_crtc->pending_needs_vblank = false;
+ mtk_crtc->needs_vblank = false;
}
}

@@ -571,7 +571,7 @@ static void mtk_crtc_update_config(struct mtk_crtc *mtk_crtc, bool needs_vblank)
mutex_lock(&mtk_crtc->hw_lock);
mtk_crtc->config_updating = true;
if (needs_vblank)
- mtk_crtc->pending_needs_vblank = true;
+ mtk_crtc->needs_vblank = true;

for (i = 0; i < mtk_crtc->layer_nr; i++) {
struct drm_plane *plane = &mtk_crtc->planes[i];
--
2.18.0


2024-02-26 09:32:40

by Shawn Sung

[permalink] [raw]
Subject: [PATCH 08/11] drm/mediatek: Rename files "mtk_drm_plane.*" to "mtk_plane.*"

From: Hsiao Chien Sung <[email protected]>

Rename files mtk_drm_plane.* to mtk_plane.*.

Signed-off-by: Hsiao Chien Sung <[email protected]>
---
drivers/gpu/drm/mediatek/Makefile | 2 +-
drivers/gpu/drm/mediatek/mtk_crtc.c | 2 +-
drivers/gpu/drm/mediatek/mtk_crtc.h | 2 +-
drivers/gpu/drm/mediatek/mtk_ddp_comp.c | 2 +-
drivers/gpu/drm/mediatek/mtk_disp_drv.h | 2 +-
drivers/gpu/drm/mediatek/{mtk_drm_plane.c => mtk_plane.c} | 2 +-
drivers/gpu/drm/mediatek/{mtk_drm_plane.h => mtk_plane.h} | 0
7 files changed, 6 insertions(+), 6 deletions(-)
rename drivers/gpu/drm/mediatek/{mtk_drm_plane.c => mtk_plane.c} (99%)
rename drivers/gpu/drm/mediatek/{mtk_drm_plane.h => mtk_plane.h} (100%)

diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/Makefile
index bbdf1e59ed84..0e198c00c6f2 100644
--- a/drivers/gpu/drm/mediatek/Makefile
+++ b/drivers/gpu/drm/mediatek/Makefile
@@ -12,7 +12,7 @@ mediatek-drm-y := mtk_disp_aal.o \
mtk_ddp_comp.o \
mtk_drm_drv.o \
mtk_drm_gem.o \
- mtk_drm_plane.o \
+ mtk_plane.o \
mtk_dsi.o \
mtk_dpi.o \
mtk_ethdr.o \
diff --git a/drivers/gpu/drm/mediatek/mtk_crtc.c b/drivers/gpu/drm/mediatek/mtk_crtc.c
index 7bc4f76718e5..96af194d0d49 100644
--- a/drivers/gpu/drm/mediatek/mtk_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_crtc.c
@@ -23,7 +23,7 @@
#include "mtk_crtc.h"
#include "mtk_ddp_comp.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 5865e4955471..cc8ca7c2056c 100644
--- 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 98398993500f..ab846a9f98c5 100644
--- a/drivers/gpu/drm/mediatek/mtk_ddp_comp.c
+++ b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c
@@ -16,7 +16,7 @@

#include "mtk_disp_drv.h"
#include "mtk_drm_drv.h"
-#include "mtk_drm_plane.h"
+#include "mtk_plane.h"
#include "mtk_ddp_comp.h"
#include "mtk_crtc.h"

diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h b/drivers/gpu/drm/mediatek/mtk_disp_drv.h
index 90e64467ea8f..d9b5a6ad3bea 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h
+++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h
@@ -9,7 +9,7 @@
#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_plane.h"
#include "mtk_mdp_rdma.h"

int mtk_aal_clk_enable(struct device *dev);
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 63a7a24468c1..95a4328a9b0b 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
+++ b/drivers/gpu/drm/mediatek/mtk_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_plane.h
similarity index 100%
rename from drivers/gpu/drm/mediatek/mtk_drm_plane.h
rename to drivers/gpu/drm/mediatek/mtk_plane.h
--
2.18.0


2024-02-26 09:54:51

by Shawn Sung

[permalink] [raw]
Subject: [PATCH 09/11] drm/mediatek: Rename files "mtk_drm_gem.*" to "mtk_gem.*"

From: Hsiao Chien Sung <[email protected]>

Rename files mtk_drm_gem.* to mtk_gem.*.

Signed-off-by: Hsiao Chien Sung <[email protected]>
---
drivers/gpu/drm/mediatek/Makefile | 2 +-
drivers/gpu/drm/mediatek/mtk_crtc.c | 2 +-
drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +-
drivers/gpu/drm/mediatek/{mtk_drm_gem.c => mtk_gem.c} | 2 +-
drivers/gpu/drm/mediatek/{mtk_drm_gem.h => mtk_gem.h} | 0
drivers/gpu/drm/mediatek/mtk_plane.c | 2 +-
6 files changed, 5 insertions(+), 5 deletions(-)
rename drivers/gpu/drm/mediatek/{mtk_drm_gem.c => mtk_gem.c} (99%)
rename drivers/gpu/drm/mediatek/{mtk_drm_gem.h => mtk_gem.h} (100%)

diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/Makefile
index 0e198c00c6f2..7e6d4b2fadbf 100644
--- a/drivers/gpu/drm/mediatek/Makefile
+++ b/drivers/gpu/drm/mediatek/Makefile
@@ -11,7 +11,7 @@ mediatek-drm-y := mtk_disp_aal.o \
mtk_crtc.o \
mtk_ddp_comp.o \
mtk_drm_drv.o \
- mtk_drm_gem.o \
+ mtk_gem.o \
mtk_plane.o \
mtk_dsi.o \
mtk_dpi.o \
diff --git a/drivers/gpu/drm/mediatek/mtk_crtc.c b/drivers/gpu/drm/mediatek/mtk_crtc.c
index 96af194d0d49..7fe234de83a3 100644
--- a/drivers/gpu/drm/mediatek/mtk_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_crtc.c
@@ -22,7 +22,7 @@
#include "mtk_drm_drv.h"
#include "mtk_crtc.h"
#include "mtk_ddp_comp.h"
-#include "mtk_drm_gem.h"
+#include "mtk_gem.h"
#include "mtk_plane.h"

/*
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index 113fdbaac5a1..b62320f64882 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -27,7 +27,7 @@
#include "mtk_crtc.h"
#include "mtk_ddp_comp.h"
#include "mtk_drm_drv.h"
-#include "mtk_drm_gem.h"
+#include "mtk_gem.h"

#define DRIVER_NAME "mediatek"
#define DRIVER_DESC "Mediatek SoC DRM"
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c b/drivers/gpu/drm/mediatek/mtk_gem.c
similarity index 99%
rename from drivers/gpu/drm/mediatek/mtk_drm_gem.c
rename to drivers/gpu/drm/mediatek/mtk_gem.c
index 3ae1f12bfb46..0fd55117ebf7 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_gem.c
+++ b/drivers/gpu/drm/mediatek/mtk_gem.c
@@ -12,7 +12,7 @@
#include <drm/drm_prime.h>

#include "mtk_drm_drv.h"
-#include "mtk_drm_gem.h"
+#include "mtk_gem.h"

static int mtk_gem_object_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma);

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.h b/drivers/gpu/drm/mediatek/mtk_gem.h
similarity index 100%
rename from drivers/gpu/drm/mediatek/mtk_drm_gem.h
rename to drivers/gpu/drm/mediatek/mtk_gem.h
diff --git a/drivers/gpu/drm/mediatek/mtk_plane.c b/drivers/gpu/drm/mediatek/mtk_plane.c
index 95a4328a9b0b..4625deb21d40 100644
--- a/drivers/gpu/drm/mediatek/mtk_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"
#include "mtk_plane.h"

static const u64 modifiers[] = {
--
2.18.0


2024-02-26 09:56:27

by Shawn Sung

[permalink] [raw]
Subject: [PATCH 07/11] drm/mediatek: Rename files "mtk_drm_ddp_comp.*" to "mtk_ddp_comp.*"

From: Hsiao Chien Sung <[email protected]>

Rename files mtk_drm_ddp_comp.* to mtk_ddp_comp.*.

Signed-off-by: Hsiao Chien Sung <[email protected]>
---
drivers/gpu/drm/mediatek/Makefile | 2 +-
drivers/gpu/drm/mediatek/mtk_crtc.c | 2 +-
drivers/gpu/drm/mediatek/mtk_crtc.h | 2 +-
drivers/gpu/drm/mediatek/{mtk_drm_ddp_comp.c => mtk_ddp_comp.c} | 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_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 +-
20 files changed, 19 insertions(+), 19 deletions(-)
rename drivers/gpu/drm/mediatek/{mtk_drm_ddp_comp.c => mtk_ddp_comp.c} (99%)
rename drivers/gpu/drm/mediatek/{mtk_drm_ddp_comp.h => mtk_ddp_comp.h} (100%)

diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/Makefile
index edad718082a9..bbdf1e59ed84 100644
--- a/drivers/gpu/drm/mediatek/Makefile
+++ b/drivers/gpu/drm/mediatek/Makefile
@@ -9,7 +9,7 @@ mediatek-drm-y := mtk_disp_aal.o \
mtk_disp_ovl_adaptor.o \
mtk_disp_rdma.o \
mtk_crtc.o \
- mtk_drm_ddp_comp.o \
+ mtk_ddp_comp.o \
mtk_drm_drv.o \
mtk_drm_gem.o \
mtk_drm_plane.o \
diff --git a/drivers/gpu/drm/mediatek/mtk_crtc.c b/drivers/gpu/drm/mediatek/mtk_crtc.c
index 503bdcd7e596..7bc4f76718e5 100644
--- a/drivers/gpu/drm/mediatek/mtk_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_crtc.c
@@ -21,7 +21,7 @@

#include "mtk_drm_drv.h"
#include "mtk_crtc.h"
-#include "mtk_drm_ddp_comp.h"
+#include "mtk_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 f081c54a349b..5865e4955471 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.c b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c
similarity index 99%
rename from drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
rename to drivers/gpu/drm/mediatek/mtk_ddp_comp.c
index b2c0665867d3..98398993500f 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
+++ b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c
@@ -17,7 +17,7 @@
#include "mtk_disp_drv.h"
#include "mtk_drm_drv.h"
#include "mtk_drm_plane.h"
-#include "mtk_drm_ddp_comp.h"
+#include "mtk_ddp_comp.h"
#include "mtk_crtc.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 005fc9de2ee9..53ea856a31a4 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_aal.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_aal.c
@@ -13,7 +13,7 @@

#include "mtk_disp_drv.h"
#include "mtk_crtc.h"
-#include "mtk_drm_ddp_comp.h"
+#include "mtk_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 cbdee3986120..d97e1a15bf6e 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c
@@ -12,7 +12,7 @@

#include "mtk_disp_drv.h"
#include "mtk_crtc.h"
-#include "mtk_drm_ddp_comp.h"
+#include "mtk_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 e2124b447767..69ed886f1388 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_color.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_color.c
@@ -12,7 +12,7 @@

#include "mtk_disp_drv.h"
#include "mtk_crtc.h"
-#include "mtk_drm_ddp_comp.h"
+#include "mtk_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 84b02064808b..ed126ba8d600 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c
@@ -13,7 +13,7 @@

#include "mtk_disp_drv.h"
#include "mtk_crtc.h"
-#include "mtk_drm_ddp_comp.h"
+#include "mtk_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 4d90a274380e..2d072f049078 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 0ab680e11862..74846dc31354 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
@@ -17,7 +17,7 @@

#include "mtk_disp_drv.h"
#include "mtk_crtc.h"
-#include "mtk_drm_ddp_comp.h"
+#include "mtk_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 f2d9c372879a..0e80629ceae8 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
@@ -19,7 +19,7 @@

#include "mtk_disp_drv.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_disp_rdma.c b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
index af78240229e8..669dc3f45a34 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
@@ -15,7 +15,7 @@

#include "mtk_disp_drv.h"
#include "mtk_crtc.h"
-#include "mtk_drm_ddp_comp.h"
+#include "mtk_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 beb7d9d08e97..84745ec9dd7c 100644
--- a/drivers/gpu/drm/mediatek/mtk_dpi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
@@ -28,7 +28,7 @@

#include "mtk_disp_drv.h"
#include "mtk_dpi_regs.h"
-#include "mtk_drm_ddp_comp.h"
+#include "mtk_ddp_comp.h"
#include "mtk_drm_drv.h"

enum mtk_dpi_out_bit_num {
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index 7be3b0546d3d..113fdbaac5a1 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 24c4d59085bd..78d698ede1bf 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 720f6b4b0821..63a7a24468c1 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 ec9d96396d7b..a9071c4dce0e 100644
--- a/drivers/gpu/drm/mediatek/mtk_dsi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
@@ -29,7 +29,7 @@
#include <drm/drm_simple_kms_helper.h>

#include "mtk_disp_drv.h"
-#include "mtk_drm_ddp_comp.h"
+#include "mtk_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 41efaafe26f1..9b0264bd5e73 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 cf233e43f95c..cdfdb7d8c449 100644
--- a/drivers/gpu/drm/mediatek/mtk_padding.c
+++ b/drivers/gpu/drm/mediatek/mtk_padding.c
@@ -13,7 +13,7 @@

#include "mtk_disp_drv.h"
#include "mtk_crtc.h"
-#include "mtk_drm_ddp_comp.h"
+#include "mtk_ddp_comp.h"

#define PADDING_CONTROL_REG 0x00
#define PADDING_BYPASS BIT(0)
--
2.18.0


Subject: Re: [PATCH 10/11] drm/mediatek: Rename mtk_ddp_comp functions

Il 26/02/24 09:50, Shawn Sung ha scritto:
> From: Hsiao Chien Sung <[email protected]>
>
> Rename functions of mtk_ddp_comp:
> - To align the naming rule
> - To reduce the code size
>
> Signed-off-by: Hsiao Chien Sung <[email protected]>

Reviewed-by: AngeloGiaocchino Del Regno <[email protected]>



Subject: Re: [PATCH 09/11] drm/mediatek: Rename files "mtk_drm_gem.*" to "mtk_gem.*"

Il 26/02/24 09:50, Shawn Sung ha scritto:
> From: Hsiao Chien Sung <[email protected]>
>
> Rename files mtk_drm_gem.* to mtk_gem.*.
>
> Signed-off-by: Hsiao Chien Sung <[email protected]>

Reviewed-by: AngeloGiaocchino Del Regno <[email protected]>


Subject: Re: [PATCH 08/11] drm/mediatek: Rename files "mtk_drm_plane.*" to "mtk_plane.*"

Il 26/02/24 09:50, Shawn Sung ha scritto:
> From: Hsiao Chien Sung <[email protected]>
>
> Rename files mtk_drm_plane.* to mtk_plane.*.
>
> Signed-off-by: Hsiao Chien Sung <[email protected]>

Reviewed-by: AngeloGiaocchino Del Regno <[email protected]>


Subject: Re: [PATCH 07/11] drm/mediatek: Rename files "mtk_drm_ddp_comp.*" to "mtk_ddp_comp.*"

Il 26/02/24 09:50, Shawn Sung ha scritto:
> From: Hsiao Chien Sung <[email protected]>
>
> Rename files mtk_drm_ddp_comp.* to mtk_ddp_comp.*.
>
> Signed-off-by: Hsiao Chien Sung <[email protected]>

Reviewed-by: AngeloGiaocchino Del Regno <[email protected]>


Subject: Re: [PATCH 11/11] drm/mediatek: Rename "pending_needs_vblank" to "needs_vblank"

Il 26/02/24 09:50, Shawn Sung ha scritto:
> From: Hsiao Chien Sung <[email protected]>
>
> Rename "pending_needs_vblank" to "needs_vblank" to reduce the code size.
>

This decreases human readability though, so I would prefer that we omit this one.

Regards,
Angelo

> Signed-off-by: Hsiao Chien Sung <[email protected]>
> ---
> drivers/gpu/drm/mediatek/mtk_crtc.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_crtc.c b/drivers/gpu/drm/mediatek/mtk_crtc.c
> index 7fe234de83a3..a1fb6c67681d 100644
> --- a/drivers/gpu/drm/mediatek/mtk_crtc.c
> +++ b/drivers/gpu/drm/mediatek/mtk_crtc.c
> @@ -42,7 +42,7 @@ struct mtk_crtc {
> struct drm_crtc base;
> bool enabled;
>
> - bool pending_needs_vblank;
> + bool needs_vblank;
> struct drm_pending_vblank_event *event;
>
> struct drm_plane *planes;
> @@ -105,9 +105,9 @@ static void mtk_crtc_finish_page_flip(struct mtk_crtc *mtk_crtc)
> static void mtk_drm_finish_page_flip(struct mtk_crtc *mtk_crtc)
> {
> drm_crtc_handle_vblank(&mtk_crtc->base);
> - if (!mtk_crtc->config_updating && mtk_crtc->pending_needs_vblank) {
> + if (!mtk_crtc->config_updating && mtk_crtc->needs_vblank) {
> mtk_crtc_finish_page_flip(mtk_crtc);
> - mtk_crtc->pending_needs_vblank = false;
> + mtk_crtc->needs_vblank = false;
> }
> }
>
> @@ -571,7 +571,7 @@ static void mtk_crtc_update_config(struct mtk_crtc *mtk_crtc, bool needs_vblank)
> mutex_lock(&mtk_crtc->hw_lock);
> mtk_crtc->config_updating = true;
> if (needs_vblank)
> - mtk_crtc->pending_needs_vblank = true;
> + mtk_crtc->needs_vblank = true;
>
> for (i = 0; i < mtk_crtc->layer_nr; i++) {
> struct drm_plane *plane = &mtk_crtc->planes[i];



Subject: Re: [PATCH 06/11] drm/mediatek: Rename files "mtk_drm_crtc.*" to "mtk_crtc.*"

Il 26/02/24 09:50, Shawn Sung ha scritto:
> From: Hsiao Chien Sung <[email protected]>
>
> Rename files mtk_drm_crtc.* to mtk_crtc.*.
>
> Signed-off-by: Hsiao Chien Sung <[email protected]>

Reviewed-by: AngeloGiaocchino Del Regno <[email protected]>



2024-02-29 02:37:34

by Shawn Sung

[permalink] [raw]
Subject: Re: [PATCH 11/11] drm/mediatek: Rename "pending_needs_vblank" to "needs_vblank"

Hi Angelo,

On Mon, 2024-02-26 at 13:39 +0100, AngeloGioacchino Del Regno wrote:
> Il 26/02/24 09:50, Shawn Sung ha scritto:
> > From: Hsiao Chien Sung <[email protected]
> > >
> >
> > Rename "pending_needs_vblank" to "needs_vblank" to reduce the code
> > size.
> >
>
> This decreases human readability though, so I would prefer that we
> omit this one.
>

Got it. Will check if this patch should be omitted.

Thanks,
Shawn

2024-03-14 06:41:16

by CK Hu (胡俊光)

[permalink] [raw]
Subject: Re: [PATCH 06/11] drm/mediatek: Rename files "mtk_drm_crtc.*" to "mtk_crtc.*"

Hi, Shawn:

On Mon, 2024-02-26 at 16:50 +0800, Shawn Sung wrote:
> From: Hsiao Chien Sung <[email protected]>
>
> Rename files mtk_drm_crtc.* to mtk_crtc.*.

Reviewed-by: CK Hu <[email protected]>

>
> Signed-off-by: Hsiao Chien Sung <
> [email protected]>
> ---
> 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

2024-03-14 06:50:28

by CK Hu (胡俊光)

[permalink] [raw]
Subject: Re: [PATCH 06/11] drm/mediatek: Rename files "mtk_drm_crtc.*" to "mtk_crtc.*"

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 <[email protected]
> > >
> >
> > Rename files mtk_drm_crtc.* to mtk_crtc.*.
>
> Reviewed-by: CK Hu <[email protected]>
>
> >
> > Signed-off-by: Hsiao Chien Sung <
> > [email protected]>
> > ---
> > 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

2024-03-14 06:55:03

by CK Hu (胡俊光)

[permalink] [raw]
Subject: Re: [PATCH 07/11] drm/mediatek: Rename files "mtk_drm_ddp_comp.*" to "mtk_ddp_comp.*"

Hi, Shawn:

On Mon, 2024-02-26 at 16:50 +0800, Shawn Sung wrote:
> From: Hsiao Chien Sung <[email protected]>
>
> Rename files mtk_drm_ddp_comp.* to mtk_ddp_comp.*.
>
> Signed-off-by: Hsiao Chien Sung <
> [email protected]>
> ---
> drivers/gpu/drm/mediatek/Makefile | 2
> +-
> drivers/gpu/drm/mediatek/mtk_crtc.c | 2
> +-
> drivers/gpu/drm/mediatek/mtk_crtc.h | 2
> +-
> drivers/gpu/drm/mediatek/{mtk_drm_ddp_comp.c => mtk_ddp_comp.c} | 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_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
> +-
> 20 files changed, 19 insertions(+), 19 deletions(-)
> rename drivers/gpu/drm/mediatek/{mtk_drm_ddp_comp.c =>
> mtk_ddp_comp.c} (99%)
> rename drivers/gpu/drm/mediatek/{mtk_drm_ddp_comp.h =>
> mtk_ddp_comp.h} (100%)
>
> diff --git a/drivers/gpu/drm/mediatek/Makefile
> b/drivers/gpu/drm/mediatek/Makefile
> index edad718082a9..bbdf1e59ed84 100644
> --- a/drivers/gpu/drm/mediatek/Makefile
> +++ b/drivers/gpu/drm/mediatek/Makefile
> @@ -9,7 +9,7 @@ mediatek-drm-y := mtk_disp_aal.o \
> mtk_disp_ovl_adaptor.o \
> mtk_disp_rdma.o \
> mtk_crtc.o \
> - mtk_drm_ddp_comp.o \
> + mtk_ddp_comp.o \
> mtk_drm_drv.o \
> mtk_drm_gem.o \
> mtk_drm_plane.o \
> diff --git a/drivers/gpu/drm/mediatek/mtk_crtc.c
> b/drivers/gpu/drm/mediatek/mtk_crtc.c
> index 503bdcd7e596..7bc4f76718e5 100644
> --- a/drivers/gpu/drm/mediatek/mtk_crtc.c
> +++ b/drivers/gpu/drm/mediatek/mtk_crtc.c
> @@ -21,7 +21,7 @@
>
> #include "mtk_drm_drv.h"
> #include "mtk_crtc.h"
> -#include "mtk_drm_ddp_comp.h"
> +#include "mtk_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 f081c54a349b..5865e4955471 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.c
> b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c
> similarity index 99%
> rename from drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> rename to drivers/gpu/drm/mediatek/mtk_ddp_comp.c
> index b2c0665867d3..98398993500f 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> +++ b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c
> @@ -17,7 +17,7 @@
> #include "mtk_disp_drv.h"
> #include "mtk_drm_drv.h"
> #include "mtk_drm_plane.h"
> -#include "mtk_drm_ddp_comp.h"
> +#include "mtk_ddp_comp.h"

alphabetic order.

Regards,
CK

> #include "mtk_crtc.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 005fc9de2ee9..53ea856a31a4 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_aal.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_aal.c
> @@ -13,7 +13,7 @@
>
> #include "mtk_disp_drv.h"
> #include "mtk_crtc.h"
> -#include "mtk_drm_ddp_comp.h"
> +#include "mtk_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 cbdee3986120..d97e1a15bf6e 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c
> @@ -12,7 +12,7 @@
>
> #include "mtk_disp_drv.h"
> #include "mtk_crtc.h"
> -#include "mtk_drm_ddp_comp.h"
> +#include "mtk_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 e2124b447767..69ed886f1388 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_color.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_color.c
> @@ -12,7 +12,7 @@
>
> #include "mtk_disp_drv.h"
> #include "mtk_crtc.h"
> -#include "mtk_drm_ddp_comp.h"
> +#include "mtk_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 84b02064808b..ed126ba8d600 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c
> @@ -13,7 +13,7 @@
>
> #include "mtk_disp_drv.h"
> #include "mtk_crtc.h"
> -#include "mtk_drm_ddp_comp.h"
> +#include "mtk_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 4d90a274380e..2d072f049078 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 0ab680e11862..74846dc31354 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> @@ -17,7 +17,7 @@
>
> #include "mtk_disp_drv.h"
> #include "mtk_crtc.h"
> -#include "mtk_drm_ddp_comp.h"
> +#include "mtk_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 f2d9c372879a..0e80629ceae8 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
> @@ -19,7 +19,7 @@
>
> #include "mtk_disp_drv.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_disp_rdma.c
> b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
> index af78240229e8..669dc3f45a34 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
> @@ -15,7 +15,7 @@
>
> #include "mtk_disp_drv.h"
> #include "mtk_crtc.h"
> -#include "mtk_drm_ddp_comp.h"
> +#include "mtk_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 beb7d9d08e97..84745ec9dd7c 100644
> --- a/drivers/gpu/drm/mediatek/mtk_dpi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
> @@ -28,7 +28,7 @@
>
> #include "mtk_disp_drv.h"
> #include "mtk_dpi_regs.h"
> -#include "mtk_drm_ddp_comp.h"
> +#include "mtk_ddp_comp.h"
> #include "mtk_drm_drv.h"
>
> enum mtk_dpi_out_bit_num {
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> index 7be3b0546d3d..113fdbaac5a1 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 24c4d59085bd..78d698ede1bf 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 720f6b4b0821..63a7a24468c1 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 ec9d96396d7b..a9071c4dce0e 100644
> --- a/drivers/gpu/drm/mediatek/mtk_dsi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
> @@ -29,7 +29,7 @@
> #include <drm/drm_simple_kms_helper.h>
>
> #include "mtk_disp_drv.h"
> -#include "mtk_drm_ddp_comp.h"
> +#include "mtk_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 41efaafe26f1..9b0264bd5e73 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 cf233e43f95c..cdfdb7d8c449 100644
> --- a/drivers/gpu/drm/mediatek/mtk_padding.c
> +++ b/drivers/gpu/drm/mediatek/mtk_padding.c
> @@ -13,7 +13,7 @@
>
> #include "mtk_disp_drv.h"
> #include "mtk_crtc.h"
> -#include "mtk_drm_ddp_comp.h"
> +#include "mtk_ddp_comp.h"
>
> #define PADDING_CONTROL_REG 0x00
> #define PADDING_BYPASS BIT(0)

2024-03-14 06:57:51

by CK Hu (胡俊光)

[permalink] [raw]
Subject: Re: [PATCH 08/11] drm/mediatek: Rename files "mtk_drm_plane.*" to "mtk_plane.*"

Hi, Shawn:

On Mon, 2024-02-26 at 16:50 +0800, Shawn Sung wrote:
> From: Hsiao Chien Sung <[email protected]>
>
> Rename files mtk_drm_plane.* to mtk_plane.*.
>
> Signed-off-by: Hsiao Chien Sung <
> [email protected]>
> ---
> drivers/gpu/drm/mediatek/Makefile | 2 +-
> drivers/gpu/drm/mediatek/mtk_crtc.c | 2 +-
> drivers/gpu/drm/mediatek/mtk_crtc.h | 2 +-
> drivers/gpu/drm/mediatek/mtk_ddp_comp.c | 2 +-
> drivers/gpu/drm/mediatek/mtk_disp_drv.h | 2 +-
> drivers/gpu/drm/mediatek/{mtk_drm_plane.c => mtk_plane.c} | 2 +-
> drivers/gpu/drm/mediatek/{mtk_drm_plane.h => mtk_plane.h} | 0
> 7 files changed, 6 insertions(+), 6 deletions(-)
> rename drivers/gpu/drm/mediatek/{mtk_drm_plane.c => mtk_plane.c}
> (99%)
> rename drivers/gpu/drm/mediatek/{mtk_drm_plane.h => mtk_plane.h}
> (100%)
>
> diff --git a/drivers/gpu/drm/mediatek/Makefile
> b/drivers/gpu/drm/mediatek/Makefile
> index bbdf1e59ed84..0e198c00c6f2 100644
> --- a/drivers/gpu/drm/mediatek/Makefile
> +++ b/drivers/gpu/drm/mediatek/Makefile
> @@ -12,7 +12,7 @@ mediatek-drm-y := mtk_disp_aal.o \
> mtk_ddp_comp.o \
> mtk_drm_drv.o \
> mtk_drm_gem.o \
> - mtk_drm_plane.o \
> + mtk_plane.o \
> mtk_dsi.o \
> mtk_dpi.o \
> mtk_ethdr.o \
> diff --git a/drivers/gpu/drm/mediatek/mtk_crtc.c
> b/drivers/gpu/drm/mediatek/mtk_crtc.c
> index 7bc4f76718e5..96af194d0d49 100644
> --- a/drivers/gpu/drm/mediatek/mtk_crtc.c
> +++ b/drivers/gpu/drm/mediatek/mtk_crtc.c
> @@ -23,7 +23,7 @@
> #include "mtk_crtc.h"
> #include "mtk_ddp_comp.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 5865e4955471..cc8ca7c2056c 100644
> --- 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 98398993500f..ab846a9f98c5 100644
> --- a/drivers/gpu/drm/mediatek/mtk_ddp_comp.c
> +++ b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c
> @@ -16,7 +16,7 @@
>
> #include "mtk_disp_drv.h"
> #include "mtk_drm_drv.h"
> -#include "mtk_drm_plane.h"
> +#include "mtk_plane.h"

Alphabetic order.

Regards,
CK

> #include "mtk_ddp_comp.h"
> #include "mtk_crtc.h"
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h
> b/drivers/gpu/drm/mediatek/mtk_disp_drv.h
> index 90e64467ea8f..d9b5a6ad3bea 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h
> @@ -9,7 +9,7 @@
> #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_plane.h"
> #include "mtk_mdp_rdma.h"
>
> int mtk_aal_clk_enable(struct device *dev);
> 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 63a7a24468c1..95a4328a9b0b 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> +++ b/drivers/gpu/drm/mediatek/mtk_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_plane.h
> similarity index 100%
> rename from drivers/gpu/drm/mediatek/mtk_drm_plane.h
> rename to drivers/gpu/drm/mediatek/mtk_plane.h

2024-03-14 07:04:13

by CK Hu (胡俊光)

[permalink] [raw]
Subject: Re: [PATCH 09/11] drm/mediatek: Rename files "mtk_drm_gem.*" to "mtk_gem.*"

Hi, Shawn:

On Mon, 2024-02-26 at 16:50 +0800, Shawn Sung wrote:
> From: Hsiao Chien Sung <[email protected]>
>
> Rename files mtk_drm_gem.* to mtk_gem.*.

Reviewed-by: CK Hu <[email protected]>

>
> Signed-off-by: Hsiao Chien Sung <
> [email protected]>
> ---
> drivers/gpu/drm/mediatek/Makefile | 2 +-
> drivers/gpu/drm/mediatek/mtk_crtc.c | 2 +-
> drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +-
> drivers/gpu/drm/mediatek/{mtk_drm_gem.c => mtk_gem.c} | 2 +-
> drivers/gpu/drm/mediatek/{mtk_drm_gem.h => mtk_gem.h} | 0
> drivers/gpu/drm/mediatek/mtk_plane.c | 2 +-
> 6 files changed, 5 insertions(+), 5 deletions(-)
> rename drivers/gpu/drm/mediatek/{mtk_drm_gem.c => mtk_gem.c} (99%)
> rename drivers/gpu/drm/mediatek/{mtk_drm_gem.h => mtk_gem.h} (100%)
>
> diff --git a/drivers/gpu/drm/mediatek/Makefile
> b/drivers/gpu/drm/mediatek/Makefile
> index 0e198c00c6f2..7e6d4b2fadbf 100644
> --- a/drivers/gpu/drm/mediatek/Makefile
> +++ b/drivers/gpu/drm/mediatek/Makefile
> @@ -11,7 +11,7 @@ mediatek-drm-y := mtk_disp_aal.o \
> mtk_crtc.o \
> mtk_ddp_comp.o \
> mtk_drm_drv.o \
> - mtk_drm_gem.o \
> + mtk_gem.o \
> mtk_plane.o \
> mtk_dsi.o \
> mtk_dpi.o \
> diff --git a/drivers/gpu/drm/mediatek/mtk_crtc.c
> b/drivers/gpu/drm/mediatek/mtk_crtc.c
> index 96af194d0d49..7fe234de83a3 100644
> --- a/drivers/gpu/drm/mediatek/mtk_crtc.c
> +++ b/drivers/gpu/drm/mediatek/mtk_crtc.c
> @@ -22,7 +22,7 @@
> #include "mtk_drm_drv.h"
> #include "mtk_crtc.h"
> #include "mtk_ddp_comp.h"
> -#include "mtk_drm_gem.h"
> +#include "mtk_gem.h"
> #include "mtk_plane.h"
>
> /*
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> index 113fdbaac5a1..b62320f64882 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> @@ -27,7 +27,7 @@
> #include "mtk_crtc.h"
> #include "mtk_ddp_comp.h"
> #include "mtk_drm_drv.h"
> -#include "mtk_drm_gem.h"
> +#include "mtk_gem.h"
>
> #define DRIVER_NAME "mediatek"
> #define DRIVER_DESC "Mediatek SoC DRM"
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c
> b/drivers/gpu/drm/mediatek/mtk_gem.c
> similarity index 99%
> rename from drivers/gpu/drm/mediatek/mtk_drm_gem.c
> rename to drivers/gpu/drm/mediatek/mtk_gem.c
> index 3ae1f12bfb46..0fd55117ebf7 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_gem.c
> +++ b/drivers/gpu/drm/mediatek/mtk_gem.c
> @@ -12,7 +12,7 @@
> #include <drm/drm_prime.h>
>
> #include "mtk_drm_drv.h"
> -#include "mtk_drm_gem.h"
> +#include "mtk_gem.h"
>
> static int mtk_gem_object_mmap(struct drm_gem_object *obj, struct
> vm_area_struct *vma);
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.h
> b/drivers/gpu/drm/mediatek/mtk_gem.h
> similarity index 100%
> rename from drivers/gpu/drm/mediatek/mtk_drm_gem.h
> rename to drivers/gpu/drm/mediatek/mtk_gem.h
> diff --git a/drivers/gpu/drm/mediatek/mtk_plane.c
> b/drivers/gpu/drm/mediatek/mtk_plane.c
> index 95a4328a9b0b..4625deb21d40 100644
> --- a/drivers/gpu/drm/mediatek/mtk_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"
> #include "mtk_plane.h"
>
> static const u64 modifiers[] = {

2024-03-14 07:10:09

by CK Hu (胡俊光)

[permalink] [raw]
Subject: Re: [PATCH 10/11] drm/mediatek: Rename mtk_ddp_comp functions

Hi, Shawn:

On Mon, 2024-02-26 at 16:50 +0800, Shawn Sung wrote:
> From: Hsiao Chien Sung <[email protected]>
>
> Rename functions of mtk_ddp_comp:
> - To align the naming rule
> - To reduce the code size

Reviewed-by: CK Hu <[email protected]>

>
> Signed-off-by: Hsiao Chien Sung <
> [email protected]>
> ---
> drivers/gpu/drm/mediatek/mtk_ddp_comp.c | 45 ++++++++++++++---------
> --
> drivers/gpu/drm/mediatek/mtk_ddp_comp.h | 3 +-
> drivers/gpu/drm/mediatek/mtk_dpi.c | 2 +-
> drivers/gpu/drm/mediatek/mtk_dsi.c | 2 +-
> 4 files changed, 28 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_ddp_comp.c
> b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c
> index ab846a9f98c5..f6d482d27c63 100644
> --- a/drivers/gpu/drm/mediatek/mtk_ddp_comp.c
> +++ b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c
> @@ -497,10 +497,10 @@ static const struct mtk_ddp_comp_match
> mtk_ddp_matches[DDP_COMPONENT_DRM_ID_MAX]
> [DDP_COMPONENT_WDMA1] = { MTK_DISP_WDMA,
> 1, NULL },
> };
>
> -static bool mtk_drm_find_comp_in_ddp(struct device *dev,
> - const unsigned int *path,
> - unsigned int path_len,
> - struct mtk_ddp_comp *ddp_comp)
> +static bool mtk_ddp_comp_find(struct device *dev,
> + const unsigned int *path,
> + unsigned int path_len,
> + struct mtk_ddp_comp *ddp_comp)
> {
> unsigned int i;
>
> @@ -514,10 +514,10 @@ static bool mtk_drm_find_comp_in_ddp(struct
> device *dev,
> return false;
> }
>
> -static unsigned int mtk_drm_find_comp_in_ddp_conn_path(struct device
> *dev,
> - const struct
> mtk_drm_route *routes,
> - unsigned int
> num_routes,
> - struct
> mtk_ddp_comp *ddp_comp)
> +static unsigned int mtk_ddp_comp_find_in_route(struct device *dev,
> + const struct
> mtk_drm_route *routes,
> + unsigned int num_routes,
> + struct mtk_ddp_comp
> *ddp_comp)
> {
> int ret;
> unsigned int i;
> @@ -554,26 +554,31 @@ int mtk_ddp_comp_get_id(struct device_node
> *node,
> return -EINVAL;
> }
>
> -unsigned int mtk_drm_find_possible_crtc_by_comp(struct drm_device
> *drm,
> - struct device *dev)
> +unsigned int mtk_find_possible_crtcs(struct drm_device *drm, struct
> device *dev)
> {
> struct mtk_drm_private *private = drm->dev_private;
> unsigned int ret = 0;
>
> - if (mtk_drm_find_comp_in_ddp(dev, private->data->main_path,
> private->data->main_len,
> - private->ddp_comp))
> + if (mtk_ddp_comp_find(dev,
> + private->data->main_path,
> + private->data->main_len,
> + private->ddp_comp))
> ret = BIT(0);
> - else if (mtk_drm_find_comp_in_ddp(dev, private->data->ext_path,
> - private->data->ext_len,
> private->ddp_comp))
> + else if (mtk_ddp_comp_find(dev,
> + private->data->ext_path,
> + private->data->ext_len,
> + private->ddp_comp))
> ret = BIT(1);
> - else if (mtk_drm_find_comp_in_ddp(dev, private->data-
> >third_path,
> - private->data->third_len,
> private->ddp_comp))
> + else if (mtk_ddp_comp_find(dev,
> + private->data->third_path,
> + private->data->third_len,
> + private->ddp_comp))
> ret = BIT(2);
> else
> - ret = mtk_drm_find_comp_in_ddp_conn_path(dev,
> - private->data-
> >conn_routes,
> - private->data-
> >num_conn_routes,
> - private-
> >ddp_comp);
> + ret = mtk_ddp_comp_find_in_route(dev,
> + private->data-
> >conn_routes,
> + private->data-
> >num_conn_routes,
> + private->ddp_comp);
>
> return ret;
> }
> diff --git a/drivers/gpu/drm/mediatek/mtk_ddp_comp.h
> b/drivers/gpu/drm/mediatek/mtk_ddp_comp.h
> index ba985206fdd2..26236691ce4c 100644
> --- a/drivers/gpu/drm/mediatek/mtk_ddp_comp.h
> +++ b/drivers/gpu/drm/mediatek/mtk_ddp_comp.h
> @@ -326,8 +326,7 @@ static inline void
> mtk_ddp_comp_encoder_index_set(struct mtk_ddp_comp *comp)
>
> int mtk_ddp_comp_get_id(struct device_node *node,
> enum mtk_ddp_comp_type comp_type);
> -unsigned int mtk_drm_find_possible_crtc_by_comp(struct drm_device
> *drm,
> - struct device *dev);
> +unsigned int mtk_find_possible_crtcs(struct drm_device *drm, struct
> device *dev);
> int mtk_ddp_comp_init(struct device_node *comp_node, struct
> mtk_ddp_comp *comp,
> unsigned int comp_id);
> enum mtk_ddp_comp_type mtk_ddp_comp_get_type(unsigned int comp_id);
> diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c
> b/drivers/gpu/drm/mediatek/mtk_dpi.c
> index 84745ec9dd7c..0c83a4400088 100644
> --- a/drivers/gpu/drm/mediatek/mtk_dpi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
> @@ -805,7 +805,7 @@ static int mtk_dpi_bind(struct device *dev,
> struct device *master, void *data)
> return ret;
> }
>
> - dpi->encoder.possible_crtcs =
> mtk_drm_find_possible_crtc_by_comp(drm_dev, dpi->dev);
> + dpi->encoder.possible_crtcs = mtk_find_possible_crtcs(drm_dev,
> dpi->dev);
>
> ret = drm_bridge_attach(&dpi->encoder, &dpi->bridge, NULL,
> DRM_BRIDGE_ATTACH_NO_CONNECTOR);
> diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c
> b/drivers/gpu/drm/mediatek/mtk_dsi.c
> index a9071c4dce0e..811b7305668f 100644
> --- a/drivers/gpu/drm/mediatek/mtk_dsi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
> @@ -836,7 +836,7 @@ static int mtk_dsi_encoder_init(struct drm_device
> *drm, struct mtk_dsi *dsi)
> return ret;
> }
>
> - dsi->encoder.possible_crtcs =
> mtk_drm_find_possible_crtc_by_comp(drm, dsi->host.dev);
> + dsi->encoder.possible_crtcs = mtk_find_possible_crtcs(drm, dsi-
> >host.dev);
>
> ret = drm_bridge_attach(&dsi->encoder, &dsi->bridge, NULL,
> DRM_BRIDGE_ATTACH_NO_CONNECTOR);

2024-03-14 07:28:38

by CK Hu (胡俊光)

[permalink] [raw]
Subject: Re: [PATCH 11/11] drm/mediatek: Rename "pending_needs_vblank" to "needs_vblank"

Hi, Shawn:

On Mon, 2024-02-26 at 16:50 +0800, Shawn Sung wrote:
> From: Hsiao Chien Sung <[email protected]>
>
> Rename "pending_needs_vblank" to "needs_vblank" to reduce the code
> size.

In mtk crtc, many variable has prefix 'pending' to indicate something
has not been done yet. To align this naming, I think it's better to
keep this prefix.

Regards,
CK

>
> Signed-off-by: Hsiao Chien Sung <
> [email protected]>
> ---
> drivers/gpu/drm/mediatek/mtk_crtc.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_crtc.c
> b/drivers/gpu/drm/mediatek/mtk_crtc.c
> index 7fe234de83a3..a1fb6c67681d 100644
> --- a/drivers/gpu/drm/mediatek/mtk_crtc.c
> +++ b/drivers/gpu/drm/mediatek/mtk_crtc.c
> @@ -42,7 +42,7 @@ struct mtk_crtc {
> struct drm_crtc base;
> bool enabled;
>
> - bool pending_needs_vblank;
> + bool needs_vblank;
> struct drm_pending_vblank_event *event;
>
> struct drm_plane *planes;
> @@ -105,9 +105,9 @@ static void mtk_crtc_finish_page_flip(struct
> mtk_crtc *mtk_crtc)
> static void mtk_drm_finish_page_flip(struct mtk_crtc *mtk_crtc)
> {
> drm_crtc_handle_vblank(&mtk_crtc->base);
> - if (!mtk_crtc->config_updating && mtk_crtc-
> >pending_needs_vblank) {
> + if (!mtk_crtc->config_updating && mtk_crtc->needs_vblank) {
> mtk_crtc_finish_page_flip(mtk_crtc);
> - mtk_crtc->pending_needs_vblank = false;
> + mtk_crtc->needs_vblank = false;
> }
> }
>
> @@ -571,7 +571,7 @@ static void mtk_crtc_update_config(struct
> mtk_crtc *mtk_crtc, bool needs_vblank)
> mutex_lock(&mtk_crtc->hw_lock);
> mtk_crtc->config_updating = true;
> if (needs_vblank)
> - mtk_crtc->pending_needs_vblank = true;
> + mtk_crtc->needs_vblank = true;
>
> for (i = 0; i < mtk_crtc->layer_nr; i++) {
> struct drm_plane *plane = &mtk_crtc->planes[i];