From nobody Thu Nov 14 04:47:45 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