From nobody Fri Sep 20 01:45:04 2024 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BC3366026D; Mon, 26 Feb 2024 08:51:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=60.244.123.138 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708937475; cv=none; b=JQgr8q5skIdjVCT53sV4Y6bM5L7MjQGY9P/PkGZsZTAxPFJDF+l2tjC1yaHgCk1BoJjUziR6SNvklfvmQiWzGhxE4WyoAIY65Ui9xX68SFvC+GqnsdAL/n3XP2emkKgim+ZfFJZMb8mKWbEFZ5gE+pFjaNNnjPO2oIncuopFJ/Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708937475; c=relaxed/simple; bh=qlVJ8u6JLif8CErN7sOgOPBt9hdbfNqDVJ5Bujflquw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=trqksakSbW9UMMrpnmigV2ykvIjL/ewTEodjGsSe+AMeZxVFVTWZzjSHZ6n6Jk7oWubDbGUIKE75VXDMm9MBMrqR/CA3aUdfrexCk0Hkl9DTGuRvNmQ46vkSwUpAbANw0ZlPhfzvYo597qp0fEm903PMx0Yxzzhd+W6obnYsWQM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com; spf=pass smtp.mailfrom=mediatek.com; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b=DIomUh37; arc=none smtp.client-ip=60.244.123.138 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mediatek.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="DIomUh37" X-UUID: 2b75eb48d48411eea528b71b88a53856-20240226 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=1xTBEXgSpR8f101d3I4eV9J2CDGV9EnLLAfyXxKFPBA=; b=DIomUh371C+tLxlpZfa2cltA+Y50W9mbuvmu6ilFVVEFn1TGuNgf1Kmt7SO9UO63d1RFdp3WTiq+6qFI5x0qb6jiRUa7E0QR57pHq+S+FyFse/mFetpSZPi8aaz/TEvv/jcA7k9EpunUwZWCkn2i3AxdYL5KzfwKcbc89hTmFvo=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.37,REQID:eaf79d91-55bc-4f75-a77d-246948d1c994,IP:0,U RL:0,TC:0,Content:-5,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:-5 X-CID-META: VersionHash:6f543d0,CLOUDID:ab5137ff-c16b-4159-a099-3b9d0558e447,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:11|1,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES :1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR,TF_CID_SPAM_ULN X-UUID: 2b75eb48d48411eea528b71b88a53856-20240226 Received: from mtkmbs13n1.mediatek.inc [(172.21.101.193)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 266623898; Mon, 26 Feb 2024 16:51:02 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Mon, 26 Feb 2024 16:51:00 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Mon, 26 Feb 2024 16:51:00 +0800 From: Shawn Sung To: Chun-Kuang Hu , AngeloGioacchino Del Regno CC: Philipp Zabel , David Airlie , Daniel Vetter , Matthias Brugger , Sumit Semwal , =?UTF-8?q?Christian=20K=C3=B6nig?= , , , , , , , Hsiao Chien Sung Subject: [PATCH 01/11] drm/mediatek: Rename "mtk_drm_crtc" to "mtk_crtc" Date: Mon, 26 Feb 2024 16:50:49 +0800 Message-ID: <20240226085059.26850-2-shawn.sung@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20240226085059.26850-1-shawn.sung@mediatek.com> References: <20240226085059.26850-1-shawn.sung@mediatek.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-AS-Result: No-10--9.645700-8.000000 X-TMASE-MatchedRID: kd4/YO93/464pD9RIlWSGjl/LoO+pjoA1cuIRwt/4Mg+gR+s21UkWHbd ZY3kvmGS2NayXdUm5pA08pEC5ylFugEzlKcqjzGcDB+ErBr0bAOeEP0DdJruliz+5QCTrE/sLPJ tWpbJjY1REm0mMKgDMfysq7G56wdACXZ8FQwqLpjhuXUWQoMQt3+vzHfC29pfCqIJhrrDy28jR1 d95AuwIdAEh8EGu472nsfYXRqKUm4pDniSMR+7Fe7KTDtx8CggROshHNu2/QZXPwnnY5XL5MRLB g/IHlC9sDSpqyZY4zRe0K97gy9AwkrS3KX0u454upDIC9422DrzH4mwI5WqKd9MUoGRBUKyw/8t rk0/Um/JYpIm++1OgB5pG1lPrPh8WU/fB/XFmJwZXJLztZviXCQwGQSJ46NmYmQk5BUIinCNw4Z 8DB8UoC+jiVKs4ML8fN6VWMfYE1+8U6c9s1viyeE86+k9uTZHfS0Ip2eEHnz3IzXlXlpamPoLR4 +zsDTtw38dXReMtXfrEJed9b79cNBUWKSP7bQNKr/8/1t9ioXRuGUJdeOlVVZca9RSYo/b X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--9.645700-8.000000 X-TMASE-Version: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-SNTS-SMTP: 8A1102E5457DCEC2B706EE2944A5C0CE485AA51D6C3FE9C9E0E135F9936A8D882000:8 X-MTK: N Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Hsiao Chien Sung 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 Reviewed-by: AngeloGiaocchino Del Regno Reviewed-by: CK Hu --- 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/medi= atek/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" =20 /* - * 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 descriptio= ns. */ -struct mtk_drm_crtc { +struct mtk_crtc { struct drm_crtc base; bool enabled; =20 @@ -80,9 +80,9 @@ struct mtk_crtc_state { unsigned int pending_vrefresh; }; =20 -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); } =20 static inline struct mtk_crtc_state *to_mtk_crtc_state(struct drm_crtc_sta= te *s) @@ -90,7 +90,7 @@ static inline struct mtk_crtc_state *to_mtk_crtc_state(st= ruct drm_crtc_state *s) return container_of(s, struct mtk_crtc_state, base); } =20 -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 =3D &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); } =20 -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 =3D false; } } @@ -149,9 +149,9 @@ static void mtk_drm_cmdq_pkt_destroy(struct cmdq_pkt *p= kt) } #endif =20 -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 =3D to_mtk_crtc(crtc); + struct mtk_crtc *mtk_crtc =3D to_mtk_crtc(crtc); int i; =20 mtk_mutex_put(mtk_crtc->mutex); @@ -174,7 +174,7 @@ static void mtk_drm_crtc_destroy(struct drm_crtc *crtc) drm_crtc_cleanup(crtc); } =20 -static void mtk_drm_crtc_reset(struct drm_crtc *crtc) +static void mtk_crtc_reset(struct drm_crtc *crtc) { struct mtk_crtc_state *state; =20 @@ -189,7 +189,7 @@ static void mtk_drm_crtc_reset(struct drm_crtc *crtc) __drm_atomic_helper_crtc_reset(crtc, &state->base); } =20 -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 *cr= tc) { struct mtk_crtc_state *state; =20 @@ -206,18 +206,17 @@ static struct drm_crtc_state *mtk_drm_crtc_duplicate_= state(struct drm_crtc *crtc return &state->base; } =20 -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)); } =20 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 =3D to_mtk_crtc(crtc); + struct mtk_crtc *mtk_crtc =3D to_mtk_crtc(crtc); enum drm_mode_status status =3D MODE_OK; int i; =20 @@ -229,15 +228,15 @@ mtk_drm_crtc_mode_valid(struct drm_crtc *crtc, return status; } =20 -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; } =20 -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 =3D to_mtk_crtc_state(crtc->state); =20 @@ -248,7 +247,7 @@ static void mtk_drm_crtc_mode_set_nofb(struct drm_crtc = *crtc) state->pending_config =3D true; } =20 -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; } =20 -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; =20 @@ -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 =3D to_mtk_crtc(crtc); + struct mtk_crtc *mtk_crtc =3D to_mtk_crtc(crtc); struct mtk_ddp_comp *comp; int i, count =3D 0; unsigned int local_index =3D plane - mtk_crtc->planes; @@ -304,7 +303,7 @@ static void ddp_cmdq_cb(struct mbox_client *cl, void *m= ssg) { struct cmdq_cb_data *data =3D mssg; struct cmdq_client *cmdq_cl =3D container_of(cl, struct cmdq_client, clie= nt); - struct mtk_drm_crtc *mtk_crtc =3D container_of(cmdq_cl, struct mtk_drm_cr= tc, cmdq_client); + struct mtk_crtc *mtk_crtc =3D container_of(cmdq_cl, struct mtk_crtc, cmdq= _client); struct mtk_crtc_state *state; unsigned int i; =20 @@ -344,7 +343,7 @@ static void ddp_cmdq_cb(struct mbox_client *cl, void *m= ssg) } #endif =20 -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 =3D &mtk_crtc->base; struct drm_connector *connector; @@ -444,7 +443,7 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mt= k_crtc) return ret; } =20 -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 =3D mtk_crtc->base.dev; struct drm_crtc *crtc =3D &mtk_crtc->base; @@ -489,7 +488,7 @@ static void mtk_crtc_ddp_hw_fini(struct mtk_drm_crtc *m= tk_crtc) static void mtk_crtc_ddp_config(struct drm_crtc *crtc, struct cmdq_pkt *cmdq_handle) { - struct mtk_drm_crtc *mtk_crtc =3D to_mtk_crtc(crtc); + struct mtk_crtc *mtk_crtc =3D to_mtk_crtc(crtc); struct mtk_crtc_state *state =3D to_mtk_crtc_state(mtk_crtc->base.state); struct mtk_ddp_comp *comp =3D mtk_crtc->ddp_comp[0]; unsigned int i; @@ -561,8 +560,7 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc, } } =20 -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_v= blank) { #if IS_REACHABLE(CONFIG_MTK_CMDQ) struct cmdq_pkt *cmdq_handle =3D &mtk_crtc->cmdq_handle; @@ -634,7 +632,7 @@ static void mtk_drm_crtc_update_config(struct mtk_drm_c= rtc *mtk_crtc, static void mtk_crtc_ddp_irq(void *data) { struct drm_crtc *crtc =3D data; - struct mtk_drm_crtc *mtk_crtc =3D to_mtk_crtc(crtc); + struct mtk_crtc *mtk_crtc =3D to_mtk_crtc(crtc); struct mtk_drm_private *priv =3D crtc->dev->dev_private; =20 #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); } =20 -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 =3D to_mtk_crtc(crtc); + struct mtk_crtc *mtk_crtc =3D to_mtk_crtc(crtc); struct mtk_ddp_comp *comp =3D mtk_crtc->ddp_comp[0]; =20 mtk_ddp_comp_enable_vblank(comp); @@ -660,22 +658,22 @@ static int mtk_drm_crtc_enable_vblank(struct drm_crtc= *crtc) return 0; } =20 -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 =3D to_mtk_crtc(crtc); + struct mtk_crtc *mtk_crtc =3D to_mtk_crtc(crtc); struct mtk_ddp_comp *comp =3D mtk_crtc->ddp_comp[0]; =20 mtk_ddp_comp_disable_vblank(comp); } =20 -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 =3D drm_crtc_index(crtc); int i; struct device *dev; struct drm_crtc_state *crtc_state =3D state->crtcs[crtc_index].new_state; - struct mtk_drm_crtc *mtk_crtc =3D to_mtk_crtc(crtc); + struct mtk_crtc *mtk_crtc =3D to_mtk_crtc(crtc); struct mtk_drm_private *priv; unsigned int encoder_mask =3D crtc_state->encoder_mask; =20 @@ -705,8 +703,8 @@ static void mtk_drm_crtc_update_output(struct drm_crtc = *crtc, } } =20 -int mtk_drm_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane *plan= e, - 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, s= truct drm_plane *plane, return 0; } =20 -void mtk_drm_crtc_async_update(struct drm_crtc *crtc, struct drm_plane *pl= ane, - 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 =3D to_mtk_crtc(crtc); + struct mtk_crtc *mtk_crtc =3D to_mtk_crtc(crtc); =20 if (!mtk_crtc->enabled) return; =20 - mtk_drm_crtc_update_config(mtk_crtc, false); + mtk_crtc_update_config(mtk_crtc, false); } =20 -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 =3D to_mtk_crtc(crtc); + struct mtk_crtc *mtk_crtc =3D to_mtk_crtc(crtc); struct mtk_ddp_comp *comp =3D mtk_crtc->ddp_comp[0]; int ret; =20 @@ -743,7 +741,7 @@ static void mtk_drm_crtc_atomic_enable(struct drm_crtc = *crtc, return; } =20 - mtk_drm_crtc_update_output(crtc, state); + mtk_crtc_update_output(crtc, state); =20 ret =3D mtk_crtc_ddp_hw_init(mtk_crtc); if (ret) { @@ -755,10 +753,10 @@ static void mtk_drm_crtc_atomic_enable(struct drm_crt= c *crtc, mtk_crtc->enabled =3D true; } =20 -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 =3D to_mtk_crtc(crtc); + struct mtk_crtc *mtk_crtc =3D to_mtk_crtc(crtc); struct mtk_ddp_comp *comp =3D mtk_crtc->ddp_comp[0]; int i; =20 @@ -777,7 +775,7 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc= *crtc, } mtk_crtc->pending_planes =3D true; =20 - 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_cr= tc *crtc, mtk_crtc->enabled =3D false; } =20 -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 =3D drm_atomic_get_new_crtc_state(state, crtc); struct mtk_crtc_state *mtk_crtc_state =3D to_mtk_crtc_state(crtc_state); - struct mtk_drm_crtc *mtk_crtc =3D to_mtk_crtc(crtc); + struct mtk_crtc *mtk_crtc =3D to_mtk_crtc(crtc); unsigned long flags; =20 if (mtk_crtc->event && mtk_crtc_state->base.event) @@ -819,10 +817,10 @@ static void mtk_drm_crtc_atomic_begin(struct drm_crtc= *crtc, } } =20 -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 =3D to_mtk_crtc(crtc); + struct mtk_crtc *mtk_crtc =3D to_mtk_crtc(crtc); int i; =20 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); } =20 static const struct drm_crtc_funcs mtk_crtc_funcs =3D { .set_config =3D drm_atomic_helper_set_config, .page_flip =3D drm_atomic_helper_page_flip, - .destroy =3D mtk_drm_crtc_destroy, - .reset =3D mtk_drm_crtc_reset, - .atomic_duplicate_state =3D mtk_drm_crtc_duplicate_state, - .atomic_destroy_state =3D mtk_drm_crtc_destroy_state, - .enable_vblank =3D mtk_drm_crtc_enable_vblank, - .disable_vblank =3D mtk_drm_crtc_disable_vblank, + .destroy =3D mtk_crtc_destroy, + .reset =3D mtk_crtc_reset, + .atomic_duplicate_state =3D mtk_crtc_duplicate_state, + .atomic_destroy_state =3D mtk_crtc_destroy_state, + .enable_vblank =3D mtk_crtc_enable_vblank, + .disable_vblank =3D mtk_crtc_disable_vblank, }; =20 static const struct drm_crtc_helper_funcs mtk_crtc_helper_funcs =3D { - .mode_fixup =3D mtk_drm_crtc_mode_fixup, - .mode_set_nofb =3D mtk_drm_crtc_mode_set_nofb, - .mode_valid =3D mtk_drm_crtc_mode_valid, - .atomic_begin =3D mtk_drm_crtc_atomic_begin, - .atomic_flush =3D mtk_drm_crtc_atomic_flush, - .atomic_enable =3D mtk_drm_crtc_atomic_enable, - .atomic_disable =3D mtk_drm_crtc_atomic_disable, + .mode_fixup =3D mtk_crtc_mode_fixup, + .mode_set_nofb =3D mtk_crtc_mode_set_nofb, + .mode_valid =3D mtk_crtc_mode_valid, + .atomic_begin =3D mtk_crtc_atomic_begin, + .atomic_flush =3D mtk_crtc_atomic_flush, + .atomic_enable =3D mtk_crtc_atomic_enable, + .atomic_disable =3D mtk_crtc_atomic_disable, }; =20 -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 =3D NULL; struct drm_plane *cursor =3D NULL; @@ -883,8 +880,7 @@ static int mtk_drm_crtc_init(struct drm_device *drm, return ret; } =20 -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_id= x) { struct mtk_ddp_comp *comp; =20 @@ -902,8 +898,8 @@ static int mtk_drm_crtc_num_comp_planes(struct mtk_drm_= crtc *mtk_crtc, } =20 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 =3D=3D 0) return DRM_PLANE_TYPE_PRIMARY; @@ -914,11 +910,11 @@ enum drm_plane_type mtk_drm_crtc_plane_type(unsigned = int plane_idx, =20 } =20 -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 =3D mtk_drm_crtc_num_comp_planes(mtk_crtc, comp_idx); + int num_planes =3D mtk_crtc_num_comp_planes(mtk_crtc, comp_idx); struct mtk_ddp_comp *comp =3D mtk_crtc->ddp_comp[comp_idx]; int i, ret; =20 @@ -926,8 +922,7 @@ static int mtk_drm_crtc_init_comp_planes(struct drm_dev= ice *drm_dev, ret =3D 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_dev= ice *drm_dev, return 0; } =20 -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 =3D NULL; + struct mtk_crtc *mtk_crtc =3D NULL; =20 if (!crtc) return NULL; @@ -953,14 +948,14 @@ struct device *mtk_drm_crtc_dma_dev_get(struct drm_cr= tc *crtc) return mtk_crtc->dma_dev; } =20 -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 =3D drm_dev->dev_private; struct device *dev =3D drm_dev->dev; - struct mtk_drm_crtc *mtk_crtc; + struct mtk_crtc *mtk_crtc; unsigned int num_comp_planes =3D 0; int ret; int i; @@ -1045,7 +1040,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev, } =20 for (i =3D 0; i < mtk_crtc->ddp_comp_nr; i++) - num_comp_planes +=3D mtk_drm_crtc_num_comp_planes(mtk_crtc, i); + num_comp_planes +=3D mtk_crtc_num_comp_planes(mtk_crtc, i); =20 mtk_crtc->planes =3D 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; =20 for (i =3D 0; i < mtk_crtc->ddp_comp_nr; i++) { - ret =3D mtk_drm_crtc_init_comp_planes(drm_dev, mtk_crtc, i, - crtc_i); + ret =3D 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 =3D mtk_ddp_comp_dma_dev_get(&priv->ddp_comp[path[0]]); =20 - ret =3D mtk_drm_crtc_init(drm_dev, mtk_crtc, crtc_i); + ret =3D mtk_crtc_init(drm_dev, mtk_crtc, crtc_i); if (ret < 0) return ret; =20 @@ -1136,7 +1130,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev, mtk_crtc->num_conn_routes =3D num_conn_routes; mtk_crtc->conn_routes =3D conn_routes; =20 - /* 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++; } =20 diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h b/drivers/gpu/drm/medi= atek/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. */ =20 -#ifndef MTK_DRM_CRTC_H -#define MTK_DRM_CRTC_H +#ifndef MTK_CRTC_H +#define MTK_CRTC_H =20 #include #include "mtk_drm_ddp_comp.h" @@ -14,17 +14,17 @@ #define MTK_MAX_BPC 10 #define MTK_MIN_BPC 3 =20 -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 *plan= e, - struct mtk_plane_state *state); -void mtk_drm_crtc_async_update(struct drm_crtc *crtc, struct drm_plane *pl= ane, - 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); =20 -#endif /* MTK_DRM_CRTC_H */ +#endif /* MTK_CRTC_H */ diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/media= tek/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 =3D private->all_drm_private[j]; =20 if (i =3D=3D CRTC_MAIN && priv_n->data->main_len) { - ret =3D 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 =3D 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; =20 continue; } else if (i =3D=3D CRTC_EXT && priv_n->data->ext_len) { - ret =3D mtk_drm_crtc_create(drm, priv_n->data->ext_path, - priv_n->data->ext_len, j, NULL, 0); + ret =3D mtk_crtc_create(drm, priv_n->data->ext_path, + priv_n->data->ext_len, j, NULL, 0); if (ret) goto err_component_unbind; =20 continue; } else if (i =3D=3D CRTC_THIRD && priv_n->data->third_len) { - ret =3D mtk_drm_crtc_create(drm, priv_n->data->third_path, - priv_n->data->third_len, j, NULL, 0); + ret =3D mtk_crtc_create(drm, priv_n->data->third_path, + priv_n->data->third_len, j, NULL, 0); if (ret) goto err_component_unbind; =20 @@ -523,7 +523,7 @@ static int mtk_drm_kms_init(struct drm_device *drm) /* Use OVL device for all DMA memory allocations */ crtc =3D drm_crtc_from_index(drm, 0); if (crtc) - dma_dev =3D mtk_drm_crtc_dma_dev_get(crtc); + dma_dev =3D mtk_crtc_dma_dev_get(crtc); if (!dma_dev) { ret =3D -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/media= tek/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) =20 -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/med= iatek/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_plan= e *plane, if (!plane->state->fb) return -EINVAL; =20 - ret =3D mtk_drm_crtc_plane_check(new_plane_state->crtc, plane, - to_mtk_plane_state(new_plane_state)); + ret =3D mtk_crtc_plane_check(new_plane_state->crtc, plane, + to_mtk_plane_state(new_plane_state)); if (ret) return ret; =20 @@ -232,7 +232,7 @@ static void mtk_plane_atomic_async_update(struct drm_pl= ane *plane, swap(plane->state->fb, new_state->fb); wmb(); /* Make sure the above parameters are set before update */ new_plane_state->pending.async_dirty =3D true; - mtk_drm_crtc_async_update(new_state->crtc, plane, state); + mtk_crtc_async_update(new_state->crtc, plane, state); } =20 static const struct drm_plane_funcs mtk_plane_funcs =3D { @@ -260,8 +260,8 @@ static int mtk_plane_atomic_check(struct drm_plane *pla= ne, if (WARN_ON(!new_plane_state->crtc)) return 0; =20 - ret =3D mtk_drm_crtc_plane_check(new_plane_state->crtc, plane, - to_mtk_plane_state(new_plane_state)); + ret =3D mtk_crtc_plane_check(new_plane_state->crtc, plane, + to_mtk_plane_state(new_plane_state)); if (ret) return ret; =20 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) =20 /* * 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. --=20 2.18.0 From nobody Fri Sep 20 01:45:04 2024 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9DD4C5FF18; Mon, 26 Feb 2024 08:51:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=60.244.123.138 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708937474; cv=none; b=ruE558U54IfTJ9WMxWY4eFY6CeDiGwZN0k6bydFhg3upW4nDjdI5CdH3w9mF1kEyzLQ1LZXR6dr48Ou3bGCfQWcbmdD0PfomI+2WxNjGhg0E4Unepw6M0Z2PEYjIRkOSDb/+RHSpNurLs9R1LKzDY3rciGYBDKXC9+BLpYE1wA0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708937474; c=relaxed/simple; bh=TtheW+wNmOGDDOK382JTYlJ1tWl0J1VZmtBUVUsR2+A=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=PjRqzFcQcFFzGRzP6H0FQ0dE9jm8DSTtE28QKlC1nYI8CmfAUuetCu46AY9nabM07ALTv8yVrV65aMbJqqG90M3/9/gQHz3B7sR/Q3VU5ZW71JlMO5Bov0rGQLGtYOVnZ4aXk3dwfpVjgfl2rJSWwDVS2C7tfOVxoYImQ2nJNkw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com; spf=pass smtp.mailfrom=mediatek.com; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b=iRUEbIRD; arc=none smtp.client-ip=60.244.123.138 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mediatek.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="iRUEbIRD" X-UUID: 2b4032dcd48411eea528b71b88a53856-20240226 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=ZaQO7uorjNJlvDyvjlmkRjy3fH91QvFpf5okxM8Rc94=; b=iRUEbIRD05JN4h0nsT/3k8YjyqFeYnMrMYWoH0qD87PegvsGzI676RlekAcMQGcVGLRspRh7T2uBWS1mGIfcLkCUK8sTvUKLJBWyp3TRZdpR0dDvfOZfPMTZ5KjUuuJ3FKKsDUOXt9hJwORxUoaXHiXngSxUnehdZI3WMHAHrJc=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.37,REQID:4b9dd808-9696-49fc-af8e-7fbd46d43d10,IP:0,U RL:0,TC:0,Content:-5,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:-5 X-CID-META: VersionHash:6f543d0,CLOUDID:fd62d280-4f93-4875-95e7-8c66ea833d57,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1, SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: 2b4032dcd48411eea528b71b88a53856-20240226 Received: from mtkmbs13n2.mediatek.inc [(172.21.101.108)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 159606280; Mon, 26 Feb 2024 16:51:02 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by mtkmbs11n2.mediatek.inc (172.21.101.187) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Mon, 26 Feb 2024 16:51:00 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Mon, 26 Feb 2024 16:51:00 +0800 From: Shawn Sung To: Chun-Kuang Hu , AngeloGioacchino Del Regno CC: Philipp Zabel , David Airlie , Daniel Vetter , Matthias Brugger , Sumit Semwal , =?UTF-8?q?Christian=20K=C3=B6nig?= , , , , , , , Hsiao Chien Sung Subject: [PATCH 02/11] drm/mediatek: Rename "mtk_drm_ddp_comp" to "mtk_ddp_comp" Date: Mon, 26 Feb 2024 16:50:50 +0800 Message-ID: <20240226085059.26850-3-shawn.sung@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20240226085059.26850-1-shawn.sung@mediatek.com> References: <20240226085059.26850-1-shawn.sung@mediatek.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MTK: N Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Hsiao Chien Sung 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 Reviewed-by: AngeloGiaocchino Del Regno Reviewed-by: CK Hu --- 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/medi= atek/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 *m= tk_crtc) } =20 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 =3D to_mtk_crtc(crtc); struct mtk_ddp_comp *comp; @@ -428,7 +428,7 @@ static int mtk_crtc_ddp_hw_init(struct mtk_crtc *mtk_cr= tc) =20 /* should not enable layer before crtc enabled */ plane_state->pending.enable =3D false; - comp =3D mtk_drm_ddp_comp_for_plane(crtc, plane, &local_layer); + comp =3D 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; =20 - comp =3D mtk_drm_ddp_comp_for_plane(crtc, plane, - &local_layer); + comp =3D mtk_ddp_comp_for_plane(crtc, plane, &local_layer); =20 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; =20 - comp =3D mtk_drm_ddp_comp_for_plane(crtc, plane, - &local_layer); + comp =3D mtk_ddp_comp_for_plane(crtc, plane, &local_layer); =20 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; =20 - comp =3D mtk_drm_ddp_comp_for_plane(crtc, plane, &local_layer); + comp =3D 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. */ =20 -#ifndef MTK_DRM_DDP_COMP_H -#define MTK_DRM_DDP_COMP_H +#ifndef MTK_DDP_COMP_H +#define MTK_DDP_COMP_H =20 #include #include @@ -340,4 +340,4 @@ void mtk_ddp_write_relaxed(struct cmdq_pkt *cmdq_pkt, u= nsigned 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 */ --=20 2.18.0 From nobody Fri Sep 20 01:45:04 2024 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 61C4B6026F; Mon, 26 Feb 2024 08:51:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.61.82.184 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708937475; cv=none; b=d7nueEYbaEtKphKBTm+ztYqJdUgCfnpOw53LRB51MQe6WLGWjDr8bRwiCc/NZbR9PBgdB7EwdtYMTXJ0oaB+aV8z6TXEZQXJbivW32Qu93QVJn/Bj6lkJr9L0ywDPhItTDdmipiyiSmRLGqiZqZtAvoGQakLC8BLWybA9/HmBKk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708937475; c=relaxed/simple; bh=qmCnikV9Ac95nT9a+ZeWwFZq924Py7zqiMq/shG1NCg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=mGNtKyLAGd61POjnVcqgibfw71lUUUfcKfqa4geAAYY+NmqLxwo4cKDFRdMkq6hnov/rbhTa7RbZe5ZTPUsXGOAlhOo9ail/GsY5Yj4lOQMDE0yPDOf3AQ6PY5/0dpoFjMfamAQ0RYXRPo0MkPkcO3BjI/MWTWLpnDICv0AnGzw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com; spf=pass smtp.mailfrom=mediatek.com; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b=NhVahdQO; arc=none smtp.client-ip=210.61.82.184 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mediatek.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="NhVahdQO" X-UUID: 2b7459ccd48411eea4ad694c3f9da370-20240226 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=0a2yQ3VluUMW3p2sCIDS/3+d6/bnA7zvic6sqXPj6QU=; b=NhVahdQOZZ3UYAqu/rbkmVIZXPseDC+hvzru7sh+tpd0VSTkD/owwbLAxfd2dv/e2AB4bcpqh5wz9R4RvOYTtn8p3mbNBGkiQ/K79rnZMNEAHj+RKd5xVuO1pY3VDm4n4LKWORczih7H76qnO33S9j3CFj5egkpTiZBA6UJwx7E=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.37,REQID:0dc8743d-ec56-42e8-b8be-c2eece75357c,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:6f543d0,CLOUDID:0556b98f-e2c0-40b0-a8fe-7c7e47299109,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:11|1,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES :1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR,TF_CID_SPAM_ULN X-UUID: 2b7459ccd48411eea4ad694c3f9da370-20240226 Received: from mtkmbs10n2.mediatek.inc [(172.21.101.183)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1917233697; Mon, 26 Feb 2024 16:51:02 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by MTKMBS14N1.mediatek.inc (172.21.101.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Mon, 26 Feb 2024 16:51:01 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Mon, 26 Feb 2024 16:51:00 +0800 From: Shawn Sung To: Chun-Kuang Hu , AngeloGioacchino Del Regno CC: Philipp Zabel , David Airlie , Daniel Vetter , Matthias Brugger , Sumit Semwal , =?UTF-8?q?Christian=20K=C3=B6nig?= , , , , , , , Hsiao Chien Sung Subject: [PATCH 03/11] drm/mediatek: Rename "mtk_drm_plane" to "mtk_plane" Date: Mon, 26 Feb 2024 16:50:51 +0800 Message-ID: <20240226085059.26850-4-shawn.sung@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20240226085059.26850-1-shawn.sung@mediatek.com> References: <20240226085059.26850-1-shawn.sung@mediatek.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-AS-Result: No-10--5.066400-8.000000 X-TMASE-MatchedRID: TsrpJoyR88e4pD9RIlWSGjl/LoO+pjoA1cuIRwt/4Miaecho1pk4scbK +pu0ZYwRkKuaCBhTl1ZEzxsFM1euZm94Ipa1otxo4pdq9sdj8LUK3iJpXUOQQ+nZDXpMs2JZNT0 2hqjbFakI5IPWxD4Kh9wezITcev2HHxPMjOKY7A8LbigRnpKlKSPzRlrdFGDw71vY0NFosmGP2Y IQaqq6tYtYcDYhM5aiaT9USnjwmADBXSLukJEfgQ== X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--5.066400-8.000000 X-TMASE-Version: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-SNTS-SMTP: E3982EFEFA126FD5297DADA138F1F72675F733FA91B515562CC464D52ADD93112000:8 X-MTK: N Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Hsiao Chien Sung Rename all "mtk_drm_plane" to "mtk_plane": - To align the naming rule - To reduce the code size Signed-off-by: Hsiao Chien Sung Reviewed-by: AngeloGiaocchino Del Regno Reviewed-by: CK Hu --- 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/med= iatek/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_pla= ne *plane, return true; } =20 -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 =3D= { .destroy =3D drm_plane_cleanup, .reset =3D mtk_plane_reset, .atomic_duplicate_state =3D mtk_plane_duplicate_state, - .atomic_destroy_state =3D mtk_drm_plane_destroy_state, + .atomic_destroy_state =3D mtk_plane_destroy_state, .format_mod_supported =3D mtk_plane_format_mod_supported, }; =20 diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.h b/drivers/gpu/drm/med= iatek/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 */ =20 -#ifndef _MTK_DRM_PLANE_H_ -#define _MTK_DRM_PLANE_H_ +#ifndef _MTK_PLANE_H_ +#define _MTK_PLANE_H_ =20 #include #include --=20 2.18.0 From nobody Fri Sep 20 01:45:04 2024 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BB70B6025D; Mon, 26 Feb 2024 08:51:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=60.244.123.138 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708937474; cv=none; b=U7Fxyt8SoIDCJ54+vRJJy7NOiQFGYgBgflzVpTjU5A47/rubDCUUxMfLspmUSelKLiEuIopR/5DPrnIlYJlAJZekDkKmANPHBO/f9/XyLv/kKyYy81t34YIZKopFlILSb78UopAK01rM+SDSEO4DAVxAntJndF3z9JDIu0kwzyA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708937474; c=relaxed/simple; bh=knM9+IQUD3Td4eX1G9OHqT6Swar7q+ixq0fxq/4oLk0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GAsLeiIIdoSzE+8o3MsDy5acHUrH4E0mMMy9bMsujRBjETCpjPu8AZGj/DJSKDSuxm7I2sZTtlcNpL2W7thf74eK+Vx5j9KZ00JfvNB/CBem567ZzDkZMVNktxoofDdFz9ZHvesRK3p+7eZNUZONTmM+lUcwV0XMSdq5BtgOeH4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com; spf=pass smtp.mailfrom=mediatek.com; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b=oqEkwflF; arc=none smtp.client-ip=60.244.123.138 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mediatek.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="oqEkwflF" X-UUID: 2b783588d48411eea528b71b88a53856-20240226 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=9IMc7Cw8bq+OcqVnzcBnz1f+MwHOwm3zM2LeZZMkBnk=; b=oqEkwflFsUqxQohqITUXoBQufTXBG6umlT0s+9wU4FK+ZmV2CqAn2mcBhlNsDlJHIOYk4AMQhur4Qr37cxYDNmANrwFo2gjFScgWfeEeUDhVMjgkXSRicsCLj3A5aLHVWuvku2robpXdZBh1O2BVrQV/XwRQ9DoRDY5YFK+1Y5w=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.37,REQID:0c04afd9-ac99-401b-b5c5-ffc4a48a38d2,IP:0,U RL:0,TC:0,Content:-5,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:-5 X-CID-META: VersionHash:6f543d0,CLOUDID:a85137ff-c16b-4159-a099-3b9d0558e447,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1, SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: 2b783588d48411eea528b71b88a53856-20240226 Received: from mtkmbs13n1.mediatek.inc [(172.21.101.193)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 348448563; Mon, 26 Feb 2024 16:51:02 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Mon, 26 Feb 2024 16:51:01 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Mon, 26 Feb 2024 16:51:01 +0800 From: Shawn Sung To: Chun-Kuang Hu , AngeloGioacchino Del Regno CC: Philipp Zabel , David Airlie , Daniel Vetter , Matthias Brugger , Sumit Semwal , =?UTF-8?q?Christian=20K=C3=B6nig?= , , , , , , , Hsiao Chien Sung Subject: [PATCH 04/11] drm/mediatek: Rename "mtk_drm_gem" to "mtk_gem" Date: Mon, 26 Feb 2024 16:50:52 +0800 Message-ID: <20240226085059.26850-5-shawn.sung@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20240226085059.26850-1-shawn.sung@mediatek.com> References: <20240226085059.26850-1-shawn.sung@mediatek.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-AS-Result: No-10--11.970100-8.000000 X-TMASE-MatchedRID: zLlny1DLc/e4pD9RIlWSGjl/LoO+pjoA1cuIRwt/4MinwjKA2gmo6ns2 Av5Ik/UmKuucQMr5Le0huz6dkwFGWyQVVteP90CtA9lly13c/gEK3n1SHen81b/tumWFs8JCqko V3xFB0oIpa5Rbk8rMjDBlAzQBY9aA5UyftFAR/Cd0Uibeis6dEMLiFiL0BG1uuqWf6Nh7tmHmBx D2j3KOm8Vc51HetUBSZ/qwLVBvIQPIY6JevWs4vg2IdVM+s7+jzV4D+5YmeSJNShtWKzkFv7mEX 9ee0khj/Z8648ok1qX74R5CCqjLXhv4EaDquet2y7TSWcbz49Z9LQinZ4QefPcjNeVeWlqY+gtH j7OwNO1fbzE2lTRTc1ITM9sLUVEt9Ydiqjksv/XK72id3DprM1n2jzr80xsN X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--11.970100-8.000000 X-TMASE-Version: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-SNTS-SMTP: B659F79EE313E2C88E13619E2C752BDA931C9281C2F766A6E731A99EA54390ED2000:8 X-MTK: N Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Hsiao Chien Sung Rename all "mtk_drm_gem" to "mtk_gem": - To align the naming rule - To reduce the code size Signed-off-by: Hsiao Chien Sung Reviewed-by: AngeloGiaocchino Del Regno Reviewed-by: CK Hu --- 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/media= tek/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 =3D dev->dev_private; =20 @@ -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 =3D { .driver_features =3D DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, =20 - .dumb_create =3D mtk_drm_gem_dumb_create, + .dumb_create =3D mtk_gem_dumb_create, =20 - .gem_prime_import =3D mtk_drm_gem_prime_import, + .gem_prime_import =3D mtk_gem_prime_import, .gem_prime_import_sg_table =3D mtk_gem_prime_import_sg_table, .fops =3D &mtk_drm_fops, =20 diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c b/drivers/gpu/drm/media= tek/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" =20 -static int mtk_drm_gem_object_mmap(struct drm_gem_object *obj, struct vm_a= rea_struct *vma); +static int mtk_gem_object_mmap(struct drm_gem_object *obj, struct vm_area_= struct *vma); =20 static const struct vm_operations_struct vm_ops =3D { .open =3D drm_gem_vm_open, .close =3D drm_gem_vm_close, }; =20 -static const struct drm_gem_object_funcs mtk_drm_gem_object_funcs =3D { - .free =3D mtk_drm_gem_free_object, +static const struct drm_gem_object_funcs mtk_gem_object_funcs =3D { + .free =3D mtk_gem_free_object, .get_sg_table =3D mtk_gem_prime_get_sg_table, - .vmap =3D mtk_drm_gem_prime_vmap, - .vunmap =3D mtk_drm_gem_prime_vunmap, - .mmap =3D mtk_drm_gem_object_mmap, + .vmap =3D mtk_gem_prime_vmap, + .vunmap =3D mtk_gem_prime_vunmap, + .mmap =3D mtk_gem_object_mmap, .vm_ops =3D &vm_ops, }; =20 -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; =20 size =3D round_up(size, PAGE_SIZE); @@ -42,7 +42,7 @@ static struct mtk_drm_gem_obj *mtk_drm_gem_init(struct dr= m_device *dev, if (!mtk_gem_obj) return ERR_PTR(-ENOMEM); =20 - mtk_gem_obj->base.funcs =3D &mtk_drm_gem_object_funcs; + mtk_gem_obj->base.funcs =3D &mtk_gem_object_funcs; =20 ret =3D 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; } =20 -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 =3D dev->dev_private; - struct mtk_drm_gem_obj *mtk_gem; + struct mtk_gem_obj *mtk_gem; struct drm_gem_object *obj; int ret; =20 - mtk_gem =3D mtk_drm_gem_init(dev, size); + mtk_gem =3D mtk_gem_init(dev, size); if (IS_ERR(mtk_gem)) return ERR_CAST(mtk_gem); =20 @@ -97,9 +97,9 @@ struct mtk_drm_gem_obj *mtk_drm_gem_create(struct drm_dev= ice *dev, return ERR_PTR(ret); } =20 -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 =3D to_mtk_gem_obj(obj); + struct mtk_gem_obj *mtk_gem =3D to_mtk_gem_obj(obj); struct mtk_drm_private *priv =3D obj->dev->dev_private; =20 if (mtk_gem->sg) @@ -114,10 +114,10 @@ void mtk_drm_gem_free_object(struct drm_gem_object *o= bj) kfree(mtk_gem); } =20 -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; =20 args->pitch =3D 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 =3D args->pitch; args->size *=3D args->height; =20 - mtk_gem =3D mtk_drm_gem_create(dev, args->size, false); + mtk_gem =3D mtk_gem_create(dev, args->size, false); if (IS_ERR(mtk_gem)) return PTR_ERR(mtk_gem); =20 @@ -148,16 +148,16 @@ int mtk_drm_gem_dumb_create(struct drm_file *file_pri= v, struct drm_device *dev, return 0; =20 err_handle_create: - mtk_drm_gem_free_object(&mtk_gem->base); + mtk_gem_free_object(&mtk_gem->base); return ret; } =20 -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) =20 { int ret; - struct mtk_drm_gem_obj *mtk_gem =3D to_mtk_gem_obj(obj); + struct mtk_gem_obj *mtk_gem =3D to_mtk_gem_obj(obj); struct mtk_drm_private *priv =3D obj->dev->dev_private; =20 /* @@ -188,7 +188,7 @@ static int mtk_drm_gem_object_mmap(struct drm_gem_objec= t *obj, */ struct sg_table *mtk_gem_prime_get_sg_table(struct drm_gem_object *obj) { - struct mtk_drm_gem_obj *mtk_gem =3D to_mtk_gem_obj(obj); + struct mtk_gem_obj *mtk_gem =3D to_mtk_gem_obj(obj); struct mtk_drm_private *priv =3D 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 *de= v, struct dma_buf_attachment *attach, struct sg_table *sg) { - struct mtk_drm_gem_obj *mtk_gem; + struct mtk_gem_obj *mtk_gem; =20 /* 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(st= ruct drm_device *dev, return ERR_PTR(-EINVAL); } =20 - mtk_gem =3D mtk_drm_gem_init(dev, attach->dmabuf->size); + mtk_gem =3D mtk_gem_init(dev, attach->dmabuf->size); if (IS_ERR(mtk_gem)) return ERR_CAST(mtk_gem); =20 @@ -230,9 +230,9 @@ struct drm_gem_object *mtk_gem_prime_import_sg_table(st= ruct drm_device *dev, return &mtk_gem->base; } =20 -int mtk_drm_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map *m= ap) +int mtk_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map *map) { - struct mtk_drm_gem_obj *mtk_gem =3D to_mtk_gem_obj(obj); + struct mtk_gem_obj *mtk_gem =3D to_mtk_gem_obj(obj); struct sg_table *sgt =3D NULL; unsigned int npages; =20 @@ -270,10 +270,9 @@ int mtk_drm_gem_prime_vmap(struct drm_gem_object *obj,= struct iosys_map *map) return 0; } =20 -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 *ma= p) { - struct mtk_drm_gem_obj *mtk_gem =3D to_mtk_gem_obj(obj); + struct mtk_gem_obj *mtk_gem =3D to_mtk_gem_obj(obj); void *vaddr =3D map->vaddr; =20 if (!mtk_gem->pages) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.h b/drivers/gpu/drm/media= tek/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; }; =20 -#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) =20 -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 *de= v, struct dma_buf_attachment *attach, struct sg_table *sg); -int mtk_drm_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map *m= ap); -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 *ma= p); =20 #endif diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/med= iatek/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 =3D 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; --=20 2.18.0 From nobody Fri Sep 20 01:45:04 2024 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6781F6025E; Mon, 26 Feb 2024 08:51:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=60.244.123.138 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708937473; cv=none; b=ShTu2blNMBQ+p4zk5N/0Xq5xereeITiXbJ1RIG5Ur7/mb6nBdd7EtvYJD8q6kT3E9UuKX7lGEFesn42D2zKGPhnogyDrqYbwK9HeelXCcUzcVuMhhw4gichHye4DvS13BJ8E8l8fH/b23C34BHN2Gdloagxgc7dcj3oyqZP4EEg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708937473; c=relaxed/simple; bh=u/kc7SvSqBc3sbfGwMb0kbQ52AdZ0krbHOaBukGPTWc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=EEp3rp4sFLuDYeS80E7hy2ZpusKSctfl7rwNDojY3Od/6HP54KECXlwYIPdE12bKYllPCHABPShiEbmgYEyNonA6C3Be+CczOJiUufFiE28V7gWjjAtaifPF3y+ek5VDUdvFTfF4gY4sWaw1f4gfvPnD55tP++Q1N3UywaZioSA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com; spf=pass smtp.mailfrom=mediatek.com; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b=BvVXGLRB; arc=none smtp.client-ip=60.244.123.138 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mediatek.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="BvVXGLRB" X-UUID: 2b7994fad48411eea528b71b88a53856-20240226 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=x2Fr6Z54fhXSBfgOnTo+WotruDBz6Sf0EJfOElnLWpE=; b=BvVXGLRBOT79RRIpDFuJerKJrV5rt7n0tTcOAfYBr5L3+dDJNoDESlFvt0zETGjeUh+GntV/97dR+tjws30zvRpi2zeuM0firv/mZcWRPzL9RSPCLE0uptksqV72dK7KYZ06Ax7l4hvJ5NWcbSel3Pa7vMw1+Y2sdXOE7LnzkGo=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.37,REQID:22244099-6058-4365-abc0-79f512eb120d,IP:0,U RL:0,TC:0,Content:-25,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:-25 X-CID-META: VersionHash:6f543d0,CLOUDID:a45137ff-c16b-4159-a099-3b9d0558e447,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1, SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: 2b7994fad48411eea528b71b88a53856-20240226 Received: from mtkmbs13n1.mediatek.inc [(172.21.101.193)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 929062183; Mon, 26 Feb 2024 16:51:02 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Mon, 26 Feb 2024 16:51:01 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Mon, 26 Feb 2024 16:51:01 +0800 From: Shawn Sung To: Chun-Kuang Hu , AngeloGioacchino Del Regno CC: Philipp Zabel , David Airlie , Daniel Vetter , Matthias Brugger , Sumit Semwal , =?UTF-8?q?Christian=20K=C3=B6nig?= , , , , , , , Hsiao Chien Sung Subject: [PATCH 05/11] drm/mediatek: Rename "mtk_drm_hdmi" to "mtk_hdmi" Date: Mon, 26 Feb 2024 16:50:53 +0800 Message-ID: <20240226085059.26850-6-shawn.sung@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20240226085059.26850-1-shawn.sung@mediatek.com> References: <20240226085059.26850-1-shawn.sung@mediatek.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-AS-Result: No-10--7.325400-8.000000 X-TMASE-MatchedRID: TsrpJoyR88e4pD9RIlWSGjl/LoO+pjoA1cuIRwt/4Miaecho1pk4scbK +pu0ZYwRkKuaCBhTl1YSqo3ZUfrHh5Coy9iDotiwydRP56yRRA+4vBuE2X0HleBvxYFhNwdMee+ psuSMY7rqIrY16kMlM5u74XJZgEpKHxPMjOKY7A8LbigRnpKlKWxlRJiH4397gQHaJyKp5O47yK b/ievU52bgl1dokL/uO1wdsdedvmp7c0Ml70VSpA== X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--7.325400-8.000000 X-TMASE-Version: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-SNTS-SMTP: B88DA06EA8D8B3CC7F3C558D0DEEA15E00B6956FD5A2F6E2B6538233D4A9BA002000:8 X-MTK: N Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Hsiao Chien Sung Rename all "mtk_drm_hdmi" to "mtk_hdmi": - To align the naming rule - To reduce the code size Signed-off-by: Hsiao Chien Sung Reviewed-by: AngeloGiaocchino Del Regno Reviewed-by: CK Hu --- 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 devi= ce *dev) return 0; } =20 -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 =3D &pdev->dev; @@ -1746,7 +1746,7 @@ static int mtk_drm_hdmi_probe(struct platform_device = *pdev) return ret; } =20 -static void mtk_drm_hdmi_remove(struct platform_device *pdev) +static void mtk_hdmi_remove(struct platform_device *pdev) { struct mtk_hdmi *hdmi =3D platform_get_drvdata(pdev); =20 @@ -1790,7 +1790,7 @@ static const struct mtk_hdmi_conf mtk_hdmi_conf_mt816= 7 =3D { .cea_modes_only =3D true, }; =20 -static const struct of_device_id mtk_drm_hdmi_of_ids[] =3D { +static const struct of_device_id mtk_hdmi_of_ids[] =3D { { .compatible =3D "mediatek,mt2701-hdmi", .data =3D &mtk_hdmi_conf_mt2701, }, @@ -1801,14 +1801,14 @@ static const struct of_device_id mtk_drm_hdmi_of_id= s[] =3D { }, {} }; -MODULE_DEVICE_TABLE(of, mtk_drm_hdmi_of_ids); +MODULE_DEVICE_TABLE(of, mtk_hdmi_of_ids); =20 static struct platform_driver mtk_hdmi_driver =3D { - .probe =3D mtk_drm_hdmi_probe, - .remove_new =3D mtk_drm_hdmi_remove, + .probe =3D mtk_hdmi_probe, + .remove_new =3D mtk_hdmi_remove, .driver =3D { .name =3D "mediatek-drm-hdmi", - .of_match_table =3D mtk_drm_hdmi_of_ids, + .of_match_table =3D mtk_hdmi_of_ids, .pm =3D &mtk_hdmi_pm_ops, }, }; --=20 2.18.0 From nobody Fri Sep 20 01:45:04 2024 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0D5B6604BE; Mon, 26 Feb 2024 08:51:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.61.82.184 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708937477; cv=none; b=ISm6iHQZqgjpt1GjbcYGad+Ek9UYV/UFUoLXxAGKk6Hpu60DpoCGLeb6TO7gbPRdHBIIUjEiaoHJDyk2M42tDIhx8bx9V1wrz8ZrcNPfQybS1wQL3DOha01uZ+tiT2SqEhoCSXzu2u0nJ4JzGzHZOjzog3OOWTsCuhlU58UYsrE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708937477; c=relaxed/simple; bh=n/6BaJBE4qXoRsFOmRUFk8EGxtvwOJKsZjS0ymyCtL4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=HI2vTRyCZZSkU1DCiLyIeB195f2DzA6DdKfDxmKOEahUUo6u5OczBLqD/wws5AClsrUocT4JCeiH08qqpZHkD2LDu1DqOoYZ2C6ODVRREceHPCc7usYvnBoCxwP6el+AFfIqYn1yENU2r/RmBIH+7KrqqHYgEqpOJlK1GR8vXlE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com; spf=pass smtp.mailfrom=mediatek.com; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b=lhcPHgFP; arc=none smtp.client-ip=210.61.82.184 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mediatek.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="lhcPHgFP" X-UUID: 2b905dc0d48411eea4ad694c3f9da370-20240226 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=ThaHLF9k2VDhj9VeeukJCit1zrJzsfQMihTndF3u4e4=; b=lhcPHgFPybRd7E4AOBdBQD8F9mRngyDs7pboB+fll/ahZDkmCXZeDGEUZHbY3HqwHcxhUBsQfYomwNaBTUcDVnzhEoLlhza06C9i9im20xtrRzktDblCDfpjCODzIBY217/khw7vBHhJd+QyR3p+cx2AEwjU/UGtHgaZMuw69j8=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.37,REQID:3304b7a3-1b7a-4546-86b9-8cc4f6859e19,IP:0,U RL:0,TC:0,Content:-5,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:-5 X-CID-META: VersionHash:6f543d0,CLOUDID:0856b98f-e2c0-40b0-a8fe-7c7e47299109,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1, SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: 2b905dc0d48411eea4ad694c3f9da370-20240226 Received: from mtkmbs10n1.mediatek.inc [(172.21.101.34)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1999247529; Mon, 26 Feb 2024 16:51:02 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by mtkmbs13n2.mediatek.inc (172.21.101.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Mon, 26 Feb 2024 16:51:01 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Mon, 26 Feb 2024 16:51:01 +0800 From: Shawn Sung To: Chun-Kuang Hu , AngeloGioacchino Del Regno CC: Philipp Zabel , David Airlie , Daniel Vetter , Matthias Brugger , Sumit Semwal , =?UTF-8?q?Christian=20K=C3=B6nig?= , , , , , , , Hsiao Chien Sung Subject: [PATCH 06/11] drm/mediatek: Rename files "mtk_drm_crtc.*" to "mtk_crtc.*" Date: Mon, 26 Feb 2024 16:50:54 +0800 Message-ID: <20240226085059.26850-7-shawn.sung@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20240226085059.26850-1-shawn.sung@mediatek.com> References: <20240226085059.26850-1-shawn.sung@mediatek.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MTK: N Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Hsiao Chien Sung Rename files mtk_drm_crtc.* to mtk_crtc.*. Signed-off-by: Hsiao Chien Sung Reviewed-by: AngeloGiaocchino Del Regno Reviewed-by: CK Hu --- drivers/gpu/drm/mediatek/Makefile | 2 +- drivers/gpu/drm/mediatek/{mtk_drm_crtc.c =3D> mtk_crtc.c} | 2 +- drivers/gpu/drm/mediatek/{mtk_drm_crtc.h =3D> 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 =3D> mtk_crtc.c} (99%) rename drivers/gpu/drm/mediatek/{mtk_drm_crtc.h =3D> mtk_crtc.h} (100%) diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/M= akefile index 5e4436403b8d..edad718082a9 100644 --- a/drivers/gpu/drm/mediatek/Makefile +++ b/drivers/gpu/drm/mediatek/Makefile @@ -8,7 +8,7 @@ mediatek-drm-y :=3D 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/medi= atek/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 =20 #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/medi= atek/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/medi= atek/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 =20 #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" =20 diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c b/drivers/gpu/drm/me= diatek/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 =20 #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" =20 diff --git a/drivers/gpu/drm/mediatek/mtk_disp_color.c b/drivers/gpu/drm/me= diatek/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 =20 #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" =20 diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c b/drivers/gpu/drm/me= diatek/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 =20 #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" =20 diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/medi= atek/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 =20 #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" =20 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 =20 #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/med= iatek/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 =20 #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" =20 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" =20 =20 #define DISP_REG_DITHER_EN 0x0000 diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/media= tek/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 #include =20 -#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/med= iatek/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 #include =20 -#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/mediate= k/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 #include =20 -#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/media= tek/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 =20 #include "mtk_disp_drv.h" -#include "mtk_drm_crtc.h" +#include "mtk_crtc.h" #include "mtk_drm_ddp_comp.h" =20 #define PADDING_CONTROL_REG 0x00 --=20 2.18.0 From nobody Fri Sep 20 01:45:04 2024 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9575F604D6; Mon, 26 Feb 2024 08:51:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=60.244.123.138 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708937478; cv=none; b=Tj56LpEfKu+N4vO99Rna8d+iDm3ske7z9G8i0/gdg4Is4dqQr2kMDP/Uhdx6qLp4wVFcY3mqB5Z++B5x8dWapHxJ1oSIIQH4Resi+cfT2vF9IWj3dTx53HRXiaJQfRDyW+t9Dl4Q3LRID+GSscJW90NBBzCo4dWBGgUJB7vOLls= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708937478; c=relaxed/simple; bh=l83bmH4Vtio7wiJR784jkFynudxvE6UlYzNrWBhFaww=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=j/prHu0nHcS19uDF4Zj7QAl7TLSmZtcKSCpPCDGN5JMbHlnJX7Z7t9SJpV6NtC9g59S/MUmLEV/sDnfd7bh/yT1iXcDQ7E8tt9IpLt75jiuLGlumWxRsDN0dyEHmVFrXMqaz+UJRMGb3q+sP5ZRV19Haf1nBIW574vKFhnJGQsY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com; spf=pass smtp.mailfrom=mediatek.com; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b=q+0mefl/; arc=none smtp.client-ip=60.244.123.138 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mediatek.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="q+0mefl/" X-UUID: 2bed07aad48411eea528b71b88a53856-20240226 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=yIBNV7F7nUKl4z/itIR5FBNljQM4HJFIojS3Q3VKJeU=; b=q+0mefl/61MY8Eh4aLmapLHsKRlUkJSMD79oQnyMCB7xqsx7KVfG+keGf63w6qMv/rxgHGNm5bSo9cR58YMLK3Sz6tyvtXIzjaChNK4xpu7FNfMjL3Yo6rpuEzhcLwT78uSB7VfpwUT3TuNoYzwZRaNtCfZkJRnBT+vBrao8q+o=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.37,REQID:dcbce937-9f2c-4b60-a6d7-e64b798800f5,IP:0,U RL:0,TC:0,Content:-5,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:-5 X-CID-META: VersionHash:6f543d0,CLOUDID:c95137ff-c16b-4159-a099-3b9d0558e447,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1, SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: 2bed07aad48411eea528b71b88a53856-20240226 Received: from mtkmbs11n1.mediatek.inc [(172.21.101.185)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 864359392; Mon, 26 Feb 2024 16:51:03 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Mon, 26 Feb 2024 16:51:01 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Mon, 26 Feb 2024 16:51:01 +0800 From: Shawn Sung To: Chun-Kuang Hu , AngeloGioacchino Del Regno CC: Philipp Zabel , David Airlie , Daniel Vetter , Matthias Brugger , Sumit Semwal , =?UTF-8?q?Christian=20K=C3=B6nig?= , , , , , , , Hsiao Chien Sung Subject: [PATCH 07/11] drm/mediatek: Rename files "mtk_drm_ddp_comp.*" to "mtk_ddp_comp.*" Date: Mon, 26 Feb 2024 16:50:55 +0800 Message-ID: <20240226085059.26850-8-shawn.sung@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20240226085059.26850-1-shawn.sung@mediatek.com> References: <20240226085059.26850-1-shawn.sung@mediatek.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-AS-Result: No-10--4.418400-8.000000 X-TMASE-MatchedRID: k/L/ofNtQd0/5uXNh96gfjl/LoO+pjoA1cuIRwt/4MiSYqzYmxOFIrxX z8rVhwNpDISwwPi18PRg62EFNWAoiJhDg82nqVsGpvwZ9GmdwDOy4iyjvVWTorw2tvOM+/MnlwW f7/4SyDsqfUi2/QDieK6ARG1tM8qIr78SC5iivxwURSScn+QSXt0H8LFZNFG7CKFCmhdu5cWD5O tXitsuRGJgpEBF4PphZjhGjq2qFd7zKOIqtmTWU14H7SED8wK7QWniKmEzswAJ8rKgP3Pe4IJ25 KzmtS2mcqQs/zSI+/0XRoPmWO3jekxwdkPqCq7vDEyN+J8hd+jCS9WgDXVPCp6oP1a0mRIj X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--4.418400-8.000000 X-TMASE-Version: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-SNTS-SMTP: 70D8503C79C3E6C2872EA53423EEAF6F8B45BBEC9BBF84C872250898DAFCF35D2000:8 X-MTK: N Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Hsiao Chien Sung Rename files mtk_drm_ddp_comp.* to mtk_ddp_comp.*. Signed-off-by: Hsiao Chien Sung Reviewed-by: AngeloGiaocchino Del Regno --- 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 =3D> mtk_ddp_comp.c} | 2 +- drivers/gpu/drm/mediatek/{mtk_drm_ddp_comp.h =3D> 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 =3D> mtk_ddp_comp.c} (= 99%) rename drivers/gpu/drm/mediatek/{mtk_drm_ddp_comp.h =3D> mtk_ddp_comp.h} (= 100%) diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/M= akefile index edad718082a9..bbdf1e59ed84 100644 --- a/drivers/gpu/drm/mediatek/Makefile +++ b/drivers/gpu/drm/mediatek/Makefile @@ -9,7 +9,7 @@ mediatek-drm-y :=3D 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 @@ =20 #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" =20 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 =20 #include -#include "mtk_drm_ddp_comp.h" +#include "mtk_ddp_comp.h" #include "mtk_drm_drv.h" #include "mtk_drm_plane.h" =20 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" =20 =20 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/medi= atek/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 @@ =20 #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" =20 #define DISP_AAL_EN 0x0000 diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c b/drivers/gpu/drm/me= diatek/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 @@ =20 #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" =20 #define DISP_CCORR_EN 0x0000 diff --git a/drivers/gpu/drm/mediatek/mtk_disp_color.c b/drivers/gpu/drm/me= diatek/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 @@ =20 #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" =20 #define DISP_COLOR_CFG_MAIN 0x0400 diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c b/drivers/gpu/drm/me= diatek/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 @@ =20 #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" =20 #define DISP_GAMMA_EN 0x0000 diff --git a/drivers/gpu/drm/mediatek/mtk_disp_merge.c b/drivers/gpu/drm/me= diatek/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 #include =20 -#include "mtk_drm_ddp_comp.h" +#include "mtk_ddp_comp.h" #include "mtk_drm_drv.h" #include "mtk_disp_drv.h" =20 diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/medi= atek/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 @@ =20 #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" =20 #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 @@ =20 #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" =20 diff --git a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c b/drivers/gpu/drm/med= iatek/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 @@ =20 #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" =20 #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 @@ =20 #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" =20 enum mtk_dpi_out_bit_num { diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/media= tek/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 =20 #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" =20 diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/media= tek/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 =20 #include -#include "mtk_drm_ddp_comp.h" +#include "mtk_ddp_comp.h" =20 #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/med= iatek/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 =20 #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 =20 #include "mtk_disp_drv.h" -#include "mtk_drm_ddp_comp.h" +#include "mtk_ddp_comp.h" #include "mtk_drm_drv.h" =20 #define DSI_START 0x00 diff --git a/drivers/gpu/drm/mediatek/mtk_ethdr.c b/drivers/gpu/drm/mediate= k/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 =20 #include "mtk_crtc.h" -#include "mtk_drm_ddp_comp.h" +#include "mtk_ddp_comp.h" #include "mtk_drm_drv.h" #include "mtk_ethdr.h" =20 diff --git a/drivers/gpu/drm/mediatek/mtk_padding.c b/drivers/gpu/drm/media= tek/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 @@ =20 #include "mtk_disp_drv.h" #include "mtk_crtc.h" -#include "mtk_drm_ddp_comp.h" +#include "mtk_ddp_comp.h" =20 #define PADDING_CONTROL_REG 0x00 #define PADDING_BYPASS BIT(0) --=20 2.18.0 From nobody Fri Sep 20 01:45:04 2024 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 40016605B6; Mon, 26 Feb 2024 08:51:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=60.244.123.138 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708937478; cv=none; b=MZlBg2WdbPIUG5bKLfrnCtp5XRDKbmkSZ+5mzxZQU1auT30QI6IqDc6KDjXMP4QYx8GYUehh99nswPfxuLnC6SuiXdmmv1gHFNmbI+ra1pV7d8zuz14oNjgH6inJEt98fHNrrhP/+lUcigPFsxi/yV3KE2DlR3zlprBqaAip5z0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708937478; c=relaxed/simple; bh=69Yw1aGUDbMiByJ8bXl1a+YybdcLlKVKJyaZh3sjvBQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=YpO3FGPBfHs1C7ZXyDXiIF5sOWLOequslojU6F/eKRfTupGVnEoiGPaj2yeQ4zYBBeYFcaXS1Gu8fVx+bGa9zL/a9YCqeR5BLX8qNO91pQnsUPo0444KCv4dfLrVcpZRRzf6Vrq5IkebgHKK16fDxMCXkFCZWD5pZF3BG9BCFUE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com; spf=pass smtp.mailfrom=mediatek.com; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b=lvHN8dC1; arc=none smtp.client-ip=60.244.123.138 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mediatek.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="lvHN8dC1" X-UUID: 2b425bf2d48411eea528b71b88a53856-20240226 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=TI4Sub82GKGYrfNFpRmeVDDz0BTTgCAOx01Ilx4UOG8=; b=lvHN8dC1VADtvi06Nb2og9B/iWgSrhLrqu/z/7LJzVCW+KzPN6HOgITzsKA34Ar1WNfMpM/XuU3Mo4AEIWFy40JCh2jJQSfIoLB1A7trcMkD1EzlPydVbgXo1pWhwnGZj3/pEVV+UZLNwKAwl2XFWbPRKsRH1/hjdKmWgQebbDk=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.37,REQID:b66c7613-e79b-48c2-b444-b90f0ccf81e0,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:6f543d0,CLOUDID:a55137ff-c16b-4159-a099-3b9d0558e447,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1, SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: 2b425bf2d48411eea528b71b88a53856-20240226 Received: from mtkmbs13n2.mediatek.inc [(172.21.101.108)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 590960795; Mon, 26 Feb 2024 16:51:02 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by mtkmbs11n2.mediatek.inc (172.21.101.187) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Mon, 26 Feb 2024 16:51:01 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Mon, 26 Feb 2024 16:51:01 +0800 From: Shawn Sung To: Chun-Kuang Hu , AngeloGioacchino Del Regno CC: Philipp Zabel , David Airlie , Daniel Vetter , Matthias Brugger , Sumit Semwal , =?UTF-8?q?Christian=20K=C3=B6nig?= , , , , , , , Hsiao Chien Sung Subject: [PATCH 08/11] drm/mediatek: Rename files "mtk_drm_plane.*" to "mtk_plane.*" Date: Mon, 26 Feb 2024 16:50:56 +0800 Message-ID: <20240226085059.26850-9-shawn.sung@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20240226085059.26850-1-shawn.sung@mediatek.com> References: <20240226085059.26850-1-shawn.sung@mediatek.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MTK: N Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Hsiao Chien Sung Rename files mtk_drm_plane.* to mtk_plane.*. Signed-off-by: Hsiao Chien Sung Reviewed-by: AngeloGiaocchino Del Regno --- 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 =3D> mtk_plane.c} | 2 +- drivers/gpu/drm/mediatek/{mtk_drm_plane.h =3D> mtk_plane.h} | 0 7 files changed, 6 insertions(+), 6 deletions(-) rename drivers/gpu/drm/mediatek/{mtk_drm_plane.c =3D> mtk_plane.c} (99%) rename drivers/gpu/drm/mediatek/{mtk_drm_plane.h =3D> mtk_plane.h} (100%) diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/M= akefile index bbdf1e59ed84..0e198c00c6f2 100644 --- a/drivers/gpu/drm/mediatek/Makefile +++ b/drivers/gpu/drm/mediatek/Makefile @@ -12,7 +12,7 @@ mediatek-drm-y :=3D 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" =20 /* * 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 #include "mtk_ddp_comp.h" #include "mtk_drm_drv.h" -#include "mtk_drm_plane.h" +#include "mtk_plane.h" =20 #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/medi= atek/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 @@ =20 #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" =20 diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h b/drivers/gpu/drm/medi= atek/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 #include #include -#include "mtk_drm_plane.h" +#include "mtk_plane.h" #include "mtk_mdp_rdma.h" =20 int mtk_aal_clk_enable(struct device *dev); diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/med= iatek/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" =20 static const u64 modifiers[] =3D { DRM_FORMAT_MOD_LINEAR, diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.h b/drivers/gpu/drm/med= iatek/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 --=20 2.18.0 From nobody Fri Sep 20 01:45:04 2024 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7B60460272; Mon, 26 Feb 2024 08:51:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.61.82.184 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708937475; cv=none; b=p1OsWPKu5n2SDlad0VlEYAJa38lVOXVuguRREsXijiYyUZyUuUplE+e0M/Vl9CPik98OOELf9lqmrkLdkJuHDIcPToQ/Q9Cd5qLoxIYXJzt564/NCggaTo+9ihvrtBG23F2x7SeNrsnddXeARbHBfTAD35/biS0TG3V7kUmaV3I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708937475; c=relaxed/simple; bh=GVF4XiFl/Tzw/2ZxXbG0u87GgcKy1IdXEGyfuHdPSAU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=WmFxgKA+doqEZVnbe/MoGPsqz6fkE7M9ls/V49YojG981StPyHYrTnlLUnGwvjTj5KCT+PfyrObV0WShuAJym865wMKHOb4hwyYDuKWBAH6wviMuEIVL4ezxIlkI0jsr67PQS1jTUNnPLgE2o1JuG9dLaaD/lp1ZCXwSnbGqHmg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com; spf=pass smtp.mailfrom=mediatek.com; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b=sBB6968Q; arc=none smtp.client-ip=210.61.82.184 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mediatek.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="sBB6968Q" X-UUID: 2b79158ed48411eea4ad694c3f9da370-20240226 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=sM8UoohUbZJxJVpiqBGVNjeWckAhm+PhZjsuoeNGu7o=; b=sBB6968QwofIC2QXsVAwjoidDJ/1bXSQ90QHcBABMiAytozRzOo18x2q/8blIx3r5u69NriG71DeaWXd5QEpbY4miu35dkGZXemNxkDdnLSpuM9rfYf8W43vVyz+Qsu8Yd3MSU7R6/nzSGU1dpJpKdMNMqQAeK0QfraYqR/aN1Y=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.37,REQID:5b8ab37a-39b8-4c04-97e9-3f5fc2f1f7f8,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:6f543d0,CLOUDID:0656b98f-e2c0-40b0-a8fe-7c7e47299109,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1, SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: 2b79158ed48411eea4ad694c3f9da370-20240226 Received: from mtkmbs10n2.mediatek.inc [(172.21.101.183)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 701259482; Mon, 26 Feb 2024 16:51:02 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by MTKMBS14N1.mediatek.inc (172.21.101.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Mon, 26 Feb 2024 16:51:01 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Mon, 26 Feb 2024 16:51:01 +0800 From: Shawn Sung To: Chun-Kuang Hu , AngeloGioacchino Del Regno CC: Philipp Zabel , David Airlie , Daniel Vetter , Matthias Brugger , Sumit Semwal , =?UTF-8?q?Christian=20K=C3=B6nig?= , , , , , , , Hsiao Chien Sung Subject: [PATCH 09/11] drm/mediatek: Rename files "mtk_drm_gem.*" to "mtk_gem.*" Date: Mon, 26 Feb 2024 16:50:57 +0800 Message-ID: <20240226085059.26850-10-shawn.sung@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20240226085059.26850-1-shawn.sung@mediatek.com> References: <20240226085059.26850-1-shawn.sung@mediatek.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-AS-Result: No-10--8.051000-8.000000 X-TMASE-MatchedRID: 9IrrHbNZyfo/5uXNh96gfjl/LoO+pjoA1cuIRwt/4Mg1LB46LFAAkhW2 f9kZkU+12g2rjVADxc1g62EFNWAoiEzhWNnvpqvYCXpcUYyUeeT0O7M3lSnTW5soi2XrUn/Jn6K dMrRsL14qtq5d3cxkNX5GLVEFfGYWpXt1SGGa7UIiuivvBlcpmLpp2HrpqRleFLHeAx8rfY3Avp LE+mvX8g== X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--8.051000-8.000000 X-TMASE-Version: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-SNTS-SMTP: E7AAB4CDEF13AE55F6A37D367F5B852F515EEFA2A8D556483FF71CAB49A1E1B42000:8 X-MTK: N Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Hsiao Chien Sung Rename files mtk_drm_gem.* to mtk_gem.*. Signed-off-by: Hsiao Chien Sung Reviewed-by: AngeloGiaocchino Del Regno Reviewed-by: CK Hu --- 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 =3D> mtk_gem.c} | 2 +- drivers/gpu/drm/mediatek/{mtk_drm_gem.h =3D> 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 =3D> mtk_gem.c} (99%) rename drivers/gpu/drm/mediatek/{mtk_drm_gem.h =3D> mtk_gem.h} (100%) diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/M= akefile index 0e198c00c6f2..7e6d4b2fadbf 100644 --- a/drivers/gpu/drm/mediatek/Makefile +++ b/drivers/gpu/drm/mediatek/Makefile @@ -11,7 +11,7 @@ mediatek-drm-y :=3D 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" =20 /* diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/media= tek/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" =20 #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/media= tek/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 =20 #include "mtk_drm_drv.h" -#include "mtk_drm_gem.h" +#include "mtk_gem.h" =20 static int mtk_gem_object_mmap(struct drm_gem_object *obj, struct vm_area_= struct *vma); =20 diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.h b/drivers/gpu/drm/media= tek/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/mediate= k/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" =20 static const u64 modifiers[] =3D { --=20 2.18.0 From nobody Fri Sep 20 01:45:04 2024 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 21136604C3; Mon, 26 Feb 2024 08:51:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=60.244.123.138 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708937477; cv=none; b=cZ6ZY9Myl37DqphWLybUGTOlGOqRCf0kDjyISD97wxCfzgLDmP8QTXSAf5d7yZDvv4tphAVbO1xdtBQj+4uT4lwAq/pqRdEF65H+fpexgoWEG3c6zrNtW/qCfIsgg7HkXgxN8MSSqtObljBSq19shHtVKSz7PbnlkiFSpzMQAm4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708937477; c=relaxed/simple; bh=s1cK/wTZhJ62FPYPPFDpMHG53T9yRhJ9UoYmk9oQSpM=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=t7lGTjV+FI18n4nc067THvMuTHugddxX+94HeiQ0+CE8lpdcOG3n14Oy0WUxcaIvtQLYnoCN4lY8hbTyio2/zEjyHR1nmbtnBdVK2AQ4ZnpjwhXI1NI9P9aCjecIgzVrtM+0fpx12e2fbSh8AhxcHPzqRxXtJQyFG1089FBWyTA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com; spf=pass smtp.mailfrom=mediatek.com; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b=iChQ/jRl; arc=none smtp.client-ip=60.244.123.138 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mediatek.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="iChQ/jRl" X-UUID: 2b7b1578d48411eea528b71b88a53856-20240226 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=6TWSK64E0WodaSDGwaLUysICXNCqUF/NrEtpuNgaBYg=; b=iChQ/jRl3EC/2jJBzMGgAnbIEdSw9EmjBs2/7+4hv6mkDSipPSl6jxTY1jmQMKHPPL4K0hvu7AilnY931R/sUmycWkhvXv4h9hCu0jWkZ5cq7FqCWShqSDO1TKe2nmvNXc4wUl1mZ92I50w7oE0msismZHE3mGNWuvw+uxu3Gqg=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.37,REQID:1fb294bc-d88d-401a-976a-2e33a34663c7,IP:0,U RL:0,TC:0,Content:-25,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:-25 X-CID-META: VersionHash:6f543d0,CLOUDID:fe62d280-4f93-4875-95e7-8c66ea833d57,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:11|1,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES :1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR,TF_CID_SPAM_ULN X-UUID: 2b7b1578d48411eea528b71b88a53856-20240226 Received: from mtkmbs13n1.mediatek.inc [(172.21.101.193)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 511004916; Mon, 26 Feb 2024 16:51:02 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Mon, 26 Feb 2024 16:51:01 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Mon, 26 Feb 2024 16:51:01 +0800 From: Shawn Sung To: Chun-Kuang Hu , AngeloGioacchino Del Regno CC: Philipp Zabel , David Airlie , Daniel Vetter , Matthias Brugger , Sumit Semwal , =?UTF-8?q?Christian=20K=C3=B6nig?= , , , , , , , Hsiao Chien Sung Subject: [PATCH 10/11] drm/mediatek: Rename mtk_ddp_comp functions Date: Mon, 26 Feb 2024 16:50:58 +0800 Message-ID: <20240226085059.26850-11-shawn.sung@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20240226085059.26850-1-shawn.sung@mediatek.com> References: <20240226085059.26850-1-shawn.sung@mediatek.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-AS-Result: No-10--10.286800-8.000000 X-TMASE-MatchedRID: /EMcd6LVODb8rQJMqxBG8D9B1SHosSXQSiliXIcwP3HJYIv7y0tu9usu 2jSWEv0MGQdEeHBaW03ijpjet3oGSJCoy9iDotiwg2gX/Emjy1TljSRvSGpq3LPfILG5l81GJ7o vlkPXpS2s+kOEMyJ9M1yQCq2zqsJAj2hRzH1UwuAURSScn+QSXt0H8LFZNFG7bkV4e2xSge7VEO AV6gUnK31lBgKiXV4xBWSou44txm4Lp4zD4jNw8JRMZUCEHkRt X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--10.286800-8.000000 X-TMASE-Version: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-SNTS-SMTP: 5A34AB1D8ECE4ED688A103E4D1E80148B5B07663B6553ABB558535E56868F4652000:8 X-MTK: N Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Hsiao Chien Sung Rename functions of mtk_ddp_comp: - To align the naming rule - To reduce the code size Signed-off-by: Hsiao Chien Sung Reviewed-by: AngeloGiaocchino Del Regno Reviewed-by: CK Hu --- 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/medi= atek/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_matche= s[DDP_COMPONENT_DRM_ID_MAX] [DDP_COMPONENT_WDMA1] =3D { MTK_DISP_WDMA, 1, NULL }, }; =20 -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; =20 @@ -514,10 +514,10 @@ static bool mtk_drm_find_comp_in_ddp(struct device *d= ev, return false; } =20 -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; } =20 -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 =3D drm->dev_private; unsigned int ret =3D 0; =20 - 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 =3D 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 =3D 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 =3D BIT(2); else - ret =3D mtk_drm_find_comp_in_ddp_conn_path(dev, - private->data->conn_routes, - private->data->num_conn_routes, - private->ddp_comp); + ret =3D mtk_ddp_comp_find_in_route(dev, + private->data->conn_routes, + private->data->num_conn_routes, + private->ddp_comp); =20 return ret; } diff --git a/drivers/gpu/drm/mediatek/mtk_ddp_comp.h b/drivers/gpu/drm/medi= atek/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(struc= t mtk_ddp_comp *comp) =20 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 devi= ce *master, void *data) return ret; } =20 - dpi->encoder.possible_crtcs =3D mtk_drm_find_possible_crtc_by_comp(drm_de= v, dpi->dev); + dpi->encoder.possible_crtcs =3D mtk_find_possible_crtcs(drm_dev, dpi->dev= ); =20 ret =3D 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; } =20 - dsi->encoder.possible_crtcs =3D mtk_drm_find_possible_crtc_by_comp(drm, d= si->host.dev); + dsi->encoder.possible_crtcs =3D mtk_find_possible_crtcs(drm, dsi->host.de= v); =20 ret =3D drm_bridge_attach(&dsi->encoder, &dsi->bridge, NULL, DRM_BRIDGE_ATTACH_NO_CONNECTOR); --=20 2.18.0 From nobody Fri Sep 20 01:45:04 2024 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7E20F604D3; Mon, 26 Feb 2024 08:51:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.61.82.184 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708937477; cv=none; b=BargZ2iuZ01ZVSK4YDrVQ/UMlJ7vLAdL+UboVHp8kHJxTJHV10sdHJHvHM4gIfbTzHRQDKaa6CWRQywaFkmVU3WWPF6BWh+nyJcfKS+LdJUK+V8c60XNuyenJ/ID3x/pJxCR+LvNPe6CydHiugB2p7N1b4kPulNmy8i21aK8OkI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708937477; c=relaxed/simple; bh=L3ltQxjIJuw+T2C2bioAGG+AvH8aZvohOch2MvVA5hA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=YUskP3ouR8LUhY/n32laXtY3g/KyAspRuTbBpZyV3+1W8PdnEqG/xlZAwKtEXzK+GLFQys9rgs0O72prhZVag3S0tcOtZyOJ5p4Tmza8zaoPseZ809JEUdCIw6jBLpC5eeSd0nTnYsJK6HyTbjqzjQvVcmnIsQxDndnXOCxkMuk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com; spf=pass smtp.mailfrom=mediatek.com; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b=u1QF3DjL; arc=none smtp.client-ip=210.61.82.184 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mediatek.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="u1QF3DjL" X-UUID: 2beb55aed48411eea4ad694c3f9da370-20240226 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=iwc9kDknZAzyKajXb2vq1Cm2P/QPOwxJq4Z1t9O4ssc=; b=u1QF3DjLzz17ehgLXiVDgylbqeXPgOJi34swrTiFQDh53LBqrpBtUEMS0alVFW7DuePMy8tvh83hVIFg0/Wi6adibSrkG9DF+YNnKrDGXhRGpEjW6tA4ubDKzVl86h+A0ArhLbTlQJYxIrVQP8I4Bo2zNCtcQx4MohnJYRW0Bmg=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.37,REQID:5c807543-9fe1-4366-997d-2e781ba17008,IP:0,U RL:0,TC:0,Content:-5,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:-5 X-CID-META: VersionHash:6f543d0,CLOUDID:0963d280-4f93-4875-95e7-8c66ea833d57,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1, SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: 2beb55aed48411eea4ad694c3f9da370-20240226 Received: from mtkmbs10n1.mediatek.inc [(172.21.101.34)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1414204915; Mon, 26 Feb 2024 16:51:03 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by mtkmbs11n2.mediatek.inc (172.21.101.187) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Mon, 26 Feb 2024 16:51:02 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Mon, 26 Feb 2024 16:51:02 +0800 From: Shawn Sung To: Chun-Kuang Hu , AngeloGioacchino Del Regno CC: Philipp Zabel , David Airlie , Daniel Vetter , Matthias Brugger , Sumit Semwal , =?UTF-8?q?Christian=20K=C3=B6nig?= , , , , , , , Hsiao Chien Sung Subject: [PATCH 11/11] drm/mediatek: Rename "pending_needs_vblank" to "needs_vblank" Date: Mon, 26 Feb 2024 16:50:59 +0800 Message-ID: <20240226085059.26850-12-shawn.sung@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20240226085059.26850-1-shawn.sung@mediatek.com> References: <20240226085059.26850-1-shawn.sung@mediatek.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MTK: N Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Hsiao Chien Sung Rename "pending_needs_vblank" to "needs_vblank" to reduce the code size. Signed-off-by: Hsiao Chien Sung --- 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; =20 - bool pending_needs_vblank; + bool needs_vblank; struct drm_pending_vblank_event *event; =20 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 =3D false; + mtk_crtc->needs_vblank =3D false; } } =20 @@ -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 =3D true; if (needs_vblank) - mtk_crtc->pending_needs_vblank =3D true; + mtk_crtc->needs_vblank =3D true; =20 for (i =3D 0; i < mtk_crtc->layer_nr; i++) { struct drm_plane *plane =3D &mtk_crtc->planes[i]; --=20 2.18.0