* [PATCH 00/11] Rename mtk_drm_* to mtk_*
@ 2024-02-26 8:50 Shawn Sung
2024-02-26 8:50 ` [PATCH 01/11] drm/mediatek: Rename "mtk_drm_crtc" to "mtk_crtc" Shawn Sung
` (10 more replies)
0 siblings, 11 replies; 36+ messages in thread
From: Shawn Sung @ 2024-02-26 8:50 UTC (permalink / raw)
To: Chun-Kuang Hu, AngeloGioacchino Del Regno
Cc: Philipp Zabel, David Airlie, Daniel Vetter, Matthias Brugger,
Sumit Semwal, Christian König, dri-devel, linux-mediatek,
linux-kernel, linux-arm-kernel, linux-media, linaro-mm-sig,
Hsiao Chien Sung
From: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
Rename some unnecessary "mtk_drm_*" to "mtk_*" because:
- Lower the matches when searching the native drm_* codes
- Reduce the code
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
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH 01/11] drm/mediatek: Rename "mtk_drm_crtc" to "mtk_crtc"
2024-02-26 8:50 [PATCH 00/11] Rename mtk_drm_* to mtk_* Shawn Sung
@ 2024-02-26 8:50 ` Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 3:26 ` CK Hu (胡俊光)
2024-02-26 8:50 ` [PATCH 02/11] drm/mediatek: Rename "mtk_drm_ddp_comp" to "mtk_ddp_comp" Shawn Sung
` (9 subsequent siblings)
10 siblings, 2 replies; 36+ messages in thread
From: Shawn Sung @ 2024-02-26 8:50 UTC (permalink / raw)
To: Chun-Kuang Hu, AngeloGioacchino Del Regno
Cc: Philipp Zabel, David Airlie, Daniel Vetter, Matthias Brugger,
Sumit Semwal, Christian König, dri-devel, linux-mediatek,
linux-kernel, linux-arm-kernel, linux-media, linaro-mm-sig,
Hsiao Chien Sung
From: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
Rename all "mtk_drm_crtc" to "mtk_crtc" due to the following benefits:
- Lower the matches when searching the native drm_crtc* codes
- Reduce the code size
Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
---
drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 186 +++++++++++------------
drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 30 ++--
drivers/gpu/drm/mediatek/mtk_drm_drv.c | 18 +--
drivers/gpu/drm/mediatek/mtk_drm_drv.h | 2 +-
drivers/gpu/drm/mediatek/mtk_drm_plane.c | 10 +-
drivers/gpu/drm/mediatek/mtk_dsi.c | 2 +-
6 files changed, 121 insertions(+), 127 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index 3b55c7a68bde..fe965ad7d282 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -26,7 +26,7 @@
#include "mtk_drm_plane.h"
/*
- * struct mtk_drm_crtc - MediaTek specific crtc structure.
+ * struct mtk_crtc - MediaTek specific crtc structure.
* @base: crtc object.
* @enabled: records whether crtc_enable succeeded
* @planes: array of 4 drm_plane structures, one for each overlay plane
@@ -38,7 +38,7 @@
*
* TODO: Needs update: this header is missing a bunch of member descriptions.
*/
-struct mtk_drm_crtc {
+struct mtk_crtc {
struct drm_crtc base;
bool enabled;
@@ -80,9 +80,9 @@ struct mtk_crtc_state {
unsigned int pending_vrefresh;
};
-static inline struct mtk_drm_crtc *to_mtk_crtc(struct drm_crtc *c)
+static inline struct mtk_crtc *to_mtk_crtc(struct drm_crtc *c)
{
- return container_of(c, struct mtk_drm_crtc, base);
+ return container_of(c, struct mtk_crtc, base);
}
static inline struct mtk_crtc_state *to_mtk_crtc_state(struct drm_crtc_state *s)
@@ -90,7 +90,7 @@ static inline struct mtk_crtc_state *to_mtk_crtc_state(struct drm_crtc_state *s)
return container_of(s, struct mtk_crtc_state, base);
}
-static void mtk_drm_crtc_finish_page_flip(struct mtk_drm_crtc *mtk_crtc)
+static void mtk_crtc_finish_page_flip(struct mtk_crtc *mtk_crtc)
{
struct drm_crtc *crtc = &mtk_crtc->base;
unsigned long flags;
@@ -102,11 +102,11 @@ static void mtk_drm_crtc_finish_page_flip(struct mtk_drm_crtc *mtk_crtc)
spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
}
-static void mtk_drm_finish_page_flip(struct mtk_drm_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) {
- mtk_drm_crtc_finish_page_flip(mtk_crtc);
+ mtk_crtc_finish_page_flip(mtk_crtc);
mtk_crtc->pending_needs_vblank = false;
}
}
@@ -149,9 +149,9 @@ static void mtk_drm_cmdq_pkt_destroy(struct cmdq_pkt *pkt)
}
#endif
-static void mtk_drm_crtc_destroy(struct drm_crtc *crtc)
+static void mtk_crtc_destroy(struct drm_crtc *crtc)
{
- struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
+ struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);
int i;
mtk_mutex_put(mtk_crtc->mutex);
@@ -174,7 +174,7 @@ static void mtk_drm_crtc_destroy(struct drm_crtc *crtc)
drm_crtc_cleanup(crtc);
}
-static void mtk_drm_crtc_reset(struct drm_crtc *crtc)
+static void mtk_crtc_reset(struct drm_crtc *crtc)
{
struct mtk_crtc_state *state;
@@ -189,7 +189,7 @@ static void mtk_drm_crtc_reset(struct drm_crtc *crtc)
__drm_atomic_helper_crtc_reset(crtc, &state->base);
}
-static struct drm_crtc_state *mtk_drm_crtc_duplicate_state(struct drm_crtc *crtc)
+static struct drm_crtc_state *mtk_crtc_duplicate_state(struct drm_crtc *crtc)
{
struct mtk_crtc_state *state;
@@ -206,18 +206,17 @@ static struct drm_crtc_state *mtk_drm_crtc_duplicate_state(struct drm_crtc *crtc
return &state->base;
}
-static void mtk_drm_crtc_destroy_state(struct drm_crtc *crtc,
- struct drm_crtc_state *state)
+static void mtk_crtc_destroy_state(struct drm_crtc *crtc,
+ struct drm_crtc_state *state)
{
__drm_atomic_helper_crtc_destroy_state(state);
kfree(to_mtk_crtc_state(state));
}
static enum drm_mode_status
-mtk_drm_crtc_mode_valid(struct drm_crtc *crtc,
- const struct drm_display_mode *mode)
+mtk_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode)
{
- struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
+ struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);
enum drm_mode_status status = MODE_OK;
int i;
@@ -229,15 +228,15 @@ mtk_drm_crtc_mode_valid(struct drm_crtc *crtc,
return status;
}
-static bool mtk_drm_crtc_mode_fixup(struct drm_crtc *crtc,
- const struct drm_display_mode *mode,
- struct drm_display_mode *adjusted_mode)
+static bool mtk_crtc_mode_fixup(struct drm_crtc *crtc,
+ const struct drm_display_mode *mode,
+ struct drm_display_mode *adjusted_mode)
{
/* Nothing to do here, but this callback is mandatory. */
return true;
}
-static void mtk_drm_crtc_mode_set_nofb(struct drm_crtc *crtc)
+static void mtk_crtc_mode_set_nofb(struct drm_crtc *crtc)
{
struct mtk_crtc_state *state = to_mtk_crtc_state(crtc->state);
@@ -248,7 +247,7 @@ static void mtk_drm_crtc_mode_set_nofb(struct drm_crtc *crtc)
state->pending_config = true;
}
-static int mtk_crtc_ddp_clk_enable(struct mtk_drm_crtc *mtk_crtc)
+static int mtk_crtc_ddp_clk_enable(struct mtk_crtc *mtk_crtc)
{
int ret;
int i;
@@ -268,7 +267,7 @@ static int mtk_crtc_ddp_clk_enable(struct mtk_drm_crtc *mtk_crtc)
return ret;
}
-static void mtk_crtc_ddp_clk_disable(struct mtk_drm_crtc *mtk_crtc)
+static void mtk_crtc_ddp_clk_disable(struct mtk_crtc *mtk_crtc)
{
int i;
@@ -281,7 +280,7 @@ struct mtk_ddp_comp *mtk_drm_ddp_comp_for_plane(struct drm_crtc *crtc,
struct drm_plane *plane,
unsigned int *local_layer)
{
- struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
+ struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);
struct mtk_ddp_comp *comp;
int i, count = 0;
unsigned int local_index = plane - mtk_crtc->planes;
@@ -304,7 +303,7 @@ static void ddp_cmdq_cb(struct mbox_client *cl, void *mssg)
{
struct cmdq_cb_data *data = mssg;
struct cmdq_client *cmdq_cl = container_of(cl, struct cmdq_client, client);
- struct mtk_drm_crtc *mtk_crtc = container_of(cmdq_cl, struct mtk_drm_crtc, cmdq_client);
+ struct mtk_crtc *mtk_crtc = container_of(cmdq_cl, struct mtk_crtc, cmdq_client);
struct mtk_crtc_state *state;
unsigned int i;
@@ -344,7 +343,7 @@ static void ddp_cmdq_cb(struct mbox_client *cl, void *mssg)
}
#endif
-static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc)
+static int mtk_crtc_ddp_hw_init(struct mtk_crtc *mtk_crtc)
{
struct drm_crtc *crtc = &mtk_crtc->base;
struct drm_connector *connector;
@@ -444,7 +443,7 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc)
return ret;
}
-static void mtk_crtc_ddp_hw_fini(struct mtk_drm_crtc *mtk_crtc)
+static void mtk_crtc_ddp_hw_fini(struct mtk_crtc *mtk_crtc)
{
struct drm_device *drm = mtk_crtc->base.dev;
struct drm_crtc *crtc = &mtk_crtc->base;
@@ -489,7 +488,7 @@ static void mtk_crtc_ddp_hw_fini(struct mtk_drm_crtc *mtk_crtc)
static void mtk_crtc_ddp_config(struct drm_crtc *crtc,
struct cmdq_pkt *cmdq_handle)
{
- struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
+ struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);
struct mtk_crtc_state *state = to_mtk_crtc_state(mtk_crtc->base.state);
struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];
unsigned int i;
@@ -561,8 +560,7 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc,
}
}
-static void mtk_drm_crtc_update_config(struct mtk_drm_crtc *mtk_crtc,
- bool needs_vblank)
+static void mtk_crtc_update_config(struct mtk_crtc *mtk_crtc, bool needs_vblank)
{
#if IS_REACHABLE(CONFIG_MTK_CMDQ)
struct cmdq_pkt *cmdq_handle = &mtk_crtc->cmdq_handle;
@@ -634,7 +632,7 @@ static void mtk_drm_crtc_update_config(struct mtk_drm_crtc *mtk_crtc,
static void mtk_crtc_ddp_irq(void *data)
{
struct drm_crtc *crtc = data;
- struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
+ struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);
struct mtk_drm_private *priv = crtc->dev->dev_private;
#if IS_REACHABLE(CONFIG_MTK_CMDQ)
@@ -650,9 +648,9 @@ static void mtk_crtc_ddp_irq(void *data)
mtk_drm_finish_page_flip(mtk_crtc);
}
-static int mtk_drm_crtc_enable_vblank(struct drm_crtc *crtc)
+static int mtk_crtc_enable_vblank(struct drm_crtc *crtc)
{
- struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
+ struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);
struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];
mtk_ddp_comp_enable_vblank(comp);
@@ -660,22 +658,22 @@ static int mtk_drm_crtc_enable_vblank(struct drm_crtc *crtc)
return 0;
}
-static void mtk_drm_crtc_disable_vblank(struct drm_crtc *crtc)
+static void mtk_crtc_disable_vblank(struct drm_crtc *crtc)
{
- struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
+ struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);
struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];
mtk_ddp_comp_disable_vblank(comp);
}
-static void mtk_drm_crtc_update_output(struct drm_crtc *crtc,
- struct drm_atomic_state *state)
+static void mtk_crtc_update_output(struct drm_crtc *crtc,
+ struct drm_atomic_state *state)
{
int crtc_index = drm_crtc_index(crtc);
int i;
struct device *dev;
struct drm_crtc_state *crtc_state = state->crtcs[crtc_index].new_state;
- struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
+ struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);
struct mtk_drm_private *priv;
unsigned int encoder_mask = crtc_state->encoder_mask;
@@ -705,8 +703,8 @@ static void mtk_drm_crtc_update_output(struct drm_crtc *crtc,
}
}
-int mtk_drm_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane *plane,
- struct mtk_plane_state *state)
+int mtk_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane *plane,
+ struct mtk_plane_state *state)
{
unsigned int local_layer;
struct mtk_ddp_comp *comp;
@@ -717,21 +715,21 @@ int mtk_drm_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane *plane,
return 0;
}
-void mtk_drm_crtc_async_update(struct drm_crtc *crtc, struct drm_plane *plane,
- struct drm_atomic_state *state)
+void mtk_crtc_async_update(struct drm_crtc *crtc, struct drm_plane *plane,
+ struct drm_atomic_state *state)
{
- struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
+ struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);
if (!mtk_crtc->enabled)
return;
- mtk_drm_crtc_update_config(mtk_crtc, false);
+ mtk_crtc_update_config(mtk_crtc, false);
}
-static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,
- struct drm_atomic_state *state)
+static void mtk_crtc_atomic_enable(struct drm_crtc *crtc,
+ struct drm_atomic_state *state)
{
- struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
+ struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);
struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];
int ret;
@@ -743,7 +741,7 @@ static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,
return;
}
- mtk_drm_crtc_update_output(crtc, state);
+ mtk_crtc_update_output(crtc, state);
ret = mtk_crtc_ddp_hw_init(mtk_crtc);
if (ret) {
@@ -755,10 +753,10 @@ static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,
mtk_crtc->enabled = true;
}
-static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc,
- struct drm_atomic_state *state)
+static void mtk_crtc_atomic_disable(struct drm_crtc *crtc,
+ struct drm_atomic_state *state)
{
- struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
+ struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);
struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];
int i;
@@ -777,7 +775,7 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc,
}
mtk_crtc->pending_planes = true;
- mtk_drm_crtc_update_config(mtk_crtc, false);
+ mtk_crtc_update_config(mtk_crtc, false);
#if IS_REACHABLE(CONFIG_MTK_CMDQ)
/* Wait for planes to be disabled by cmdq */
if (mtk_crtc->cmdq_client.chan)
@@ -795,13 +793,13 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc,
mtk_crtc->enabled = false;
}
-static void mtk_drm_crtc_atomic_begin(struct drm_crtc *crtc,
- struct drm_atomic_state *state)
+static void mtk_crtc_atomic_begin(struct drm_crtc *crtc,
+ struct drm_atomic_state *state)
{
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,
crtc);
struct mtk_crtc_state *mtk_crtc_state = to_mtk_crtc_state(crtc_state);
- struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
+ struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);
unsigned long flags;
if (mtk_crtc->event && mtk_crtc_state->base.event)
@@ -819,10 +817,10 @@ static void mtk_drm_crtc_atomic_begin(struct drm_crtc *crtc,
}
}
-static void mtk_drm_crtc_atomic_flush(struct drm_crtc *crtc,
- struct drm_atomic_state *state)
+static void mtk_crtc_atomic_flush(struct drm_crtc *crtc,
+ struct drm_atomic_state *state)
{
- struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
+ struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);
int i;
if (crtc->state->color_mgmt_changed)
@@ -830,33 +828,32 @@ static void mtk_drm_crtc_atomic_flush(struct drm_crtc *crtc,
mtk_ddp_gamma_set(mtk_crtc->ddp_comp[i], crtc->state);
mtk_ddp_ctm_set(mtk_crtc->ddp_comp[i], crtc->state);
}
- mtk_drm_crtc_update_config(mtk_crtc, !!mtk_crtc->event);
+ mtk_crtc_update_config(mtk_crtc, !!mtk_crtc->event);
}
static const struct drm_crtc_funcs mtk_crtc_funcs = {
.set_config = drm_atomic_helper_set_config,
.page_flip = drm_atomic_helper_page_flip,
- .destroy = mtk_drm_crtc_destroy,
- .reset = mtk_drm_crtc_reset,
- .atomic_duplicate_state = mtk_drm_crtc_duplicate_state,
- .atomic_destroy_state = mtk_drm_crtc_destroy_state,
- .enable_vblank = mtk_drm_crtc_enable_vblank,
- .disable_vblank = mtk_drm_crtc_disable_vblank,
+ .destroy = mtk_crtc_destroy,
+ .reset = mtk_crtc_reset,
+ .atomic_duplicate_state = mtk_crtc_duplicate_state,
+ .atomic_destroy_state = mtk_crtc_destroy_state,
+ .enable_vblank = mtk_crtc_enable_vblank,
+ .disable_vblank = mtk_crtc_disable_vblank,
};
static const struct drm_crtc_helper_funcs mtk_crtc_helper_funcs = {
- .mode_fixup = mtk_drm_crtc_mode_fixup,
- .mode_set_nofb = mtk_drm_crtc_mode_set_nofb,
- .mode_valid = mtk_drm_crtc_mode_valid,
- .atomic_begin = mtk_drm_crtc_atomic_begin,
- .atomic_flush = mtk_drm_crtc_atomic_flush,
- .atomic_enable = mtk_drm_crtc_atomic_enable,
- .atomic_disable = mtk_drm_crtc_atomic_disable,
+ .mode_fixup = mtk_crtc_mode_fixup,
+ .mode_set_nofb = mtk_crtc_mode_set_nofb,
+ .mode_valid = mtk_crtc_mode_valid,
+ .atomic_begin = mtk_crtc_atomic_begin,
+ .atomic_flush = mtk_crtc_atomic_flush,
+ .atomic_enable = mtk_crtc_atomic_enable,
+ .atomic_disable = mtk_crtc_atomic_disable,
};
-static int mtk_drm_crtc_init(struct drm_device *drm,
- struct mtk_drm_crtc *mtk_crtc,
- unsigned int pipe)
+static int mtk_crtc_init(struct drm_device *drm, struct mtk_crtc *mtk_crtc,
+ unsigned int pipe)
{
struct drm_plane *primary = NULL;
struct drm_plane *cursor = NULL;
@@ -883,8 +880,7 @@ static int mtk_drm_crtc_init(struct drm_device *drm,
return ret;
}
-static int mtk_drm_crtc_num_comp_planes(struct mtk_drm_crtc *mtk_crtc,
- int comp_idx)
+static int mtk_crtc_num_comp_planes(struct mtk_crtc *mtk_crtc, int comp_idx)
{
struct mtk_ddp_comp *comp;
@@ -902,8 +898,8 @@ static int mtk_drm_crtc_num_comp_planes(struct mtk_drm_crtc *mtk_crtc,
}
static inline
-enum drm_plane_type mtk_drm_crtc_plane_type(unsigned int plane_idx,
- unsigned int num_planes)
+enum drm_plane_type mtk_crtc_plane_type(unsigned int plane_idx,
+ unsigned int num_planes)
{
if (plane_idx == 0)
return DRM_PLANE_TYPE_PRIMARY;
@@ -914,11 +910,11 @@ enum drm_plane_type mtk_drm_crtc_plane_type(unsigned int plane_idx,
}
-static int mtk_drm_crtc_init_comp_planes(struct drm_device *drm_dev,
- struct mtk_drm_crtc *mtk_crtc,
- int comp_idx, int pipe)
+static int mtk_crtc_init_comp_planes(struct drm_device *drm_dev,
+ struct mtk_crtc *mtk_crtc,
+ int comp_idx, int pipe)
{
- int num_planes = mtk_drm_crtc_num_comp_planes(mtk_crtc, comp_idx);
+ int num_planes = mtk_crtc_num_comp_planes(mtk_crtc, comp_idx);
struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[comp_idx];
int i, ret;
@@ -926,8 +922,7 @@ static int mtk_drm_crtc_init_comp_planes(struct drm_device *drm_dev,
ret = mtk_plane_init(drm_dev,
&mtk_crtc->planes[mtk_crtc->layer_nr],
BIT(pipe),
- mtk_drm_crtc_plane_type(mtk_crtc->layer_nr,
- num_planes),
+ mtk_crtc_plane_type(mtk_crtc->layer_nr, num_planes),
mtk_ddp_comp_supported_rotations(comp),
mtk_ddp_comp_get_formats(comp),
mtk_ddp_comp_get_num_formats(comp));
@@ -939,9 +934,9 @@ static int mtk_drm_crtc_init_comp_planes(struct drm_device *drm_dev,
return 0;
}
-struct device *mtk_drm_crtc_dma_dev_get(struct drm_crtc *crtc)
+struct device *mtk_crtc_dma_dev_get(struct drm_crtc *crtc)
{
- struct mtk_drm_crtc *mtk_crtc = NULL;
+ struct mtk_crtc *mtk_crtc = NULL;
if (!crtc)
return NULL;
@@ -953,14 +948,14 @@ struct device *mtk_drm_crtc_dma_dev_get(struct drm_crtc *crtc)
return mtk_crtc->dma_dev;
}
-int mtk_drm_crtc_create(struct drm_device *drm_dev,
- const unsigned int *path, unsigned int path_len,
- int priv_data_index, const struct mtk_drm_route *conn_routes,
- unsigned int num_conn_routes)
+int mtk_crtc_create(struct drm_device *drm_dev, const unsigned int *path,
+ unsigned int path_len, int priv_data_index,
+ const struct mtk_drm_route *conn_routes,
+ unsigned int num_conn_routes)
{
struct mtk_drm_private *priv = drm_dev->dev_private;
struct device *dev = drm_dev->dev;
- struct mtk_drm_crtc *mtk_crtc;
+ struct mtk_crtc *mtk_crtc;
unsigned int num_comp_planes = 0;
int ret;
int i;
@@ -1045,7 +1040,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
}
for (i = 0; i < mtk_crtc->ddp_comp_nr; i++)
- num_comp_planes += mtk_drm_crtc_num_comp_planes(mtk_crtc, i);
+ num_comp_planes += mtk_crtc_num_comp_planes(mtk_crtc, i);
mtk_crtc->planes = devm_kcalloc(dev, num_comp_planes,
sizeof(struct drm_plane), GFP_KERNEL);
@@ -1053,8 +1048,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
return -ENOMEM;
for (i = 0; i < mtk_crtc->ddp_comp_nr; i++) {
- ret = mtk_drm_crtc_init_comp_planes(drm_dev, mtk_crtc, i,
- crtc_i);
+ ret = mtk_crtc_init_comp_planes(drm_dev, mtk_crtc, i, crtc_i);
if (ret)
return ret;
}
@@ -1066,7 +1060,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
*/
mtk_crtc->dma_dev = mtk_ddp_comp_dma_dev_get(&priv->ddp_comp[path[0]]);
- ret = mtk_drm_crtc_init(drm_dev, mtk_crtc, crtc_i);
+ ret = mtk_crtc_init(drm_dev, mtk_crtc, crtc_i);
if (ret < 0)
return ret;
@@ -1136,7 +1130,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
mtk_crtc->num_conn_routes = num_conn_routes;
mtk_crtc->conn_routes = conn_routes;
- /* increase ddp_comp_nr at the end of mtk_drm_crtc_create */
+ /* increase ddp_comp_nr at the end of mtk_crtc_create */
mtk_crtc->ddp_comp_nr++;
}
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h b/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
index 1f988ff1bf9f..f081c54a349b 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
@@ -3,8 +3,8 @@
* Copyright (c) 2015 MediaTek Inc.
*/
-#ifndef MTK_DRM_CRTC_H
-#define MTK_DRM_CRTC_H
+#ifndef MTK_CRTC_H
+#define MTK_CRTC_H
#include <drm/drm_crtc.h>
#include "mtk_drm_ddp_comp.h"
@@ -14,17 +14,17 @@
#define MTK_MAX_BPC 10
#define MTK_MIN_BPC 3
-void mtk_drm_crtc_commit(struct drm_crtc *crtc);
-int mtk_drm_crtc_create(struct drm_device *drm_dev,
- const unsigned int *path,
- unsigned int path_len,
- int priv_data_index,
- const struct mtk_drm_route *conn_routes,
- unsigned int num_conn_routes);
-int mtk_drm_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane *plane,
- struct mtk_plane_state *state);
-void mtk_drm_crtc_async_update(struct drm_crtc *crtc, struct drm_plane *plane,
- struct drm_atomic_state *plane_state);
-struct device *mtk_drm_crtc_dma_dev_get(struct drm_crtc *crtc);
+void mtk_crtc_commit(struct drm_crtc *crtc);
+int mtk_crtc_create(struct drm_device *drm_dev,
+ const unsigned int *path,
+ unsigned int path_len,
+ int priv_data_index,
+ const struct mtk_drm_route *conn_routes,
+ unsigned int num_conn_routes);
+int mtk_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane *plane,
+ struct mtk_plane_state *state);
+void mtk_crtc_async_update(struct drm_crtc *crtc, struct drm_plane *plane,
+ struct drm_atomic_state *plane_state);
+struct device *mtk_crtc_dma_dev_get(struct drm_crtc *crtc);
-#endif /* MTK_DRM_CRTC_H */
+#endif /* MTK_CRTC_H */
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index 74832c213092..c46773569b3c 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -494,24 +494,24 @@ static int mtk_drm_kms_init(struct drm_device *drm)
priv_n = private->all_drm_private[j];
if (i == CRTC_MAIN && priv_n->data->main_len) {
- ret = mtk_drm_crtc_create(drm, priv_n->data->main_path,
- priv_n->data->main_len, j,
- priv_n->data->conn_routes,
- priv_n->data->num_conn_routes);
+ ret = mtk_crtc_create(drm, priv_n->data->main_path,
+ priv_n->data->main_len, j,
+ priv_n->data->conn_routes,
+ priv_n->data->num_conn_routes);
if (ret)
goto err_component_unbind;
continue;
} else if (i == CRTC_EXT && priv_n->data->ext_len) {
- ret = mtk_drm_crtc_create(drm, priv_n->data->ext_path,
- priv_n->data->ext_len, j, NULL, 0);
+ ret = mtk_crtc_create(drm, priv_n->data->ext_path,
+ priv_n->data->ext_len, j, NULL, 0);
if (ret)
goto err_component_unbind;
continue;
} else if (i == CRTC_THIRD && priv_n->data->third_len) {
- ret = mtk_drm_crtc_create(drm, priv_n->data->third_path,
- priv_n->data->third_len, j, NULL, 0);
+ ret = mtk_crtc_create(drm, priv_n->data->third_path,
+ priv_n->data->third_len, j, NULL, 0);
if (ret)
goto err_component_unbind;
@@ -523,7 +523,7 @@ static int mtk_drm_kms_init(struct drm_device *drm)
/* Use OVL device for all DMA memory allocations */
crtc = drm_crtc_from_index(drm, 0);
if (crtc)
- dma_dev = mtk_drm_crtc_dma_dev_get(crtc);
+ dma_dev = mtk_crtc_dma_dev_get(crtc);
if (!dma_dev) {
ret = -ENODEV;
dev_err(drm->dev, "Need at least one OVL device\n");
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
index 33fadb08dc1c..24c4d59085bd 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
@@ -13,7 +13,7 @@
#define DDP_COMPONENT_DRM_OVL_ADAPTOR (DDP_COMPONENT_ID_MAX + 1)
#define DDP_COMPONENT_DRM_ID_MAX (DDP_COMPONENT_DRM_OVL_ADAPTOR + 1)
-enum mtk_drm_crtc_path {
+enum mtk_crtc_path {
CRTC_MAIN,
CRTC_EXT,
CRTC_THIRD,
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
index ddc9355b06d5..cbdb70677d30 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
@@ -117,8 +117,8 @@ static int mtk_plane_atomic_async_check(struct drm_plane *plane,
if (!plane->state->fb)
return -EINVAL;
- ret = mtk_drm_crtc_plane_check(new_plane_state->crtc, plane,
- to_mtk_plane_state(new_plane_state));
+ ret = mtk_crtc_plane_check(new_plane_state->crtc, plane,
+ to_mtk_plane_state(new_plane_state));
if (ret)
return ret;
@@ -232,7 +232,7 @@ static void mtk_plane_atomic_async_update(struct drm_plane *plane,
swap(plane->state->fb, new_state->fb);
wmb(); /* Make sure the above parameters are set before update */
new_plane_state->pending.async_dirty = true;
- mtk_drm_crtc_async_update(new_state->crtc, plane, state);
+ mtk_crtc_async_update(new_state->crtc, plane, state);
}
static const struct drm_plane_funcs mtk_plane_funcs = {
@@ -260,8 +260,8 @@ static int mtk_plane_atomic_check(struct drm_plane *plane,
if (WARN_ON(!new_plane_state->crtc))
return 0;
- ret = mtk_drm_crtc_plane_check(new_plane_state->crtc, plane,
- to_mtk_plane_state(new_plane_state));
+ ret = mtk_crtc_plane_check(new_plane_state->crtc, plane,
+ to_mtk_plane_state(new_plane_state));
if (ret)
return ret;
diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
index 9501f4019199..ec9d96396d7b 100644
--- a/drivers/gpu/drm/mediatek/mtk_dsi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
@@ -662,7 +662,7 @@ static void mtk_dsi_poweroff(struct mtk_dsi *dsi)
/*
* mtk_dsi_stop() and mtk_dsi_start() is asymmetric, since
- * mtk_dsi_stop() should be called after mtk_drm_crtc_atomic_disable(),
+ * mtk_dsi_stop() should be called after mtk_crtc_atomic_disable(),
* which needs irq for vblank, and mtk_dsi_stop() will disable irq.
* mtk_dsi_start() needs to be called in mtk_output_dsi_enable(),
* after dsi is fully set.
--
2.18.0
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 02/11] drm/mediatek: Rename "mtk_drm_ddp_comp" to "mtk_ddp_comp"
2024-02-26 8:50 [PATCH 00/11] Rename mtk_drm_* to mtk_* Shawn Sung
2024-02-26 8:50 ` [PATCH 01/11] drm/mediatek: Rename "mtk_drm_crtc" to "mtk_crtc" Shawn Sung
@ 2024-02-26 8:50 ` Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 5:14 ` CK Hu (胡俊光)
2024-02-26 8:50 ` [PATCH 03/11] drm/mediatek: Rename "mtk_drm_plane" to "mtk_plane" Shawn Sung
` (8 subsequent siblings)
10 siblings, 2 replies; 36+ messages in thread
From: Shawn Sung @ 2024-02-26 8:50 UTC (permalink / raw)
To: Chun-Kuang Hu, AngeloGioacchino Del Regno
Cc: Philipp Zabel, David Airlie, Daniel Vetter, Matthias Brugger,
Sumit Semwal, Christian König, dri-devel, linux-mediatek,
linux-kernel, linux-arm-kernel, linux-media, linaro-mm-sig,
Hsiao Chien Sung
From: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
Rename all "mtk_drm_ddp_comp" to "mtk_ddp_comp":
- To align the naming rule
- To reduce the code size
Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
---
drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 16 +++++++---------
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 6 +++---
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index fe965ad7d282..d8b591aff3c2 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -276,9 +276,9 @@ static void mtk_crtc_ddp_clk_disable(struct mtk_crtc *mtk_crtc)
}
static
-struct mtk_ddp_comp *mtk_drm_ddp_comp_for_plane(struct drm_crtc *crtc,
- struct drm_plane *plane,
- unsigned int *local_layer)
+struct mtk_ddp_comp *mtk_ddp_comp_for_plane(struct drm_crtc *crtc,
+ struct drm_plane *plane,
+ unsigned int *local_layer)
{
struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);
struct mtk_ddp_comp *comp;
@@ -428,7 +428,7 @@ static int mtk_crtc_ddp_hw_init(struct mtk_crtc *mtk_crtc)
/* should not enable layer before crtc enabled */
plane_state->pending.enable = false;
- comp = mtk_drm_ddp_comp_for_plane(crtc, plane, &local_layer);
+ comp = mtk_ddp_comp_for_plane(crtc, plane, &local_layer);
if (comp)
mtk_ddp_comp_layer_config(comp, local_layer,
plane_state, NULL);
@@ -519,8 +519,7 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc,
if (!plane_state->pending.config)
continue;
- comp = mtk_drm_ddp_comp_for_plane(crtc, plane,
- &local_layer);
+ comp = mtk_ddp_comp_for_plane(crtc, plane, &local_layer);
if (comp)
mtk_ddp_comp_layer_config(comp, local_layer,
@@ -544,8 +543,7 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc,
if (!plane_state->pending.async_config)
continue;
- comp = mtk_drm_ddp_comp_for_plane(crtc, plane,
- &local_layer);
+ comp = mtk_ddp_comp_for_plane(crtc, plane, &local_layer);
if (comp)
mtk_ddp_comp_layer_config(comp, local_layer,
@@ -709,7 +707,7 @@ int mtk_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane *plane,
unsigned int local_layer;
struct mtk_ddp_comp *comp;
- comp = mtk_drm_ddp_comp_for_plane(crtc, plane, &local_layer);
+ comp = mtk_ddp_comp_for_plane(crtc, plane, &local_layer);
if (comp)
return mtk_ddp_comp_layer_check(comp, local_layer, state);
return 0;
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
index 93d79a1366e9..ba985206fdd2 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
@@ -3,8 +3,8 @@
* Copyright (c) 2015 MediaTek Inc.
*/
-#ifndef MTK_DRM_DDP_COMP_H
-#define MTK_DRM_DDP_COMP_H
+#ifndef MTK_DDP_COMP_H
+#define MTK_DDP_COMP_H
#include <linux/io.h>
#include <linux/pm_runtime.h>
@@ -340,4 +340,4 @@ void mtk_ddp_write_relaxed(struct cmdq_pkt *cmdq_pkt, unsigned int value,
void mtk_ddp_write_mask(struct cmdq_pkt *cmdq_pkt, unsigned int value,
struct cmdq_client_reg *cmdq_reg, void __iomem *regs,
unsigned int offset, unsigned int mask);
-#endif /* MTK_DRM_DDP_COMP_H */
+#endif /* MTK_DDP_COMP_H */
--
2.18.0
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 03/11] drm/mediatek: Rename "mtk_drm_plane" to "mtk_plane"
2024-02-26 8:50 [PATCH 00/11] Rename mtk_drm_* to mtk_* Shawn Sung
2024-02-26 8:50 ` [PATCH 01/11] drm/mediatek: Rename "mtk_drm_crtc" to "mtk_crtc" Shawn Sung
2024-02-26 8:50 ` [PATCH 02/11] drm/mediatek: Rename "mtk_drm_ddp_comp" to "mtk_ddp_comp" Shawn Sung
@ 2024-02-26 8:50 ` Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 5:20 ` CK Hu (胡俊光)
2024-02-26 8:50 ` [PATCH 04/11] drm/mediatek: Rename "mtk_drm_gem" to "mtk_gem" Shawn Sung
` (7 subsequent siblings)
10 siblings, 2 replies; 36+ messages in thread
From: Shawn Sung @ 2024-02-26 8:50 UTC (permalink / raw)
To: Chun-Kuang Hu, AngeloGioacchino Del Regno
Cc: Philipp Zabel, David Airlie, Daniel Vetter, Matthias Brugger,
Sumit Semwal, Christian König, dri-devel, linux-mediatek,
linux-kernel, linux-arm-kernel, linux-media, linaro-mm-sig,
Hsiao Chien Sung
From: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
Rename all "mtk_drm_plane" to "mtk_plane":
- To align the naming rule
- To reduce the code size
Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
---
drivers/gpu/drm/mediatek/mtk_drm_plane.c | 6 +++---
drivers/gpu/drm/mediatek/mtk_drm_plane.h | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
index cbdb70677d30..43137c46fc14 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
@@ -93,8 +93,8 @@ static bool mtk_plane_format_mod_supported(struct drm_plane *plane,
return true;
}
-static void mtk_drm_plane_destroy_state(struct drm_plane *plane,
- struct drm_plane_state *state)
+static void mtk_plane_destroy_state(struct drm_plane *plane,
+ struct drm_plane_state *state)
{
__drm_atomic_helper_plane_destroy_state(state);
kfree(to_mtk_plane_state(state));
@@ -241,7 +241,7 @@ static const struct drm_plane_funcs mtk_plane_funcs = {
.destroy = drm_plane_cleanup,
.reset = mtk_plane_reset,
.atomic_duplicate_state = mtk_plane_duplicate_state,
- .atomic_destroy_state = mtk_drm_plane_destroy_state,
+ .atomic_destroy_state = mtk_plane_destroy_state,
.format_mod_supported = mtk_plane_format_mod_supported,
};
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.h b/drivers/gpu/drm/mediatek/mtk_drm_plane.h
index 99aff7da0831..231bb7aac947 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_plane.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.h
@@ -4,8 +4,8 @@
* Author: CK Hu <ck.hu@mediatek.com>
*/
-#ifndef _MTK_DRM_PLANE_H_
-#define _MTK_DRM_PLANE_H_
+#ifndef _MTK_PLANE_H_
+#define _MTK_PLANE_H_
#include <drm/drm_crtc.h>
#include <linux/types.h>
--
2.18.0
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 04/11] drm/mediatek: Rename "mtk_drm_gem" to "mtk_gem"
2024-02-26 8:50 [PATCH 00/11] Rename mtk_drm_* to mtk_* Shawn Sung
` (2 preceding siblings ...)
2024-02-26 8:50 ` [PATCH 03/11] drm/mediatek: Rename "mtk_drm_plane" to "mtk_plane" Shawn Sung
@ 2024-02-26 8:50 ` Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 5:49 ` CK Hu (胡俊光)
2024-02-26 8:50 ` [PATCH 05/11] drm/mediatek: Rename "mtk_drm_hdmi" to "mtk_hdmi" Shawn Sung
` (6 subsequent siblings)
10 siblings, 2 replies; 36+ messages in thread
From: Shawn Sung @ 2024-02-26 8:50 UTC (permalink / raw)
To: Chun-Kuang Hu, AngeloGioacchino Del Regno
Cc: Philipp Zabel, David Airlie, Daniel Vetter, Matthias Brugger,
Sumit Semwal, Christian König, dri-devel, linux-mediatek,
linux-kernel, linux-arm-kernel, linux-media, linaro-mm-sig,
Hsiao Chien Sung
From: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
Rename all "mtk_drm_gem" to "mtk_gem":
- To align the naming rule
- To reduce the code size
Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
---
drivers/gpu/drm/mediatek/mtk_drm_drv.c | 8 +--
drivers/gpu/drm/mediatek/mtk_drm_gem.c | 63 ++++++++++++------------
drivers/gpu/drm/mediatek/mtk_drm_gem.h | 19 ++++---
drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 +-
4 files changed, 45 insertions(+), 47 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index c46773569b3c..81e8aa65abd6 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -576,8 +576,8 @@ DEFINE_DRM_GEM_FOPS(mtk_drm_fops);
* We need to override this because the device used to import the memory is
* not dev->dev, as drm_gem_prime_import() expects.
*/
-static struct drm_gem_object *mtk_drm_gem_prime_import(struct drm_device *dev,
- struct dma_buf *dma_buf)
+static struct drm_gem_object *mtk_gem_prime_import(struct drm_device *dev,
+ struct dma_buf *dma_buf)
{
struct mtk_drm_private *private = dev->dev_private;
@@ -587,9 +587,9 @@ static struct drm_gem_object *mtk_drm_gem_prime_import(struct drm_device *dev,
static const struct drm_driver mtk_drm_driver = {
.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,
- .dumb_create = mtk_drm_gem_dumb_create,
+ .dumb_create = mtk_gem_dumb_create,
- .gem_prime_import = mtk_drm_gem_prime_import,
+ .gem_prime_import = mtk_gem_prime_import,
.gem_prime_import_sg_table = mtk_gem_prime_import_sg_table,
.fops = &mtk_drm_fops,
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
index 4f2e3feabc0f..3ae1f12bfb46 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_gem.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
@@ -14,26 +14,26 @@
#include "mtk_drm_drv.h"
#include "mtk_drm_gem.h"
-static int mtk_drm_gem_object_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma);
+static int mtk_gem_object_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma);
static const struct vm_operations_struct vm_ops = {
.open = drm_gem_vm_open,
.close = drm_gem_vm_close,
};
-static const struct drm_gem_object_funcs mtk_drm_gem_object_funcs = {
- .free = mtk_drm_gem_free_object,
+static const struct drm_gem_object_funcs mtk_gem_object_funcs = {
+ .free = mtk_gem_free_object,
.get_sg_table = mtk_gem_prime_get_sg_table,
- .vmap = mtk_drm_gem_prime_vmap,
- .vunmap = mtk_drm_gem_prime_vunmap,
- .mmap = mtk_drm_gem_object_mmap,
+ .vmap = mtk_gem_prime_vmap,
+ .vunmap = mtk_gem_prime_vunmap,
+ .mmap = mtk_gem_object_mmap,
.vm_ops = &vm_ops,
};
-static struct mtk_drm_gem_obj *mtk_drm_gem_init(struct drm_device *dev,
- unsigned long size)
+static struct mtk_gem_obj *mtk_gem_init(struct drm_device *dev,
+ unsigned long size)
{
- struct mtk_drm_gem_obj *mtk_gem_obj;
+ struct mtk_gem_obj *mtk_gem_obj;
int ret;
size = round_up(size, PAGE_SIZE);
@@ -42,7 +42,7 @@ static struct mtk_drm_gem_obj *mtk_drm_gem_init(struct drm_device *dev,
if (!mtk_gem_obj)
return ERR_PTR(-ENOMEM);
- mtk_gem_obj->base.funcs = &mtk_drm_gem_object_funcs;
+ mtk_gem_obj->base.funcs = &mtk_gem_object_funcs;
ret = drm_gem_object_init(dev, &mtk_gem_obj->base, size);
if (ret < 0) {
@@ -54,15 +54,15 @@ static struct mtk_drm_gem_obj *mtk_drm_gem_init(struct drm_device *dev,
return mtk_gem_obj;
}
-struct mtk_drm_gem_obj *mtk_drm_gem_create(struct drm_device *dev,
- size_t size, bool alloc_kmap)
+struct mtk_gem_obj *mtk_gem_create(struct drm_device *dev, size_t size,
+ bool alloc_kmap)
{
struct mtk_drm_private *priv = dev->dev_private;
- struct mtk_drm_gem_obj *mtk_gem;
+ struct mtk_gem_obj *mtk_gem;
struct drm_gem_object *obj;
int ret;
- mtk_gem = mtk_drm_gem_init(dev, size);
+ mtk_gem = mtk_gem_init(dev, size);
if (IS_ERR(mtk_gem))
return ERR_CAST(mtk_gem);
@@ -97,9 +97,9 @@ struct mtk_drm_gem_obj *mtk_drm_gem_create(struct drm_device *dev,
return ERR_PTR(ret);
}
-void mtk_drm_gem_free_object(struct drm_gem_object *obj)
+void mtk_gem_free_object(struct drm_gem_object *obj)
{
- struct mtk_drm_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
+ struct mtk_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
struct mtk_drm_private *priv = obj->dev->dev_private;
if (mtk_gem->sg)
@@ -114,10 +114,10 @@ void mtk_drm_gem_free_object(struct drm_gem_object *obj)
kfree(mtk_gem);
}
-int mtk_drm_gem_dumb_create(struct drm_file *file_priv, struct drm_device *dev,
- struct drm_mode_create_dumb *args)
+int mtk_gem_dumb_create(struct drm_file *file_priv, struct drm_device *dev,
+ struct drm_mode_create_dumb *args)
{
- struct mtk_drm_gem_obj *mtk_gem;
+ struct mtk_gem_obj *mtk_gem;
int ret;
args->pitch = DIV_ROUND_UP(args->width * args->bpp, 8);
@@ -130,7 +130,7 @@ int mtk_drm_gem_dumb_create(struct drm_file *file_priv, struct drm_device *dev,
args->size = args->pitch;
args->size *= args->height;
- mtk_gem = mtk_drm_gem_create(dev, args->size, false);
+ mtk_gem = mtk_gem_create(dev, args->size, false);
if (IS_ERR(mtk_gem))
return PTR_ERR(mtk_gem);
@@ -148,16 +148,16 @@ int mtk_drm_gem_dumb_create(struct drm_file *file_priv, struct drm_device *dev,
return 0;
err_handle_create:
- mtk_drm_gem_free_object(&mtk_gem->base);
+ mtk_gem_free_object(&mtk_gem->base);
return ret;
}
-static int mtk_drm_gem_object_mmap(struct drm_gem_object *obj,
- struct vm_area_struct *vma)
+static int mtk_gem_object_mmap(struct drm_gem_object *obj,
+ struct vm_area_struct *vma)
{
int ret;
- struct mtk_drm_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
+ struct mtk_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
struct mtk_drm_private *priv = obj->dev->dev_private;
/*
@@ -188,7 +188,7 @@ static int mtk_drm_gem_object_mmap(struct drm_gem_object *obj,
*/
struct sg_table *mtk_gem_prime_get_sg_table(struct drm_gem_object *obj)
{
- struct mtk_drm_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
+ struct mtk_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
struct mtk_drm_private *priv = obj->dev->dev_private;
struct sg_table *sgt;
int ret;
@@ -212,7 +212,7 @@ struct sg_table *mtk_gem_prime_get_sg_table(struct drm_gem_object *obj)
struct drm_gem_object *mtk_gem_prime_import_sg_table(struct drm_device *dev,
struct dma_buf_attachment *attach, struct sg_table *sg)
{
- struct mtk_drm_gem_obj *mtk_gem;
+ struct mtk_gem_obj *mtk_gem;
/* check if the entries in the sg_table are contiguous */
if (drm_prime_get_contiguous_size(sg) < attach->dmabuf->size) {
@@ -220,7 +220,7 @@ struct drm_gem_object *mtk_gem_prime_import_sg_table(struct drm_device *dev,
return ERR_PTR(-EINVAL);
}
- mtk_gem = mtk_drm_gem_init(dev, attach->dmabuf->size);
+ mtk_gem = mtk_gem_init(dev, attach->dmabuf->size);
if (IS_ERR(mtk_gem))
return ERR_CAST(mtk_gem);
@@ -230,9 +230,9 @@ struct drm_gem_object *mtk_gem_prime_import_sg_table(struct drm_device *dev,
return &mtk_gem->base;
}
-int mtk_drm_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map *map)
+int mtk_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map *map)
{
- struct mtk_drm_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
+ struct mtk_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
struct sg_table *sgt = NULL;
unsigned int npages;
@@ -270,10 +270,9 @@ int mtk_drm_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map *map)
return 0;
}
-void mtk_drm_gem_prime_vunmap(struct drm_gem_object *obj,
- struct iosys_map *map)
+void mtk_gem_prime_vunmap(struct drm_gem_object *obj, struct iosys_map *map)
{
- struct mtk_drm_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
+ struct mtk_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
void *vaddr = map->vaddr;
if (!mtk_gem->pages)
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.h b/drivers/gpu/drm/mediatek/mtk_drm_gem.h
index 78f23b07a02e..8a5a760f5e6d 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_gem.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.h
@@ -22,7 +22,7 @@
* P.S. this object would be transferred to user as kms_bo.handle so
* user can access the buffer through kms_bo.handle.
*/
-struct mtk_drm_gem_obj {
+struct mtk_gem_obj {
struct drm_gem_object base;
void *cookie;
void *kvaddr;
@@ -32,18 +32,17 @@ struct mtk_drm_gem_obj {
struct page **pages;
};
-#define to_mtk_gem_obj(x) container_of(x, struct mtk_drm_gem_obj, base)
+#define to_mtk_gem_obj(x) container_of(x, struct mtk_gem_obj, base)
-void mtk_drm_gem_free_object(struct drm_gem_object *gem);
-struct mtk_drm_gem_obj *mtk_drm_gem_create(struct drm_device *dev, size_t size,
- bool alloc_kmap);
-int mtk_drm_gem_dumb_create(struct drm_file *file_priv, struct drm_device *dev,
- struct drm_mode_create_dumb *args);
+void mtk_gem_free_object(struct drm_gem_object *gem);
+struct mtk_gem_obj *mtk_gem_create(struct drm_device *dev, size_t size,
+ bool alloc_kmap);
+int mtk_gem_dumb_create(struct drm_file *file_priv, struct drm_device *dev,
+ struct drm_mode_create_dumb *args);
struct sg_table *mtk_gem_prime_get_sg_table(struct drm_gem_object *obj);
struct drm_gem_object *mtk_gem_prime_import_sg_table(struct drm_device *dev,
struct dma_buf_attachment *attach, struct sg_table *sg);
-int mtk_drm_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map *map);
-void mtk_drm_gem_prime_vunmap(struct drm_gem_object *obj,
- struct iosys_map *map);
+int mtk_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map *map);
+void mtk_gem_prime_vunmap(struct drm_gem_object *obj, struct iosys_map *map);
#endif
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
index 43137c46fc14..db63a32c407e 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
@@ -135,7 +135,7 @@ static void mtk_plane_update_new_state(struct drm_plane_state *new_state,
{
struct drm_framebuffer *fb = new_state->fb;
struct drm_gem_object *gem;
- struct mtk_drm_gem_obj *mtk_gem;
+ struct mtk_gem_obj *mtk_gem;
unsigned int pitch, format;
u64 modifier;
dma_addr_t addr;
--
2.18.0
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 05/11] drm/mediatek: Rename "mtk_drm_hdmi" to "mtk_hdmi"
2024-02-26 8:50 [PATCH 00/11] Rename mtk_drm_* to mtk_* Shawn Sung
` (3 preceding siblings ...)
2024-02-26 8:50 ` [PATCH 04/11] drm/mediatek: Rename "mtk_drm_gem" to "mtk_gem" Shawn Sung
@ 2024-02-26 8:50 ` Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 6:24 ` CK Hu (胡俊光)
2024-02-26 8:50 ` [PATCH 06/11] drm/mediatek: Rename files "mtk_drm_crtc.*" to "mtk_crtc.*" Shawn Sung
` (5 subsequent siblings)
10 siblings, 2 replies; 36+ messages in thread
From: Shawn Sung @ 2024-02-26 8:50 UTC (permalink / raw)
To: Chun-Kuang Hu, AngeloGioacchino Del Regno
Cc: Philipp Zabel, David Airlie, Daniel Vetter, Matthias Brugger,
Sumit Semwal, Christian König, dri-devel, linux-mediatek,
linux-kernel, linux-arm-kernel, linux-media, linaro-mm-sig,
Hsiao Chien Sung
From: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
Rename all "mtk_drm_hdmi" to "mtk_hdmi":
- To align the naming rule
- To reduce the code size
Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
---
drivers/gpu/drm/mediatek/mtk_hdmi.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
index 86133bf16326..d2876da1b43a 100644
--- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
@@ -1687,7 +1687,7 @@ static int mtk_hdmi_register_audio_driver(struct device *dev)
return 0;
}
-static int mtk_drm_hdmi_probe(struct platform_device *pdev)
+static int mtk_hdmi_probe(struct platform_device *pdev)
{
struct mtk_hdmi *hdmi;
struct device *dev = &pdev->dev;
@@ -1746,7 +1746,7 @@ static int mtk_drm_hdmi_probe(struct platform_device *pdev)
return ret;
}
-static void mtk_drm_hdmi_remove(struct platform_device *pdev)
+static void mtk_hdmi_remove(struct platform_device *pdev)
{
struct mtk_hdmi *hdmi = platform_get_drvdata(pdev);
@@ -1790,7 +1790,7 @@ static const struct mtk_hdmi_conf mtk_hdmi_conf_mt8167 = {
.cea_modes_only = true,
};
-static const struct of_device_id mtk_drm_hdmi_of_ids[] = {
+static const struct of_device_id mtk_hdmi_of_ids[] = {
{ .compatible = "mediatek,mt2701-hdmi",
.data = &mtk_hdmi_conf_mt2701,
},
@@ -1801,14 +1801,14 @@ static const struct of_device_id mtk_drm_hdmi_of_ids[] = {
},
{}
};
-MODULE_DEVICE_TABLE(of, mtk_drm_hdmi_of_ids);
+MODULE_DEVICE_TABLE(of, mtk_hdmi_of_ids);
static struct platform_driver mtk_hdmi_driver = {
- .probe = mtk_drm_hdmi_probe,
- .remove_new = mtk_drm_hdmi_remove,
+ .probe = mtk_hdmi_probe,
+ .remove_new = mtk_hdmi_remove,
.driver = {
.name = "mediatek-drm-hdmi",
- .of_match_table = mtk_drm_hdmi_of_ids,
+ .of_match_table = mtk_hdmi_of_ids,
.pm = &mtk_hdmi_pm_ops,
},
};
--
2.18.0
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 06/11] drm/mediatek: Rename files "mtk_drm_crtc.*" to "mtk_crtc.*"
2024-02-26 8:50 [PATCH 00/11] Rename mtk_drm_* to mtk_* Shawn Sung
` (4 preceding siblings ...)
2024-02-26 8:50 ` [PATCH 05/11] drm/mediatek: Rename "mtk_drm_hdmi" to "mtk_hdmi" Shawn Sung
@ 2024-02-26 8:50 ` Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 6:40 ` CK Hu (胡俊光)
2024-02-26 8:50 ` [PATCH 07/11] drm/mediatek: Rename files "mtk_drm_ddp_comp.*" to "mtk_ddp_comp.*" Shawn Sung
` (4 subsequent siblings)
10 siblings, 2 replies; 36+ messages in thread
From: Shawn Sung @ 2024-02-26 8:50 UTC (permalink / raw)
To: Chun-Kuang Hu, AngeloGioacchino Del Regno
Cc: Philipp Zabel, David Airlie, Daniel Vetter, Matthias Brugger,
Sumit Semwal, Christian König, dri-devel, linux-mediatek,
linux-kernel, linux-arm-kernel, linux-media, linaro-mm-sig,
Hsiao Chien Sung
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>
---
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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 07/11] drm/mediatek: Rename files "mtk_drm_ddp_comp.*" to "mtk_ddp_comp.*"
2024-02-26 8:50 [PATCH 00/11] Rename mtk_drm_* to mtk_* Shawn Sung
` (5 preceding siblings ...)
2024-02-26 8:50 ` [PATCH 06/11] drm/mediatek: Rename files "mtk_drm_crtc.*" to "mtk_crtc.*" Shawn Sung
@ 2024-02-26 8:50 ` Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 6:54 ` CK Hu (胡俊光)
2024-02-26 8:50 ` [PATCH 08/11] drm/mediatek: Rename files "mtk_drm_plane.*" to "mtk_plane.*" Shawn Sung
` (3 subsequent siblings)
10 siblings, 2 replies; 36+ messages in thread
From: Shawn Sung @ 2024-02-26 8:50 UTC (permalink / raw)
To: Chun-Kuang Hu, AngeloGioacchino Del Regno
Cc: Philipp Zabel, David Airlie, Daniel Vetter, Matthias Brugger,
Sumit Semwal, Christian König, dri-devel, linux-mediatek,
linux-kernel, linux-arm-kernel, linux-media, linaro-mm-sig,
Hsiao Chien Sung
From: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
Rename files mtk_drm_ddp_comp.* to mtk_ddp_comp.*.
Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
---
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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 08/11] drm/mediatek: Rename files "mtk_drm_plane.*" to "mtk_plane.*"
2024-02-26 8:50 [PATCH 00/11] Rename mtk_drm_* to mtk_* Shawn Sung
` (6 preceding siblings ...)
2024-02-26 8:50 ` [PATCH 07/11] drm/mediatek: Rename files "mtk_drm_ddp_comp.*" to "mtk_ddp_comp.*" Shawn Sung
@ 2024-02-26 8:50 ` Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 6:57 ` CK Hu (胡俊光)
2024-02-26 8:50 ` [PATCH 09/11] drm/mediatek: Rename files "mtk_drm_gem.*" to "mtk_gem.*" Shawn Sung
` (2 subsequent siblings)
10 siblings, 2 replies; 36+ messages in thread
From: Shawn Sung @ 2024-02-26 8:50 UTC (permalink / raw)
To: Chun-Kuang Hu, AngeloGioacchino Del Regno
Cc: Philipp Zabel, David Airlie, Daniel Vetter, Matthias Brugger,
Sumit Semwal, Christian König, dri-devel, linux-mediatek,
linux-kernel, linux-arm-kernel, linux-media, linaro-mm-sig,
Hsiao Chien Sung
From: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
Rename files mtk_drm_plane.* to mtk_plane.*.
Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
---
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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 09/11] drm/mediatek: Rename files "mtk_drm_gem.*" to "mtk_gem.*"
2024-02-26 8:50 [PATCH 00/11] Rename mtk_drm_* to mtk_* Shawn Sung
` (7 preceding siblings ...)
2024-02-26 8:50 ` [PATCH 08/11] drm/mediatek: Rename files "mtk_drm_plane.*" to "mtk_plane.*" Shawn Sung
@ 2024-02-26 8:50 ` Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 7:03 ` CK Hu (胡俊光)
2024-02-26 8:50 ` [PATCH 10/11] drm/mediatek: Rename mtk_ddp_comp functions Shawn Sung
2024-02-26 8:50 ` [PATCH 11/11] drm/mediatek: Rename "pending_needs_vblank" to "needs_vblank" Shawn Sung
10 siblings, 2 replies; 36+ messages in thread
From: Shawn Sung @ 2024-02-26 8:50 UTC (permalink / raw)
To: Chun-Kuang Hu, AngeloGioacchino Del Regno
Cc: Philipp Zabel, David Airlie, Daniel Vetter, Matthias Brugger,
Sumit Semwal, Christian König, dri-devel, linux-mediatek,
linux-kernel, linux-arm-kernel, linux-media, linaro-mm-sig,
Hsiao Chien Sung
From: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
Rename files mtk_drm_gem.* to mtk_gem.*.
Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
---
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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 10/11] drm/mediatek: Rename mtk_ddp_comp functions
2024-02-26 8:50 [PATCH 00/11] Rename mtk_drm_* to mtk_* Shawn Sung
` (8 preceding siblings ...)
2024-02-26 8:50 ` [PATCH 09/11] drm/mediatek: Rename files "mtk_drm_gem.*" to "mtk_gem.*" Shawn Sung
@ 2024-02-26 8:50 ` Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 7:09 ` CK Hu (胡俊光)
2024-02-26 8:50 ` [PATCH 11/11] drm/mediatek: Rename "pending_needs_vblank" to "needs_vblank" Shawn Sung
10 siblings, 2 replies; 36+ messages in thread
From: Shawn Sung @ 2024-02-26 8:50 UTC (permalink / raw)
To: Chun-Kuang Hu, AngeloGioacchino Del Regno
Cc: Philipp Zabel, David Airlie, Daniel Vetter, Matthias Brugger,
Sumit Semwal, Christian König, dri-devel, linux-mediatek,
linux-kernel, linux-arm-kernel, linux-media, linaro-mm-sig,
Hsiao Chien Sung
From: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
Rename functions of mtk_ddp_comp:
- To align the naming rule
- To reduce the code size
Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
---
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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 11/11] drm/mediatek: Rename "pending_needs_vblank" to "needs_vblank"
2024-02-26 8:50 [PATCH 00/11] Rename mtk_drm_* to mtk_* Shawn Sung
` (9 preceding siblings ...)
2024-02-26 8:50 ` [PATCH 10/11] drm/mediatek: Rename mtk_ddp_comp functions Shawn Sung
@ 2024-02-26 8:50 ` Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 7:26 ` CK Hu (胡俊光)
10 siblings, 2 replies; 36+ messages in thread
From: Shawn Sung @ 2024-02-26 8:50 UTC (permalink / raw)
To: Chun-Kuang Hu, AngeloGioacchino Del Regno
Cc: Philipp Zabel, David Airlie, Daniel Vetter, Matthias Brugger,
Sumit Semwal, Christian König, dri-devel, linux-mediatek,
linux-kernel, linux-arm-kernel, linux-media, linaro-mm-sig,
Hsiao Chien Sung
From: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
Rename "pending_needs_vblank" to "needs_vblank" to reduce the code size.
Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
---
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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* Re: [PATCH 10/11] drm/mediatek: Rename mtk_ddp_comp functions
2024-02-26 8:50 ` [PATCH 10/11] drm/mediatek: Rename mtk_ddp_comp functions Shawn Sung
@ 2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 7:09 ` CK Hu (胡俊光)
1 sibling, 0 replies; 36+ messages in thread
From: AngeloGioacchino Del Regno @ 2024-02-26 12:39 UTC (permalink / raw)
To: Shawn Sung, Chun-Kuang Hu
Cc: Philipp Zabel, David Airlie, Daniel Vetter, Matthias Brugger,
Sumit Semwal, Christian König, dri-devel, linux-mediatek,
linux-kernel, linux-arm-kernel, linux-media, linaro-mm-sig,
Hsiao Chien Sung
Il 26/02/24 09:50, Shawn Sung ha scritto:
> From: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
>
> Rename functions of mtk_ddp_comp:
> - To align the naming rule
> - To reduce the code size
>
> Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
Reviewed-by: AngeloGiaocchino Del Regno <angelogioacchino.delregno@collabora.com>
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 09/11] drm/mediatek: Rename files "mtk_drm_gem.*" to "mtk_gem.*"
2024-02-26 8:50 ` [PATCH 09/11] drm/mediatek: Rename files "mtk_drm_gem.*" to "mtk_gem.*" Shawn Sung
@ 2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 7:03 ` CK Hu (胡俊光)
1 sibling, 0 replies; 36+ messages in thread
From: AngeloGioacchino Del Regno @ 2024-02-26 12:39 UTC (permalink / raw)
To: Shawn Sung, Chun-Kuang Hu
Cc: Philipp Zabel, David Airlie, Daniel Vetter, Matthias Brugger,
Sumit Semwal, Christian König, dri-devel, linux-mediatek,
linux-kernel, linux-arm-kernel, linux-media, linaro-mm-sig,
Hsiao Chien Sung
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_gem.* to mtk_gem.*.
>
> Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
Reviewed-by: AngeloGiaocchino Del Regno <angelogioacchino.delregno@collabora.com>
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 08/11] drm/mediatek: Rename files "mtk_drm_plane.*" to "mtk_plane.*"
2024-02-26 8:50 ` [PATCH 08/11] drm/mediatek: Rename files "mtk_drm_plane.*" to "mtk_plane.*" Shawn Sung
@ 2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 6:57 ` CK Hu (胡俊光)
1 sibling, 0 replies; 36+ messages in thread
From: AngeloGioacchino Del Regno @ 2024-02-26 12:39 UTC (permalink / raw)
To: Shawn Sung, Chun-Kuang Hu
Cc: Philipp Zabel, David Airlie, Daniel Vetter, Matthias Brugger,
Sumit Semwal, Christian König, dri-devel, linux-mediatek,
linux-kernel, linux-arm-kernel, linux-media, linaro-mm-sig,
Hsiao Chien Sung
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_plane.* to mtk_plane.*.
>
> Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
Reviewed-by: AngeloGiaocchino Del Regno <angelogioacchino.delregno@collabora.com>
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 07/11] drm/mediatek: Rename files "mtk_drm_ddp_comp.*" to "mtk_ddp_comp.*"
2024-02-26 8:50 ` [PATCH 07/11] drm/mediatek: Rename files "mtk_drm_ddp_comp.*" to "mtk_ddp_comp.*" Shawn Sung
@ 2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 6:54 ` CK Hu (胡俊光)
1 sibling, 0 replies; 36+ messages in thread
From: AngeloGioacchino Del Regno @ 2024-02-26 12:39 UTC (permalink / raw)
To: Shawn Sung, Chun-Kuang Hu
Cc: Philipp Zabel, David Airlie, Daniel Vetter, Matthias Brugger,
Sumit Semwal, Christian König, dri-devel, linux-mediatek,
linux-kernel, linux-arm-kernel, linux-media, linaro-mm-sig,
Hsiao Chien Sung
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_ddp_comp.* to mtk_ddp_comp.*.
>
> Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
Reviewed-by: AngeloGiaocchino Del Regno <angelogioacchino.delregno@collabora.com>
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 06/11] drm/mediatek: Rename files "mtk_drm_crtc.*" to "mtk_crtc.*"
2024-02-26 8:50 ` [PATCH 06/11] drm/mediatek: Rename files "mtk_drm_crtc.*" to "mtk_crtc.*" Shawn Sung
@ 2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 6:40 ` CK Hu (胡俊光)
1 sibling, 0 replies; 36+ messages in thread
From: AngeloGioacchino Del Regno @ 2024-02-26 12:39 UTC (permalink / raw)
To: Shawn Sung, Chun-Kuang Hu
Cc: Philipp Zabel, David Airlie, Daniel Vetter, Matthias Brugger,
Sumit Semwal, Christian König, dri-devel, linux-mediatek,
linux-kernel, linux-arm-kernel, linux-media, linaro-mm-sig,
Hsiao Chien Sung
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>
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 04/11] drm/mediatek: Rename "mtk_drm_gem" to "mtk_gem"
2024-02-26 8:50 ` [PATCH 04/11] drm/mediatek: Rename "mtk_drm_gem" to "mtk_gem" Shawn Sung
@ 2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 5:49 ` CK Hu (胡俊光)
1 sibling, 0 replies; 36+ messages in thread
From: AngeloGioacchino Del Regno @ 2024-02-26 12:39 UTC (permalink / raw)
To: Shawn Sung, Chun-Kuang Hu
Cc: Philipp Zabel, David Airlie, Daniel Vetter, Matthias Brugger,
Sumit Semwal, Christian König, dri-devel, linux-mediatek,
linux-kernel, linux-arm-kernel, linux-media, linaro-mm-sig,
Hsiao Chien Sung
Il 26/02/24 09:50, Shawn Sung ha scritto:
> From: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
>
> Rename all "mtk_drm_gem" to "mtk_gem":
> - To align the naming rule
> - To reduce the code size
>
> Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
Reviewed-by: AngeloGiaocchino Del Regno <angelogioacchino.delregno@collabora.com>
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 03/11] drm/mediatek: Rename "mtk_drm_plane" to "mtk_plane"
2024-02-26 8:50 ` [PATCH 03/11] drm/mediatek: Rename "mtk_drm_plane" to "mtk_plane" Shawn Sung
@ 2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 5:20 ` CK Hu (胡俊光)
1 sibling, 0 replies; 36+ messages in thread
From: AngeloGioacchino Del Regno @ 2024-02-26 12:39 UTC (permalink / raw)
To: Shawn Sung, Chun-Kuang Hu
Cc: Philipp Zabel, David Airlie, Daniel Vetter, Matthias Brugger,
Sumit Semwal, Christian König, dri-devel, linux-mediatek,
linux-kernel, linux-arm-kernel, linux-media, linaro-mm-sig,
Hsiao Chien Sung
Il 26/02/24 09:50, Shawn Sung ha scritto:
> From: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
>
> Rename all "mtk_drm_plane" to "mtk_plane":
> - To align the naming rule
> - To reduce the code size
>
> Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
Reviewed-by: AngeloGiaocchino Del Regno <angelogioacchino.delregno@collabora.com>
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 02/11] drm/mediatek: Rename "mtk_drm_ddp_comp" to "mtk_ddp_comp"
2024-02-26 8:50 ` [PATCH 02/11] drm/mediatek: Rename "mtk_drm_ddp_comp" to "mtk_ddp_comp" Shawn Sung
@ 2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 5:14 ` CK Hu (胡俊光)
1 sibling, 0 replies; 36+ messages in thread
From: AngeloGioacchino Del Regno @ 2024-02-26 12:39 UTC (permalink / raw)
To: Shawn Sung, Chun-Kuang Hu
Cc: Philipp Zabel, David Airlie, Daniel Vetter, Matthias Brugger,
Sumit Semwal, Christian König, dri-devel, linux-mediatek,
linux-kernel, linux-arm-kernel, linux-media, linaro-mm-sig,
Hsiao Chien Sung
Il 26/02/24 09:50, Shawn Sung ha scritto:
> From: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
>
> Rename all "mtk_drm_ddp_comp" to "mtk_ddp_comp":
> - To align the naming rule
> - To reduce the code size
>
> Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
Reviewed-by: AngeloGiaocchino Del Regno <angelogioacchino.delregno@collabora.com>
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 01/11] drm/mediatek: Rename "mtk_drm_crtc" to "mtk_crtc"
2024-02-26 8:50 ` [PATCH 01/11] drm/mediatek: Rename "mtk_drm_crtc" to "mtk_crtc" Shawn Sung
@ 2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 3:26 ` CK Hu (胡俊光)
1 sibling, 0 replies; 36+ messages in thread
From: AngeloGioacchino Del Regno @ 2024-02-26 12:39 UTC (permalink / raw)
To: Shawn Sung, Chun-Kuang Hu
Cc: Philipp Zabel, David Airlie, Daniel Vetter, Matthias Brugger,
Sumit Semwal, Christian König, dri-devel, linux-mediatek,
linux-kernel, linux-arm-kernel, linux-media, linaro-mm-sig,
Hsiao Chien Sung
Il 26/02/24 09:50, Shawn Sung ha scritto:
> From: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
>
> Rename all "mtk_drm_crtc" to "mtk_crtc" due to the following benefits:
> - Lower the matches when searching the native drm_crtc* codes
> - Reduce the code size
>
> Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
Reviewed-by: AngeloGiaocchino Del Regno <angelogioacchino.delregno@collabora.com>
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 05/11] drm/mediatek: Rename "mtk_drm_hdmi" to "mtk_hdmi"
2024-02-26 8:50 ` [PATCH 05/11] drm/mediatek: Rename "mtk_drm_hdmi" to "mtk_hdmi" Shawn Sung
@ 2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 6:24 ` CK Hu (胡俊光)
1 sibling, 0 replies; 36+ messages in thread
From: AngeloGioacchino Del Regno @ 2024-02-26 12:39 UTC (permalink / raw)
To: Shawn Sung, Chun-Kuang Hu
Cc: Philipp Zabel, David Airlie, Daniel Vetter, Matthias Brugger,
Sumit Semwal, Christian König, dri-devel, linux-mediatek,
linux-kernel, linux-arm-kernel, linux-media, linaro-mm-sig,
Hsiao Chien Sung
Il 26/02/24 09:50, Shawn Sung ha scritto:
> From: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
>
> Rename all "mtk_drm_hdmi" to "mtk_hdmi":
> - To align the naming rule
> - To reduce the code size
>
> Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
Reviewed-by: AngeloGiaocchino Del Regno <angelogioacchino.delregno@collabora.com>
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 11/11] drm/mediatek: Rename "pending_needs_vblank" to "needs_vblank"
2024-02-26 8:50 ` [PATCH 11/11] drm/mediatek: Rename "pending_needs_vblank" to "needs_vblank" Shawn Sung
@ 2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-02-29 2:35 ` Shawn Sung (宋孝謙)
2024-03-14 7:26 ` CK Hu (胡俊光)
1 sibling, 1 reply; 36+ messages in thread
From: AngeloGioacchino Del Regno @ 2024-02-26 12:39 UTC (permalink / raw)
To: Shawn Sung, Chun-Kuang Hu
Cc: Philipp Zabel, David Airlie, Daniel Vetter, Matthias Brugger,
Sumit Semwal, Christian König, dri-devel, linux-mediatek,
linux-kernel, linux-arm-kernel, linux-media, linaro-mm-sig,
Hsiao Chien Sung
Il 26/02/24 09:50, Shawn Sung ha scritto:
> From: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com>
>
> 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 <shawn.sung@mediatek.corp-partner.google.com>
> ---
> 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];
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 11/11] drm/mediatek: Rename "pending_needs_vblank" to "needs_vblank"
2024-02-26 12:39 ` AngeloGioacchino Del Regno
@ 2024-02-29 2:35 ` Shawn Sung (宋孝謙)
0 siblings, 0 replies; 36+ messages in thread
From: Shawn Sung (宋孝謙) @ 2024-02-29 2:35 UTC (permalink / raw)
To: angelogioacchino.delregno, chunkuang.hu
Cc: sumit.semwal, linux-mediatek, linux-kernel, linaro-mm-sig,
christian.koenig, linux-media, daniel, p.zabel, dri-devel,
shawn.sung, airlied, linux-arm-kernel, matthias.bgg
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 <shawn.sung@mediatek.corp-partner.google.com
> > >
> >
> > 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
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 01/11] drm/mediatek: Rename "mtk_drm_crtc" to "mtk_crtc"
2024-02-26 8:50 ` [PATCH 01/11] drm/mediatek: Rename "mtk_drm_crtc" to "mtk_crtc" Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
@ 2024-03-14 3:26 ` CK Hu (胡俊光)
1 sibling, 0 replies; 36+ messages in thread
From: CK Hu (胡俊光) @ 2024-03-14 3:26 UTC (permalink / raw)
To: Shawn Sung (宋孝謙),
chunkuang.hu, angelogioacchino.delregno
Cc: sumit.semwal, linux-mediatek, linux-kernel, linaro-mm-sig,
christian.koenig, linux-media, daniel, p.zabel, dri-devel,
shawn.sung, airlied, linux-arm-kernel, matthias.bgg
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 all "mtk_drm_crtc" to "mtk_crtc" due to the following
> benefits:
> - Lower the matches when searching the native drm_crtc* codes
> - Reduce the code size
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/mtk_drm_crtc.c | 186 +++++++++++--------
> ----
> drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 30 ++--
> drivers/gpu/drm/mediatek/mtk_drm_drv.c | 18 +--
> drivers/gpu/drm/mediatek/mtk_drm_drv.h | 2 +-
> drivers/gpu/drm/mediatek/mtk_drm_plane.c | 10 +-
> drivers/gpu/drm/mediatek/mtk_dsi.c | 2 +-
> 6 files changed, 121 insertions(+), 127 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> index 3b55c7a68bde..fe965ad7d282 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> @@ -26,7 +26,7 @@
> #include "mtk_drm_plane.h"
>
> /*
> - * struct mtk_drm_crtc - MediaTek specific crtc structure.
> + * struct mtk_crtc - MediaTek specific crtc structure.
> * @base: crtc object.
> * @enabled: records whether crtc_enable succeeded
> * @planes: array of 4 drm_plane structures, one for each overlay
> plane
> @@ -38,7 +38,7 @@
> *
> * TODO: Needs update: this header is missing a bunch of member
> descriptions.
> */
> -struct mtk_drm_crtc {
> +struct mtk_crtc {
> struct drm_crtc base;
> bool enabled;
>
> @@ -80,9 +80,9 @@ struct mtk_crtc_state {
> unsigned int pending_vrefresh;
> };
>
> -static inline struct mtk_drm_crtc *to_mtk_crtc(struct drm_crtc *c)
> +static inline struct mtk_crtc *to_mtk_crtc(struct drm_crtc *c)
> {
> - return container_of(c, struct mtk_drm_crtc, base);
> + return container_of(c, struct mtk_crtc, base);
> }
>
> static inline struct mtk_crtc_state *to_mtk_crtc_state(struct
> drm_crtc_state *s)
> @@ -90,7 +90,7 @@ static inline struct mtk_crtc_state
> *to_mtk_crtc_state(struct drm_crtc_state *s)
> return container_of(s, struct mtk_crtc_state, base);
> }
>
> -static void mtk_drm_crtc_finish_page_flip(struct mtk_drm_crtc
> *mtk_crtc)
> +static void mtk_crtc_finish_page_flip(struct mtk_crtc *mtk_crtc)
> {
> struct drm_crtc *crtc = &mtk_crtc->base;
> unsigned long flags;
> @@ -102,11 +102,11 @@ static void
> mtk_drm_crtc_finish_page_flip(struct mtk_drm_crtc *mtk_crtc)
> spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
> }
>
> -static void mtk_drm_finish_page_flip(struct mtk_drm_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) {
> - mtk_drm_crtc_finish_page_flip(mtk_crtc);
> + mtk_crtc_finish_page_flip(mtk_crtc);
> mtk_crtc->pending_needs_vblank = false;
> }
> }
> @@ -149,9 +149,9 @@ static void mtk_drm_cmdq_pkt_destroy(struct
> cmdq_pkt *pkt)
> }
> #endif
>
> -static void mtk_drm_crtc_destroy(struct drm_crtc *crtc)
> +static void mtk_crtc_destroy(struct drm_crtc *crtc)
> {
> - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
> + struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);
> int i;
>
> mtk_mutex_put(mtk_crtc->mutex);
> @@ -174,7 +174,7 @@ static void mtk_drm_crtc_destroy(struct drm_crtc
> *crtc)
> drm_crtc_cleanup(crtc);
> }
>
> -static void mtk_drm_crtc_reset(struct drm_crtc *crtc)
> +static void mtk_crtc_reset(struct drm_crtc *crtc)
> {
> struct mtk_crtc_state *state;
>
> @@ -189,7 +189,7 @@ static void mtk_drm_crtc_reset(struct drm_crtc
> *crtc)
> __drm_atomic_helper_crtc_reset(crtc, &state->base);
> }
>
> -static struct drm_crtc_state *mtk_drm_crtc_duplicate_state(struct
> drm_crtc *crtc)
> +static struct drm_crtc_state *mtk_crtc_duplicate_state(struct
> drm_crtc *crtc)
> {
> struct mtk_crtc_state *state;
>
> @@ -206,18 +206,17 @@ static struct drm_crtc_state
> *mtk_drm_crtc_duplicate_state(struct drm_crtc *crtc
> return &state->base;
> }
>
> -static void mtk_drm_crtc_destroy_state(struct drm_crtc *crtc,
> - struct drm_crtc_state *state)
> +static void mtk_crtc_destroy_state(struct drm_crtc *crtc,
> + struct drm_crtc_state *state)
> {
> __drm_atomic_helper_crtc_destroy_state(state);
> kfree(to_mtk_crtc_state(state));
> }
>
> static enum drm_mode_status
> -mtk_drm_crtc_mode_valid(struct drm_crtc *crtc,
> - const struct drm_display_mode *mode)
> +mtk_crtc_mode_valid(struct drm_crtc *crtc, const struct
> drm_display_mode *mode)
> {
> - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
> + struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);
> enum drm_mode_status status = MODE_OK;
> int i;
>
> @@ -229,15 +228,15 @@ mtk_drm_crtc_mode_valid(struct drm_crtc *crtc,
> return status;
> }
>
> -static bool mtk_drm_crtc_mode_fixup(struct drm_crtc *crtc,
> - const struct drm_display_mode
> *mode,
> - struct drm_display_mode
> *adjusted_mode)
> +static bool mtk_crtc_mode_fixup(struct drm_crtc *crtc,
> + const struct drm_display_mode *mode,
> + struct drm_display_mode *adjusted_mode)
> {
> /* Nothing to do here, but this callback is mandatory. */
> return true;
> }
>
> -static void mtk_drm_crtc_mode_set_nofb(struct drm_crtc *crtc)
> +static void mtk_crtc_mode_set_nofb(struct drm_crtc *crtc)
> {
> struct mtk_crtc_state *state = to_mtk_crtc_state(crtc->state);
>
> @@ -248,7 +247,7 @@ static void mtk_drm_crtc_mode_set_nofb(struct
> drm_crtc *crtc)
> state->pending_config = true;
> }
>
> -static int mtk_crtc_ddp_clk_enable(struct mtk_drm_crtc *mtk_crtc)
> +static int mtk_crtc_ddp_clk_enable(struct mtk_crtc *mtk_crtc)
> {
> int ret;
> int i;
> @@ -268,7 +267,7 @@ static int mtk_crtc_ddp_clk_enable(struct
> mtk_drm_crtc *mtk_crtc)
> return ret;
> }
>
> -static void mtk_crtc_ddp_clk_disable(struct mtk_drm_crtc *mtk_crtc)
> +static void mtk_crtc_ddp_clk_disable(struct mtk_crtc *mtk_crtc)
> {
> int i;
>
> @@ -281,7 +280,7 @@ struct mtk_ddp_comp
> *mtk_drm_ddp_comp_for_plane(struct drm_crtc *crtc,
> struct drm_plane
> *plane,
> unsigned int
> *local_layer)
> {
> - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
> + struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);
> struct mtk_ddp_comp *comp;
> int i, count = 0;
> unsigned int local_index = plane - mtk_crtc->planes;
> @@ -304,7 +303,7 @@ static void ddp_cmdq_cb(struct mbox_client *cl,
> void *mssg)
> {
> struct cmdq_cb_data *data = mssg;
> struct cmdq_client *cmdq_cl = container_of(cl, struct
> cmdq_client, client);
> - struct mtk_drm_crtc *mtk_crtc = container_of(cmdq_cl, struct
> mtk_drm_crtc, cmdq_client);
> + struct mtk_crtc *mtk_crtc = container_of(cmdq_cl, struct
> mtk_crtc, cmdq_client);
> struct mtk_crtc_state *state;
> unsigned int i;
>
> @@ -344,7 +343,7 @@ static void ddp_cmdq_cb(struct mbox_client *cl,
> void *mssg)
> }
> #endif
>
> -static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc)
> +static int mtk_crtc_ddp_hw_init(struct mtk_crtc *mtk_crtc)
> {
> struct drm_crtc *crtc = &mtk_crtc->base;
> struct drm_connector *connector;
> @@ -444,7 +443,7 @@ static int mtk_crtc_ddp_hw_init(struct
> mtk_drm_crtc *mtk_crtc)
> return ret;
> }
>
> -static void mtk_crtc_ddp_hw_fini(struct mtk_drm_crtc *mtk_crtc)
> +static void mtk_crtc_ddp_hw_fini(struct mtk_crtc *mtk_crtc)
> {
> struct drm_device *drm = mtk_crtc->base.dev;
> struct drm_crtc *crtc = &mtk_crtc->base;
> @@ -489,7 +488,7 @@ static void mtk_crtc_ddp_hw_fini(struct
> mtk_drm_crtc *mtk_crtc)
> static void mtk_crtc_ddp_config(struct drm_crtc *crtc,
> struct cmdq_pkt *cmdq_handle)
> {
> - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
> + struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);
> struct mtk_crtc_state *state = to_mtk_crtc_state(mtk_crtc-
> >base.state);
> struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];
> unsigned int i;
> @@ -561,8 +560,7 @@ static void mtk_crtc_ddp_config(struct drm_crtc
> *crtc,
> }
> }
>
> -static void mtk_drm_crtc_update_config(struct mtk_drm_crtc
> *mtk_crtc,
> - bool needs_vblank)
> +static void mtk_crtc_update_config(struct mtk_crtc *mtk_crtc, bool
> needs_vblank)
> {
> #if IS_REACHABLE(CONFIG_MTK_CMDQ)
> struct cmdq_pkt *cmdq_handle = &mtk_crtc->cmdq_handle;
> @@ -634,7 +632,7 @@ static void mtk_drm_crtc_update_config(struct
> mtk_drm_crtc *mtk_crtc,
> static void mtk_crtc_ddp_irq(void *data)
> {
> struct drm_crtc *crtc = data;
> - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
> + struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);
> struct mtk_drm_private *priv = crtc->dev->dev_private;
>
> #if IS_REACHABLE(CONFIG_MTK_CMDQ)
> @@ -650,9 +648,9 @@ static void mtk_crtc_ddp_irq(void *data)
> mtk_drm_finish_page_flip(mtk_crtc);
> }
>
> -static int mtk_drm_crtc_enable_vblank(struct drm_crtc *crtc)
> +static int mtk_crtc_enable_vblank(struct drm_crtc *crtc)
> {
> - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
> + struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);
> struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];
>
> mtk_ddp_comp_enable_vblank(comp);
> @@ -660,22 +658,22 @@ static int mtk_drm_crtc_enable_vblank(struct
> drm_crtc *crtc)
> return 0;
> }
>
> -static void mtk_drm_crtc_disable_vblank(struct drm_crtc *crtc)
> +static void mtk_crtc_disable_vblank(struct drm_crtc *crtc)
> {
> - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
> + struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);
> struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];
>
> mtk_ddp_comp_disable_vblank(comp);
> }
>
> -static void mtk_drm_crtc_update_output(struct drm_crtc *crtc,
> - struct drm_atomic_state *state)
> +static void mtk_crtc_update_output(struct drm_crtc *crtc,
> + struct drm_atomic_state *state)
> {
> int crtc_index = drm_crtc_index(crtc);
> int i;
> struct device *dev;
> struct drm_crtc_state *crtc_state = state-
> >crtcs[crtc_index].new_state;
> - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
> + struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);
> struct mtk_drm_private *priv;
> unsigned int encoder_mask = crtc_state->encoder_mask;
>
> @@ -705,8 +703,8 @@ static void mtk_drm_crtc_update_output(struct
> drm_crtc *crtc,
> }
> }
>
> -int mtk_drm_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane
> *plane,
> - struct mtk_plane_state *state)
> +int mtk_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane
> *plane,
> + struct mtk_plane_state *state)
> {
> unsigned int local_layer;
> struct mtk_ddp_comp *comp;
> @@ -717,21 +715,21 @@ int mtk_drm_crtc_plane_check(struct drm_crtc
> *crtc, struct drm_plane *plane,
> return 0;
> }
>
> -void mtk_drm_crtc_async_update(struct drm_crtc *crtc, struct
> drm_plane *plane,
> - struct drm_atomic_state *state)
> +void mtk_crtc_async_update(struct drm_crtc *crtc, struct drm_plane
> *plane,
> + struct drm_atomic_state *state)
> {
> - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
> + struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);
>
> if (!mtk_crtc->enabled)
> return;
>
> - mtk_drm_crtc_update_config(mtk_crtc, false);
> + mtk_crtc_update_config(mtk_crtc, false);
> }
>
> -static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,
> - struct drm_atomic_state *state)
> +static void mtk_crtc_atomic_enable(struct drm_crtc *crtc,
> + struct drm_atomic_state *state)
> {
> - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
> + struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);
> struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];
> int ret;
>
> @@ -743,7 +741,7 @@ static void mtk_drm_crtc_atomic_enable(struct
> drm_crtc *crtc,
> return;
> }
>
> - mtk_drm_crtc_update_output(crtc, state);
> + mtk_crtc_update_output(crtc, state);
>
> ret = mtk_crtc_ddp_hw_init(mtk_crtc);
> if (ret) {
> @@ -755,10 +753,10 @@ static void mtk_drm_crtc_atomic_enable(struct
> drm_crtc *crtc,
> mtk_crtc->enabled = true;
> }
>
> -static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc,
> - struct drm_atomic_state *state)
> +static void mtk_crtc_atomic_disable(struct drm_crtc *crtc,
> + struct drm_atomic_state *state)
> {
> - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
> + struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);
> struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];
> int i;
>
> @@ -777,7 +775,7 @@ static void mtk_drm_crtc_atomic_disable(struct
> drm_crtc *crtc,
> }
> mtk_crtc->pending_planes = true;
>
> - mtk_drm_crtc_update_config(mtk_crtc, false);
> + mtk_crtc_update_config(mtk_crtc, false);
> #if IS_REACHABLE(CONFIG_MTK_CMDQ)
> /* Wait for planes to be disabled by cmdq */
> if (mtk_crtc->cmdq_client.chan)
> @@ -795,13 +793,13 @@ static void mtk_drm_crtc_atomic_disable(struct
> drm_crtc *crtc,
> mtk_crtc->enabled = false;
> }
>
> -static void mtk_drm_crtc_atomic_begin(struct drm_crtc *crtc,
> - struct drm_atomic_state *state)
> +static void mtk_crtc_atomic_begin(struct drm_crtc *crtc,
> + struct drm_atomic_state *state)
> {
> struct drm_crtc_state *crtc_state =
> drm_atomic_get_new_crtc_state(state,
>
> crtc);
> struct mtk_crtc_state *mtk_crtc_state =
> to_mtk_crtc_state(crtc_state);
> - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
> + struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);
> unsigned long flags;
>
> if (mtk_crtc->event && mtk_crtc_state->base.event)
> @@ -819,10 +817,10 @@ static void mtk_drm_crtc_atomic_begin(struct
> drm_crtc *crtc,
> }
> }
>
> -static void mtk_drm_crtc_atomic_flush(struct drm_crtc *crtc,
> - struct drm_atomic_state *state)
> +static void mtk_crtc_atomic_flush(struct drm_crtc *crtc,
> + struct drm_atomic_state *state)
> {
> - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
> + struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);
> int i;
>
> if (crtc->state->color_mgmt_changed)
> @@ -830,33 +828,32 @@ static void mtk_drm_crtc_atomic_flush(struct
> drm_crtc *crtc,
> mtk_ddp_gamma_set(mtk_crtc->ddp_comp[i], crtc-
> >state);
> mtk_ddp_ctm_set(mtk_crtc->ddp_comp[i], crtc-
> >state);
> }
> - mtk_drm_crtc_update_config(mtk_crtc, !!mtk_crtc->event);
> + mtk_crtc_update_config(mtk_crtc, !!mtk_crtc->event);
> }
>
> static const struct drm_crtc_funcs mtk_crtc_funcs = {
> .set_config = drm_atomic_helper_set_config,
> .page_flip = drm_atomic_helper_page_flip,
> - .destroy = mtk_drm_crtc_destroy,
> - .reset = mtk_drm_crtc_reset,
> - .atomic_duplicate_state = mtk_drm_crtc_duplicate_state,
> - .atomic_destroy_state = mtk_drm_crtc_destroy_state,
> - .enable_vblank = mtk_drm_crtc_enable_vblank,
> - .disable_vblank = mtk_drm_crtc_disable_vblank,
> + .destroy = mtk_crtc_destroy,
> + .reset = mtk_crtc_reset,
> + .atomic_duplicate_state = mtk_crtc_duplicate_state,
> + .atomic_destroy_state = mtk_crtc_destroy_state,
> + .enable_vblank = mtk_crtc_enable_vblank,
> + .disable_vblank = mtk_crtc_disable_vblank,
> };
>
> static const struct drm_crtc_helper_funcs mtk_crtc_helper_funcs = {
> - .mode_fixup = mtk_drm_crtc_mode_fixup,
> - .mode_set_nofb = mtk_drm_crtc_mode_set_nofb,
> - .mode_valid = mtk_drm_crtc_mode_valid,
> - .atomic_begin = mtk_drm_crtc_atomic_begin,
> - .atomic_flush = mtk_drm_crtc_atomic_flush,
> - .atomic_enable = mtk_drm_crtc_atomic_enable,
> - .atomic_disable = mtk_drm_crtc_atomic_disable,
> + .mode_fixup = mtk_crtc_mode_fixup,
> + .mode_set_nofb = mtk_crtc_mode_set_nofb,
> + .mode_valid = mtk_crtc_mode_valid,
> + .atomic_begin = mtk_crtc_atomic_begin,
> + .atomic_flush = mtk_crtc_atomic_flush,
> + .atomic_enable = mtk_crtc_atomic_enable,
> + .atomic_disable = mtk_crtc_atomic_disable,
> };
>
> -static int mtk_drm_crtc_init(struct drm_device *drm,
> - struct mtk_drm_crtc *mtk_crtc,
> - unsigned int pipe)
> +static int mtk_crtc_init(struct drm_device *drm, struct mtk_crtc
> *mtk_crtc,
> + unsigned int pipe)
> {
> struct drm_plane *primary = NULL;
> struct drm_plane *cursor = NULL;
> @@ -883,8 +880,7 @@ static int mtk_drm_crtc_init(struct drm_device
> *drm,
> return ret;
> }
>
> -static int mtk_drm_crtc_num_comp_planes(struct mtk_drm_crtc
> *mtk_crtc,
> - int comp_idx)
> +static int mtk_crtc_num_comp_planes(struct mtk_crtc *mtk_crtc, int
> comp_idx)
> {
> struct mtk_ddp_comp *comp;
>
> @@ -902,8 +898,8 @@ static int mtk_drm_crtc_num_comp_planes(struct
> mtk_drm_crtc *mtk_crtc,
> }
>
> static inline
> -enum drm_plane_type mtk_drm_crtc_plane_type(unsigned int plane_idx,
> - unsigned int num_planes)
> +enum drm_plane_type mtk_crtc_plane_type(unsigned int plane_idx,
> + unsigned int num_planes)
> {
> if (plane_idx == 0)
> return DRM_PLANE_TYPE_PRIMARY;
> @@ -914,11 +910,11 @@ enum drm_plane_type
> mtk_drm_crtc_plane_type(unsigned int plane_idx,
>
> }
>
> -static int mtk_drm_crtc_init_comp_planes(struct drm_device *drm_dev,
> - struct mtk_drm_crtc *mtk_crtc,
> - int comp_idx, int pipe)
> +static int mtk_crtc_init_comp_planes(struct drm_device *drm_dev,
> + struct mtk_crtc *mtk_crtc,
> + int comp_idx, int pipe)
> {
> - int num_planes = mtk_drm_crtc_num_comp_planes(mtk_crtc,
> comp_idx);
> + int num_planes = mtk_crtc_num_comp_planes(mtk_crtc, comp_idx);
> struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[comp_idx];
> int i, ret;
>
> @@ -926,8 +922,7 @@ static int mtk_drm_crtc_init_comp_planes(struct
> drm_device *drm_dev,
> ret = mtk_plane_init(drm_dev,
> &mtk_crtc->planes[mtk_crtc->layer_nr],
> BIT(pipe),
> - mtk_drm_crtc_plane_type(mtk_crtc-
> >layer_nr,
> - num_planes),
> + mtk_crtc_plane_type(mtk_crtc->layer_nr,
> num_planes),
> mtk_ddp_comp_supported_rotations(comp),
> mtk_ddp_comp_get_formats(comp),
> mtk_ddp_comp_get_num_formats(comp));
> @@ -939,9 +934,9 @@ static int mtk_drm_crtc_init_comp_planes(struct
> drm_device *drm_dev,
> return 0;
> }
>
> -struct device *mtk_drm_crtc_dma_dev_get(struct drm_crtc *crtc)
> +struct device *mtk_crtc_dma_dev_get(struct drm_crtc *crtc)
> {
> - struct mtk_drm_crtc *mtk_crtc = NULL;
> + struct mtk_crtc *mtk_crtc = NULL;
>
> if (!crtc)
> return NULL;
> @@ -953,14 +948,14 @@ struct device *mtk_drm_crtc_dma_dev_get(struct
> drm_crtc *crtc)
> return mtk_crtc->dma_dev;
> }
>
> -int mtk_drm_crtc_create(struct drm_device *drm_dev,
> - const unsigned int *path, unsigned int
> path_len,
> - int priv_data_index, const struct mtk_drm_route
> *conn_routes,
> - unsigned int num_conn_routes)
> +int mtk_crtc_create(struct drm_device *drm_dev, const unsigned int
> *path,
> + unsigned int path_len, int priv_data_index,
> + const struct mtk_drm_route *conn_routes,
> + unsigned int num_conn_routes)
> {
> struct mtk_drm_private *priv = drm_dev->dev_private;
> struct device *dev = drm_dev->dev;
> - struct mtk_drm_crtc *mtk_crtc;
> + struct mtk_crtc *mtk_crtc;
> unsigned int num_comp_planes = 0;
> int ret;
> int i;
> @@ -1045,7 +1040,7 @@ int mtk_drm_crtc_create(struct drm_device
> *drm_dev,
> }
>
> for (i = 0; i < mtk_crtc->ddp_comp_nr; i++)
> - num_comp_planes +=
> mtk_drm_crtc_num_comp_planes(mtk_crtc, i);
> + num_comp_planes += mtk_crtc_num_comp_planes(mtk_crtc,
> i);
>
> mtk_crtc->planes = devm_kcalloc(dev, num_comp_planes,
> sizeof(struct drm_plane),
> GFP_KERNEL);
> @@ -1053,8 +1048,7 @@ int mtk_drm_crtc_create(struct drm_device
> *drm_dev,
> return -ENOMEM;
>
> for (i = 0; i < mtk_crtc->ddp_comp_nr; i++) {
> - ret = mtk_drm_crtc_init_comp_planes(drm_dev, mtk_crtc,
> i,
> - crtc_i);
> + ret = mtk_crtc_init_comp_planes(drm_dev, mtk_crtc, i,
> crtc_i);
> if (ret)
> return ret;
> }
> @@ -1066,7 +1060,7 @@ int mtk_drm_crtc_create(struct drm_device
> *drm_dev,
> */
> mtk_crtc->dma_dev = mtk_ddp_comp_dma_dev_get(&priv-
> >ddp_comp[path[0]]);
>
> - ret = mtk_drm_crtc_init(drm_dev, mtk_crtc, crtc_i);
> + ret = mtk_crtc_init(drm_dev, mtk_crtc, crtc_i);
> if (ret < 0)
> return ret;
>
> @@ -1136,7 +1130,7 @@ int mtk_drm_crtc_create(struct drm_device
> *drm_dev,
> mtk_crtc->num_conn_routes = num_conn_routes;
> mtk_crtc->conn_routes = conn_routes;
>
> - /* increase ddp_comp_nr at the end of
> mtk_drm_crtc_create */
> + /* increase ddp_comp_nr at the end of mtk_crtc_create
> */
> mtk_crtc->ddp_comp_nr++;
> }
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
> b/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
> index 1f988ff1bf9f..f081c54a349b 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
> @@ -3,8 +3,8 @@
> * Copyright (c) 2015 MediaTek Inc.
> */
>
> -#ifndef MTK_DRM_CRTC_H
> -#define MTK_DRM_CRTC_H
> +#ifndef MTK_CRTC_H
> +#define MTK_CRTC_H
>
> #include <drm/drm_crtc.h>
> #include "mtk_drm_ddp_comp.h"
> @@ -14,17 +14,17 @@
> #define MTK_MAX_BPC 10
> #define MTK_MIN_BPC 3
>
> -void mtk_drm_crtc_commit(struct drm_crtc *crtc);
> -int mtk_drm_crtc_create(struct drm_device *drm_dev,
> - const unsigned int *path,
> - unsigned int path_len,
> - int priv_data_index,
> - const struct mtk_drm_route *conn_routes,
> - unsigned int num_conn_routes);
> -int mtk_drm_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane
> *plane,
> - struct mtk_plane_state *state);
> -void mtk_drm_crtc_async_update(struct drm_crtc *crtc, struct
> drm_plane *plane,
> - struct drm_atomic_state *plane_state);
> -struct device *mtk_drm_crtc_dma_dev_get(struct drm_crtc *crtc);
> +void mtk_crtc_commit(struct drm_crtc *crtc);
> +int mtk_crtc_create(struct drm_device *drm_dev,
> + const unsigned int *path,
> + unsigned int path_len,
> + int priv_data_index,
> + const struct mtk_drm_route *conn_routes,
> + unsigned int num_conn_routes);
> +int mtk_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane
> *plane,
> + struct mtk_plane_state *state);
> +void mtk_crtc_async_update(struct drm_crtc *crtc, struct drm_plane
> *plane,
> + struct drm_atomic_state *plane_state);
> +struct device *mtk_crtc_dma_dev_get(struct drm_crtc *crtc);
>
> -#endif /* MTK_DRM_CRTC_H */
> +#endif /* MTK_CRTC_H */
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> index 74832c213092..c46773569b3c 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> @@ -494,24 +494,24 @@ static int mtk_drm_kms_init(struct drm_device
> *drm)
> priv_n = private->all_drm_private[j];
>
> if (i == CRTC_MAIN && priv_n->data->main_len) {
> - ret = mtk_drm_crtc_create(drm, priv_n-
> >data->main_path,
> - priv_n->data-
> >main_len, j,
> - priv_n->data-
> >conn_routes,
> - priv_n->data-
> >num_conn_routes);
> + ret = mtk_crtc_create(drm, priv_n-
> >data->main_path,
> + priv_n->data-
> >main_len, j,
> + priv_n->data-
> >conn_routes,
> + priv_n->data-
> >num_conn_routes);
> if (ret)
> goto err_component_unbind;
>
> continue;
> } else if (i == CRTC_EXT && priv_n->data-
> >ext_len) {
> - ret = mtk_drm_crtc_create(drm, priv_n-
> >data->ext_path,
> - priv_n->data-
> >ext_len, j, NULL, 0);
> + ret = mtk_crtc_create(drm, priv_n-
> >data->ext_path,
> + priv_n->data-
> >ext_len, j, NULL, 0);
> if (ret)
> goto err_component_unbind;
>
> continue;
> } else if (i == CRTC_THIRD && priv_n->data-
> >third_len) {
> - ret = mtk_drm_crtc_create(drm, priv_n-
> >data->third_path,
> - priv_n->data-
> >third_len, j, NULL, 0);
> + ret = mtk_crtc_create(drm, priv_n-
> >data->third_path,
> + priv_n->data-
> >third_len, j, NULL, 0);
> if (ret)
> goto err_component_unbind;
>
> @@ -523,7 +523,7 @@ static int mtk_drm_kms_init(struct drm_device
> *drm)
> /* Use OVL device for all DMA memory allocations */
> crtc = drm_crtc_from_index(drm, 0);
> if (crtc)
> - dma_dev = mtk_drm_crtc_dma_dev_get(crtc);
> + dma_dev = mtk_crtc_dma_dev_get(crtc);
> if (!dma_dev) {
> ret = -ENODEV;
> dev_err(drm->dev, "Need at least one OVL device\n");
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h
> b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
> index 33fadb08dc1c..24c4d59085bd 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
> @@ -13,7 +13,7 @@
> #define DDP_COMPONENT_DRM_OVL_ADAPTOR (DDP_COMPONENT_ID_MAX + 1)
> #define DDP_COMPONENT_DRM_ID_MAX (DDP_COMPONENT_DRM_OVL_ADAPTOR + 1)
>
> -enum mtk_drm_crtc_path {
> +enum mtk_crtc_path {
> CRTC_MAIN,
> CRTC_EXT,
> CRTC_THIRD,
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> index ddc9355b06d5..cbdb70677d30 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> @@ -117,8 +117,8 @@ static int mtk_plane_atomic_async_check(struct
> drm_plane *plane,
> if (!plane->state->fb)
> return -EINVAL;
>
> - ret = mtk_drm_crtc_plane_check(new_plane_state->crtc, plane,
> - to_mtk_plane_state(new_plane_sta
> te));
> + ret = mtk_crtc_plane_check(new_plane_state->crtc, plane,
> + to_mtk_plane_state(new_plane_state))
> ;
> if (ret)
> return ret;
>
> @@ -232,7 +232,7 @@ static void mtk_plane_atomic_async_update(struct
> drm_plane *plane,
> swap(plane->state->fb, new_state->fb);
> wmb(); /* Make sure the above parameters are set before update
> */
> new_plane_state->pending.async_dirty = true;
> - mtk_drm_crtc_async_update(new_state->crtc, plane, state);
> + mtk_crtc_async_update(new_state->crtc, plane, state);
> }
>
> static const struct drm_plane_funcs mtk_plane_funcs = {
> @@ -260,8 +260,8 @@ static int mtk_plane_atomic_check(struct
> drm_plane *plane,
> if (WARN_ON(!new_plane_state->crtc))
> return 0;
>
> - ret = mtk_drm_crtc_plane_check(new_plane_state->crtc, plane,
> - to_mtk_plane_state(new_plane_sta
> te));
> + ret = mtk_crtc_plane_check(new_plane_state->crtc, plane,
> + to_mtk_plane_state(new_plane_state))
> ;
> if (ret)
> return ret;
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c
> b/drivers/gpu/drm/mediatek/mtk_dsi.c
> index 9501f4019199..ec9d96396d7b 100644
> --- a/drivers/gpu/drm/mediatek/mtk_dsi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
> @@ -662,7 +662,7 @@ static void mtk_dsi_poweroff(struct mtk_dsi *dsi)
>
> /*
> * mtk_dsi_stop() and mtk_dsi_start() is asymmetric, since
> - * mtk_dsi_stop() should be called after
> mtk_drm_crtc_atomic_disable(),
> + * mtk_dsi_stop() should be called after
> mtk_crtc_atomic_disable(),
> * which needs irq for vblank, and mtk_dsi_stop() will disable
> irq.
> * mtk_dsi_start() needs to be called in
> mtk_output_dsi_enable(),
> * after dsi is fully set.
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 02/11] drm/mediatek: Rename "mtk_drm_ddp_comp" to "mtk_ddp_comp"
2024-02-26 8:50 ` [PATCH 02/11] drm/mediatek: Rename "mtk_drm_ddp_comp" to "mtk_ddp_comp" Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
@ 2024-03-14 5:14 ` CK Hu (胡俊光)
1 sibling, 0 replies; 36+ messages in thread
From: CK Hu (胡俊光) @ 2024-03-14 5:14 UTC (permalink / raw)
To: Shawn Sung (宋孝謙),
chunkuang.hu, angelogioacchino.delregno
Cc: sumit.semwal, linux-mediatek, linux-kernel, linaro-mm-sig,
christian.koenig, linux-media, daniel, p.zabel, dri-devel,
shawn.sung, airlied, linux-arm-kernel, matthias.bgg
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 all "mtk_drm_ddp_comp" to "mtk_ddp_comp":
> - To align the naming rule
> - To reduce the code size
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/mtk_drm_crtc.c | 16 +++++++---------
> drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 6 +++---
> 2 files changed, 10 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> index fe965ad7d282..d8b591aff3c2 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> @@ -276,9 +276,9 @@ static void mtk_crtc_ddp_clk_disable(struct
> mtk_crtc *mtk_crtc)
> }
>
> static
> -struct mtk_ddp_comp *mtk_drm_ddp_comp_for_plane(struct drm_crtc
> *crtc,
> - struct drm_plane
> *plane,
> - unsigned int
> *local_layer)
> +struct mtk_ddp_comp *mtk_ddp_comp_for_plane(struct drm_crtc *crtc,
> + struct drm_plane *plane,
> + unsigned int *local_layer)
> {
> struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);
> struct mtk_ddp_comp *comp;
> @@ -428,7 +428,7 @@ static int mtk_crtc_ddp_hw_init(struct mtk_crtc
> *mtk_crtc)
>
> /* should not enable layer before crtc enabled */
> plane_state->pending.enable = false;
> - comp = mtk_drm_ddp_comp_for_plane(crtc, plane,
> &local_layer);
> + comp = mtk_ddp_comp_for_plane(crtc, plane,
> &local_layer);
> if (comp)
> mtk_ddp_comp_layer_config(comp, local_layer,
> plane_state, NULL);
> @@ -519,8 +519,7 @@ static void mtk_crtc_ddp_config(struct drm_crtc
> *crtc,
> if (!plane_state->pending.config)
> continue;
>
> - comp = mtk_drm_ddp_comp_for_plane(crtc, plane,
> - &local_layer)
> ;
> + comp = mtk_ddp_comp_for_plane(crtc, plane,
> &local_layer);
>
> if (comp)
> mtk_ddp_comp_layer_config(comp,
> local_layer,
> @@ -544,8 +543,7 @@ static void mtk_crtc_ddp_config(struct drm_crtc
> *crtc,
> if (!plane_state->pending.async_config)
> continue;
>
> - comp = mtk_drm_ddp_comp_for_plane(crtc, plane,
> - &local_layer)
> ;
> + comp = mtk_ddp_comp_for_plane(crtc, plane,
> &local_layer);
>
> if (comp)
> mtk_ddp_comp_layer_config(comp,
> local_layer,
> @@ -709,7 +707,7 @@ int mtk_crtc_plane_check(struct drm_crtc *crtc,
> struct drm_plane *plane,
> unsigned int local_layer;
> struct mtk_ddp_comp *comp;
>
> - comp = mtk_drm_ddp_comp_for_plane(crtc, plane, &local_layer);
> + comp = mtk_ddp_comp_for_plane(crtc, plane, &local_layer);
> if (comp)
> return mtk_ddp_comp_layer_check(comp, local_layer,
> state);
> return 0;
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> index 93d79a1366e9..ba985206fdd2 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> @@ -3,8 +3,8 @@
> * Copyright (c) 2015 MediaTek Inc.
> */
>
> -#ifndef MTK_DRM_DDP_COMP_H
> -#define MTK_DRM_DDP_COMP_H
> +#ifndef MTK_DDP_COMP_H
> +#define MTK_DDP_COMP_H
>
> #include <linux/io.h>
> #include <linux/pm_runtime.h>
> @@ -340,4 +340,4 @@ void mtk_ddp_write_relaxed(struct cmdq_pkt
> *cmdq_pkt, unsigned int value,
> void mtk_ddp_write_mask(struct cmdq_pkt *cmdq_pkt, unsigned int
> value,
> struct cmdq_client_reg *cmdq_reg, void __iomem
> *regs,
> unsigned int offset, unsigned int mask);
> -#endif /* MTK_DRM_DDP_COMP_H */
> +#endif /* MTK_DDP_COMP_H */
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 03/11] drm/mediatek: Rename "mtk_drm_plane" to "mtk_plane"
2024-02-26 8:50 ` [PATCH 03/11] drm/mediatek: Rename "mtk_drm_plane" to "mtk_plane" Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
@ 2024-03-14 5:20 ` CK Hu (胡俊光)
1 sibling, 0 replies; 36+ messages in thread
From: CK Hu (胡俊光) @ 2024-03-14 5:20 UTC (permalink / raw)
To: Shawn Sung (宋孝謙),
chunkuang.hu, angelogioacchino.delregno
Cc: sumit.semwal, linux-mediatek, linux-kernel, linaro-mm-sig,
christian.koenig, linux-media, daniel, p.zabel, dri-devel,
shawn.sung, airlied, linux-arm-kernel, matthias.bgg
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 all "mtk_drm_plane" to "mtk_plane":
> - To align the naming rule
> - To reduce the code size
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/mtk_drm_plane.c | 6 +++---
> drivers/gpu/drm/mediatek/mtk_drm_plane.h | 4 ++--
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> index cbdb70677d30..43137c46fc14 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> @@ -93,8 +93,8 @@ static bool mtk_plane_format_mod_supported(struct
> drm_plane *plane,
> return true;
> }
>
> -static void mtk_drm_plane_destroy_state(struct drm_plane *plane,
> - struct drm_plane_state *state)
> +static void mtk_plane_destroy_state(struct drm_plane *plane,
> + struct drm_plane_state *state)
> {
> __drm_atomic_helper_plane_destroy_state(state);
> kfree(to_mtk_plane_state(state));
> @@ -241,7 +241,7 @@ static const struct drm_plane_funcs
> mtk_plane_funcs = {
> .destroy = drm_plane_cleanup,
> .reset = mtk_plane_reset,
> .atomic_duplicate_state = mtk_plane_duplicate_state,
> - .atomic_destroy_state = mtk_drm_plane_destroy_state,
> + .atomic_destroy_state = mtk_plane_destroy_state,
> .format_mod_supported = mtk_plane_format_mod_supported,
> };
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.h
> b/drivers/gpu/drm/mediatek/mtk_drm_plane.h
> index 99aff7da0831..231bb7aac947 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.h
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.h
> @@ -4,8 +4,8 @@
> * Author: CK Hu <ck.hu@mediatek.com>
> */
>
> -#ifndef _MTK_DRM_PLANE_H_
> -#define _MTK_DRM_PLANE_H_
> +#ifndef _MTK_PLANE_H_
> +#define _MTK_PLANE_H_
>
> #include <drm/drm_crtc.h>
> #include <linux/types.h>
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 04/11] drm/mediatek: Rename "mtk_drm_gem" to "mtk_gem"
2024-02-26 8:50 ` [PATCH 04/11] drm/mediatek: Rename "mtk_drm_gem" to "mtk_gem" Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
@ 2024-03-14 5:49 ` CK Hu (胡俊光)
1 sibling, 0 replies; 36+ messages in thread
From: CK Hu (胡俊光) @ 2024-03-14 5:49 UTC (permalink / raw)
To: Shawn Sung (宋孝謙),
chunkuang.hu, angelogioacchino.delregno
Cc: sumit.semwal, linux-mediatek, linux-kernel, linaro-mm-sig,
christian.koenig, linux-media, daniel, p.zabel, dri-devel,
shawn.sung, airlied, linux-arm-kernel, matthias.bgg
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 all "mtk_drm_gem" to "mtk_gem":
> - To align the naming rule
> - To reduce the code size
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/mtk_drm_drv.c | 8 +--
> drivers/gpu/drm/mediatek/mtk_drm_gem.c | 63 ++++++++++++--------
> ----
> drivers/gpu/drm/mediatek/mtk_drm_gem.h | 19 ++++---
> drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 +-
> 4 files changed, 45 insertions(+), 47 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> index c46773569b3c..81e8aa65abd6 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> @@ -576,8 +576,8 @@ DEFINE_DRM_GEM_FOPS(mtk_drm_fops);
> * We need to override this because the device used to import the
> memory is
> * not dev->dev, as drm_gem_prime_import() expects.
> */
> -static struct drm_gem_object *mtk_drm_gem_prime_import(struct
> drm_device *dev,
> - struct dma_buf
> *dma_buf)
> +static struct drm_gem_object *mtk_gem_prime_import(struct drm_device
> *dev,
> + struct dma_buf
> *dma_buf)
> {
> struct mtk_drm_private *private = dev->dev_private;
>
> @@ -587,9 +587,9 @@ static struct drm_gem_object
> *mtk_drm_gem_prime_import(struct drm_device *dev,
> static const struct drm_driver mtk_drm_driver = {
> .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,
>
> - .dumb_create = mtk_drm_gem_dumb_create,
> + .dumb_create = mtk_gem_dumb_create,
>
> - .gem_prime_import = mtk_drm_gem_prime_import,
> + .gem_prime_import = mtk_gem_prime_import,
> .gem_prime_import_sg_table = mtk_gem_prime_import_sg_table,
> .fops = &mtk_drm_fops,
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c
> b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
> index 4f2e3feabc0f..3ae1f12bfb46 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_gem.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
> @@ -14,26 +14,26 @@
> #include "mtk_drm_drv.h"
> #include "mtk_drm_gem.h"
>
> -static int mtk_drm_gem_object_mmap(struct drm_gem_object *obj,
> struct vm_area_struct *vma);
> +static int mtk_gem_object_mmap(struct drm_gem_object *obj, struct
> vm_area_struct *vma);
>
> static const struct vm_operations_struct vm_ops = {
> .open = drm_gem_vm_open,
> .close = drm_gem_vm_close,
> };
>
> -static const struct drm_gem_object_funcs mtk_drm_gem_object_funcs =
> {
> - .free = mtk_drm_gem_free_object,
> +static const struct drm_gem_object_funcs mtk_gem_object_funcs = {
> + .free = mtk_gem_free_object,
> .get_sg_table = mtk_gem_prime_get_sg_table,
> - .vmap = mtk_drm_gem_prime_vmap,
> - .vunmap = mtk_drm_gem_prime_vunmap,
> - .mmap = mtk_drm_gem_object_mmap,
> + .vmap = mtk_gem_prime_vmap,
> + .vunmap = mtk_gem_prime_vunmap,
> + .mmap = mtk_gem_object_mmap,
> .vm_ops = &vm_ops,
> };
>
> -static struct mtk_drm_gem_obj *mtk_drm_gem_init(struct drm_device
> *dev,
> - unsigned long size)
> +static struct mtk_gem_obj *mtk_gem_init(struct drm_device *dev,
> + unsigned long size)
> {
> - struct mtk_drm_gem_obj *mtk_gem_obj;
> + struct mtk_gem_obj *mtk_gem_obj;
> int ret;
>
> size = round_up(size, PAGE_SIZE);
> @@ -42,7 +42,7 @@ static struct mtk_drm_gem_obj
> *mtk_drm_gem_init(struct drm_device *dev,
> if (!mtk_gem_obj)
> return ERR_PTR(-ENOMEM);
>
> - mtk_gem_obj->base.funcs = &mtk_drm_gem_object_funcs;
> + mtk_gem_obj->base.funcs = &mtk_gem_object_funcs;
>
> ret = drm_gem_object_init(dev, &mtk_gem_obj->base, size);
> if (ret < 0) {
> @@ -54,15 +54,15 @@ static struct mtk_drm_gem_obj
> *mtk_drm_gem_init(struct drm_device *dev,
> return mtk_gem_obj;
> }
>
> -struct mtk_drm_gem_obj *mtk_drm_gem_create(struct drm_device *dev,
> - size_t size, bool
> alloc_kmap)
> +struct mtk_gem_obj *mtk_gem_create(struct drm_device *dev, size_t
> size,
> + bool alloc_kmap)
> {
> struct mtk_drm_private *priv = dev->dev_private;
> - struct mtk_drm_gem_obj *mtk_gem;
> + struct mtk_gem_obj *mtk_gem;
> struct drm_gem_object *obj;
> int ret;
>
> - mtk_gem = mtk_drm_gem_init(dev, size);
> + mtk_gem = mtk_gem_init(dev, size);
> if (IS_ERR(mtk_gem))
> return ERR_CAST(mtk_gem);
>
> @@ -97,9 +97,9 @@ struct mtk_drm_gem_obj *mtk_drm_gem_create(struct
> drm_device *dev,
> return ERR_PTR(ret);
> }
>
> -void mtk_drm_gem_free_object(struct drm_gem_object *obj)
> +void mtk_gem_free_object(struct drm_gem_object *obj)
> {
> - struct mtk_drm_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
> + struct mtk_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
> struct mtk_drm_private *priv = obj->dev->dev_private;
>
> if (mtk_gem->sg)
> @@ -114,10 +114,10 @@ void mtk_drm_gem_free_object(struct
> drm_gem_object *obj)
> kfree(mtk_gem);
> }
>
> -int mtk_drm_gem_dumb_create(struct drm_file *file_priv, struct
> drm_device *dev,
> - struct drm_mode_create_dumb *args)
> +int mtk_gem_dumb_create(struct drm_file *file_priv, struct
> drm_device *dev,
> + struct drm_mode_create_dumb *args)
> {
> - struct mtk_drm_gem_obj *mtk_gem;
> + struct mtk_gem_obj *mtk_gem;
> int ret;
>
> args->pitch = DIV_ROUND_UP(args->width * args->bpp, 8);
> @@ -130,7 +130,7 @@ int mtk_drm_gem_dumb_create(struct drm_file
> *file_priv, struct drm_device *dev,
> args->size = args->pitch;
> args->size *= args->height;
>
> - mtk_gem = mtk_drm_gem_create(dev, args->size, false);
> + mtk_gem = mtk_gem_create(dev, args->size, false);
> if (IS_ERR(mtk_gem))
> return PTR_ERR(mtk_gem);
>
> @@ -148,16 +148,16 @@ int mtk_drm_gem_dumb_create(struct drm_file
> *file_priv, struct drm_device *dev,
> return 0;
>
> err_handle_create:
> - mtk_drm_gem_free_object(&mtk_gem->base);
> + mtk_gem_free_object(&mtk_gem->base);
> return ret;
> }
>
> -static int mtk_drm_gem_object_mmap(struct drm_gem_object *obj,
> - struct vm_area_struct *vma)
> +static int mtk_gem_object_mmap(struct drm_gem_object *obj,
> + struct vm_area_struct *vma)
>
> {
> int ret;
> - struct mtk_drm_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
> + struct mtk_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
> struct mtk_drm_private *priv = obj->dev->dev_private;
>
> /*
> @@ -188,7 +188,7 @@ static int mtk_drm_gem_object_mmap(struct
> drm_gem_object *obj,
> */
> struct sg_table *mtk_gem_prime_get_sg_table(struct drm_gem_object
> *obj)
> {
> - struct mtk_drm_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
> + struct mtk_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
> struct mtk_drm_private *priv = obj->dev->dev_private;
> struct sg_table *sgt;
> int ret;
> @@ -212,7 +212,7 @@ struct sg_table
> *mtk_gem_prime_get_sg_table(struct drm_gem_object *obj)
> struct drm_gem_object *mtk_gem_prime_import_sg_table(struct
> drm_device *dev,
> struct dma_buf_attachment *attach, struct
> sg_table *sg)
> {
> - struct mtk_drm_gem_obj *mtk_gem;
> + struct mtk_gem_obj *mtk_gem;
>
> /* check if the entries in the sg_table are contiguous */
> if (drm_prime_get_contiguous_size(sg) < attach->dmabuf->size) {
> @@ -220,7 +220,7 @@ struct drm_gem_object
> *mtk_gem_prime_import_sg_table(struct drm_device *dev,
> return ERR_PTR(-EINVAL);
> }
>
> - mtk_gem = mtk_drm_gem_init(dev, attach->dmabuf->size);
> + mtk_gem = mtk_gem_init(dev, attach->dmabuf->size);
> if (IS_ERR(mtk_gem))
> return ERR_CAST(mtk_gem);
>
> @@ -230,9 +230,9 @@ struct drm_gem_object
> *mtk_gem_prime_import_sg_table(struct drm_device *dev,
> return &mtk_gem->base;
> }
>
> -int mtk_drm_gem_prime_vmap(struct drm_gem_object *obj, struct
> iosys_map *map)
> +int mtk_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map
> *map)
> {
> - struct mtk_drm_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
> + struct mtk_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
> struct sg_table *sgt = NULL;
> unsigned int npages;
>
> @@ -270,10 +270,9 @@ int mtk_drm_gem_prime_vmap(struct drm_gem_object
> *obj, struct iosys_map *map)
> return 0;
> }
>
> -void mtk_drm_gem_prime_vunmap(struct drm_gem_object *obj,
> - struct iosys_map *map)
> +void mtk_gem_prime_vunmap(struct drm_gem_object *obj, struct
> iosys_map *map)
> {
> - struct mtk_drm_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
> + struct mtk_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
> void *vaddr = map->vaddr;
>
> if (!mtk_gem->pages)
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.h
> b/drivers/gpu/drm/mediatek/mtk_drm_gem.h
> index 78f23b07a02e..8a5a760f5e6d 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_gem.h
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.h
> @@ -22,7 +22,7 @@
> * P.S. this object would be transferred to user as kms_bo.handle so
> * user can access the buffer through kms_bo.handle.
> */
> -struct mtk_drm_gem_obj {
> +struct mtk_gem_obj {
> struct drm_gem_object base;
> void *cookie;
> void *kvaddr;
> @@ -32,18 +32,17 @@ struct mtk_drm_gem_obj {
> struct page **pages;
> };
>
> -#define to_mtk_gem_obj(x) container_of(x, struct mtk_drm_gem_obj,
> base)
> +#define to_mtk_gem_obj(x) container_of(x, struct mtk_gem_obj, base)
>
> -void mtk_drm_gem_free_object(struct drm_gem_object *gem);
> -struct mtk_drm_gem_obj *mtk_drm_gem_create(struct drm_device *dev,
> size_t size,
> - bool alloc_kmap);
> -int mtk_drm_gem_dumb_create(struct drm_file *file_priv, struct
> drm_device *dev,
> - struct drm_mode_create_dumb *args);
> +void mtk_gem_free_object(struct drm_gem_object *gem);
> +struct mtk_gem_obj *mtk_gem_create(struct drm_device *dev, size_t
> size,
> + bool alloc_kmap);
> +int mtk_gem_dumb_create(struct drm_file *file_priv, struct
> drm_device *dev,
> + struct drm_mode_create_dumb *args);
> struct sg_table *mtk_gem_prime_get_sg_table(struct drm_gem_object
> *obj);
> struct drm_gem_object *mtk_gem_prime_import_sg_table(struct
> drm_device *dev,
> struct dma_buf_attachment *attach, struct
> sg_table *sg);
> -int mtk_drm_gem_prime_vmap(struct drm_gem_object *obj, struct
> iosys_map *map);
> -void mtk_drm_gem_prime_vunmap(struct drm_gem_object *obj,
> - struct iosys_map *map);
> +int mtk_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map
> *map);
> +void mtk_gem_prime_vunmap(struct drm_gem_object *obj, struct
> iosys_map *map);
>
> #endif
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> index 43137c46fc14..db63a32c407e 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> @@ -135,7 +135,7 @@ static void mtk_plane_update_new_state(struct
> drm_plane_state *new_state,
> {
> struct drm_framebuffer *fb = new_state->fb;
> struct drm_gem_object *gem;
> - struct mtk_drm_gem_obj *mtk_gem;
> + struct mtk_gem_obj *mtk_gem;
> unsigned int pitch, format;
> u64 modifier;
> dma_addr_t addr;
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 05/11] drm/mediatek: Rename "mtk_drm_hdmi" to "mtk_hdmi"
2024-02-26 8:50 ` [PATCH 05/11] drm/mediatek: Rename "mtk_drm_hdmi" to "mtk_hdmi" Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
@ 2024-03-14 6:24 ` CK Hu (胡俊光)
1 sibling, 0 replies; 36+ messages in thread
From: CK Hu (胡俊光) @ 2024-03-14 6:24 UTC (permalink / raw)
To: Shawn Sung (宋孝謙),
chunkuang.hu, angelogioacchino.delregno
Cc: sumit.semwal, linux-mediatek, linux-kernel, linaro-mm-sig,
christian.koenig, linux-media, daniel, p.zabel, dri-devel,
shawn.sung, airlied, linux-arm-kernel, matthias.bgg
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 all "mtk_drm_hdmi" to "mtk_hdmi":
> - To align the naming rule
> - To reduce the code size
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/mtk_hdmi.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c
> b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> index 86133bf16326..d2876da1b43a 100644
> --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> @@ -1687,7 +1687,7 @@ static int
> mtk_hdmi_register_audio_driver(struct device *dev)
> return 0;
> }
>
> -static int mtk_drm_hdmi_probe(struct platform_device *pdev)
> +static int mtk_hdmi_probe(struct platform_device *pdev)
> {
> struct mtk_hdmi *hdmi;
> struct device *dev = &pdev->dev;
> @@ -1746,7 +1746,7 @@ static int mtk_drm_hdmi_probe(struct
> platform_device *pdev)
> return ret;
> }
>
> -static void mtk_drm_hdmi_remove(struct platform_device *pdev)
> +static void mtk_hdmi_remove(struct platform_device *pdev)
> {
> struct mtk_hdmi *hdmi = platform_get_drvdata(pdev);
>
> @@ -1790,7 +1790,7 @@ static const struct mtk_hdmi_conf
> mtk_hdmi_conf_mt8167 = {
> .cea_modes_only = true,
> };
>
> -static const struct of_device_id mtk_drm_hdmi_of_ids[] = {
> +static const struct of_device_id mtk_hdmi_of_ids[] = {
> { .compatible = "mediatek,mt2701-hdmi",
> .data = &mtk_hdmi_conf_mt2701,
> },
> @@ -1801,14 +1801,14 @@ static const struct of_device_id
> mtk_drm_hdmi_of_ids[] = {
> },
> {}
> };
> -MODULE_DEVICE_TABLE(of, mtk_drm_hdmi_of_ids);
> +MODULE_DEVICE_TABLE(of, mtk_hdmi_of_ids);
>
> static struct platform_driver mtk_hdmi_driver = {
> - .probe = mtk_drm_hdmi_probe,
> - .remove_new = mtk_drm_hdmi_remove,
> + .probe = mtk_hdmi_probe,
> + .remove_new = mtk_hdmi_remove,
> .driver = {
> .name = "mediatek-drm-hdmi",
> - .of_match_table = mtk_drm_hdmi_of_ids,
> + .of_match_table = mtk_hdmi_of_ids,
> .pm = &mtk_hdmi_pm_ops,
> },
> };
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 06/11] drm/mediatek: Rename files "mtk_drm_crtc.*" to "mtk_crtc.*"
2024-02-26 8:50 ` [PATCH 06/11] drm/mediatek: Rename files "mtk_drm_crtc.*" to "mtk_crtc.*" Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
@ 2024-03-14 6:40 ` CK Hu (胡俊光)
2024-03-14 6:50 ` CK Hu (胡俊光)
1 sibling, 1 reply; 36+ messages in thread
From: CK Hu (胡俊光) @ 2024-03-14 6:40 UTC (permalink / raw)
To: Shawn Sung (宋孝謙),
chunkuang.hu, angelogioacchino.delregno
Cc: sumit.semwal, linux-mediatek, linux-kernel, linaro-mm-sig,
christian.koenig, linux-media, daniel, p.zabel, dri-devel,
shawn.sung, airlied, linux-arm-kernel, matthias.bgg
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
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 06/11] drm/mediatek: Rename files "mtk_drm_crtc.*" to "mtk_crtc.*"
2024-03-14 6:40 ` CK Hu (胡俊光)
@ 2024-03-14 6:50 ` CK Hu (胡俊光)
0 siblings, 0 replies; 36+ messages in thread
From: CK Hu (胡俊光) @ 2024-03-14 6:50 UTC (permalink / raw)
To: Shawn Sung (宋孝謙),
chunkuang.hu, angelogioacchino.delregno
Cc: sumit.semwal, linux-mediatek, linux-kernel, linaro-mm-sig,
christian.koenig, linux-media, daniel, p.zabel, dri-devel,
shawn.sung, airlied, linux-arm-kernel, matthias.bgg
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
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 07/11] drm/mediatek: Rename files "mtk_drm_ddp_comp.*" to "mtk_ddp_comp.*"
2024-02-26 8:50 ` [PATCH 07/11] drm/mediatek: Rename files "mtk_drm_ddp_comp.*" to "mtk_ddp_comp.*" Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
@ 2024-03-14 6:54 ` CK Hu (胡俊光)
1 sibling, 0 replies; 36+ messages in thread
From: CK Hu (胡俊光) @ 2024-03-14 6:54 UTC (permalink / raw)
To: Shawn Sung (宋孝謙),
chunkuang.hu, angelogioacchino.delregno
Cc: sumit.semwal, linux-mediatek, linux-kernel, linaro-mm-sig,
christian.koenig, linux-media, daniel, p.zabel, dri-devel,
shawn.sung, airlied, linux-arm-kernel, matthias.bgg
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_ddp_comp.* to mtk_ddp_comp.*.
>
> Signed-off-by: Hsiao Chien Sung <
> shawn.sung@mediatek.corp-partner.google.com>
> ---
> 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)
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 08/11] drm/mediatek: Rename files "mtk_drm_plane.*" to "mtk_plane.*"
2024-02-26 8:50 ` [PATCH 08/11] drm/mediatek: Rename files "mtk_drm_plane.*" to "mtk_plane.*" Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
@ 2024-03-14 6:57 ` CK Hu (胡俊光)
1 sibling, 0 replies; 36+ messages in thread
From: CK Hu (胡俊光) @ 2024-03-14 6:57 UTC (permalink / raw)
To: Shawn Sung (宋孝謙),
chunkuang.hu, angelogioacchino.delregno
Cc: sumit.semwal, linux-mediatek, linux-kernel, linaro-mm-sig,
christian.koenig, linux-media, daniel, p.zabel, dri-devel,
shawn.sung, airlied, linux-arm-kernel, matthias.bgg
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_plane.* to mtk_plane.*.
>
> Signed-off-by: Hsiao Chien Sung <
> shawn.sung@mediatek.corp-partner.google.com>
> ---
> 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
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 09/11] drm/mediatek: Rename files "mtk_drm_gem.*" to "mtk_gem.*"
2024-02-26 8:50 ` [PATCH 09/11] drm/mediatek: Rename files "mtk_drm_gem.*" to "mtk_gem.*" Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
@ 2024-03-14 7:03 ` CK Hu (胡俊光)
1 sibling, 0 replies; 36+ messages in thread
From: CK Hu (胡俊光) @ 2024-03-14 7:03 UTC (permalink / raw)
To: Shawn Sung (宋孝謙),
chunkuang.hu, angelogioacchino.delregno
Cc: sumit.semwal, linux-mediatek, linux-kernel, linaro-mm-sig,
christian.koenig, linux-media, daniel, p.zabel, dri-devel,
shawn.sung, airlied, linux-arm-kernel, matthias.bgg
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_gem.* to mtk_gem.*.
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_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[] = {
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 10/11] drm/mediatek: Rename mtk_ddp_comp functions
2024-02-26 8:50 ` [PATCH 10/11] drm/mediatek: Rename mtk_ddp_comp functions Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
@ 2024-03-14 7:09 ` CK Hu (胡俊光)
1 sibling, 0 replies; 36+ messages in thread
From: CK Hu (胡俊光) @ 2024-03-14 7:09 UTC (permalink / raw)
To: Shawn Sung (宋孝謙),
chunkuang.hu, angelogioacchino.delregno
Cc: sumit.semwal, linux-mediatek, linux-kernel, linaro-mm-sig,
christian.koenig, linux-media, daniel, p.zabel, dri-devel,
shawn.sung, airlied, linux-arm-kernel, matthias.bgg
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 functions of mtk_ddp_comp:
> - To align the naming rule
> - To reduce the code size
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/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);
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 11/11] drm/mediatek: Rename "pending_needs_vblank" to "needs_vblank"
2024-02-26 8:50 ` [PATCH 11/11] drm/mediatek: Rename "pending_needs_vblank" to "needs_vblank" Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
@ 2024-03-14 7:26 ` CK Hu (胡俊光)
1 sibling, 0 replies; 36+ messages in thread
From: CK Hu (胡俊光) @ 2024-03-14 7:26 UTC (permalink / raw)
To: Shawn Sung (宋孝謙),
chunkuang.hu, angelogioacchino.delregno
Cc: sumit.semwal, linux-mediatek, linux-kernel, linaro-mm-sig,
christian.koenig, linux-media, daniel, p.zabel, dri-devel,
shawn.sung, airlied, linux-arm-kernel, matthias.bgg
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 "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 <
> shawn.sung@mediatek.corp-partner.google.com>
> ---
> 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];
^ permalink raw reply [flat|nested] 36+ messages in thread
end of thread, other threads:[~2024-03-14 7:26 UTC | newest]
Thread overview: 36+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-26 8:50 [PATCH 00/11] Rename mtk_drm_* to mtk_* Shawn Sung
2024-02-26 8:50 ` [PATCH 01/11] drm/mediatek: Rename "mtk_drm_crtc" to "mtk_crtc" Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 3:26 ` CK Hu (胡俊光)
2024-02-26 8:50 ` [PATCH 02/11] drm/mediatek: Rename "mtk_drm_ddp_comp" to "mtk_ddp_comp" Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 5:14 ` CK Hu (胡俊光)
2024-02-26 8:50 ` [PATCH 03/11] drm/mediatek: Rename "mtk_drm_plane" to "mtk_plane" Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 5:20 ` CK Hu (胡俊光)
2024-02-26 8:50 ` [PATCH 04/11] drm/mediatek: Rename "mtk_drm_gem" to "mtk_gem" Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 5:49 ` CK Hu (胡俊光)
2024-02-26 8:50 ` [PATCH 05/11] drm/mediatek: Rename "mtk_drm_hdmi" to "mtk_hdmi" Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 6:24 ` CK Hu (胡俊光)
2024-02-26 8:50 ` [PATCH 06/11] drm/mediatek: Rename files "mtk_drm_crtc.*" to "mtk_crtc.*" Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 6:40 ` CK Hu (胡俊光)
2024-03-14 6:50 ` CK Hu (胡俊光)
2024-02-26 8:50 ` [PATCH 07/11] drm/mediatek: Rename files "mtk_drm_ddp_comp.*" to "mtk_ddp_comp.*" Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 6:54 ` CK Hu (胡俊光)
2024-02-26 8:50 ` [PATCH 08/11] drm/mediatek: Rename files "mtk_drm_plane.*" to "mtk_plane.*" Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 6:57 ` CK Hu (胡俊光)
2024-02-26 8:50 ` [PATCH 09/11] drm/mediatek: Rename files "mtk_drm_gem.*" to "mtk_gem.*" Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 7:03 ` CK Hu (胡俊光)
2024-02-26 8:50 ` [PATCH 10/11] drm/mediatek: Rename mtk_ddp_comp functions Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-03-14 7:09 ` CK Hu (胡俊光)
2024-02-26 8:50 ` [PATCH 11/11] drm/mediatek: Rename "pending_needs_vblank" to "needs_vblank" Shawn Sung
2024-02-26 12:39 ` AngeloGioacchino Del Regno
2024-02-29 2:35 ` Shawn Sung (宋孝謙)
2024-03-14 7:26 ` CK Hu (胡俊光)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).