From patchwork Mon Feb 26 08:50:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?U2hhd24gU3VuZyAo5a6L5a2d6KyZKQ==?= X-Patchwork-Id: 206527 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp1967675dyb; Mon, 26 Feb 2024 01:53:54 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUEhT5euc9uvzCD75GWSVku6sWMmm8VGeV1Hl4m5QAdRp0Q37tPnKD3VduD4zmK/4e8V/mziTXcV7di8FAh/252iWWZ9g== X-Google-Smtp-Source: AGHT+IEYkL6YwHzztw3S1Mjnu7yy6gWjVxjy91SAyN7ay5SgOIjSuHc3vhq9IhWQgY9ZxQzFlISa X-Received: by 2002:a05:6a20:6f8f:b0:19e:9b19:96c0 with SMTP id gv15-20020a056a206f8f00b0019e9b1996c0mr9780960pzb.7.1708941234204; Mon, 26 Feb 2024 01:53:54 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708941234; cv=pass; d=google.com; s=arc-20160816; b=QI11rlzxI5yK+I6dBVa4wGa4JWFyOHkS8eGcx2NUHGWHoW12Xi0oKKSmMjVxaR8BtP pNh7Oco2Nt+dMc98rFIjAjWuS/72FwzSaJW4MGVcuDwUG+ZUkSP2KT6O30jmkeUwd4ED Dm9mDx/k4PeWJv04Vv0SbRPwRvWvVjS3L9rfWHMGnTtA2kwkYqCyTvg1kYZlWVWAx/Se xZG6Frf3CfTu6BIa4X9lExkZyqZrtE3HsPplKKwbix5IWZs15d794mr+ZKVanBJRV6dS nEeKAaZiNd6SVQ8c+KiRA17eEBjXjcud8zg7QdYEgKQywTcnI1ZotRL1rFGXA9UomcRT 6+QA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ZaQO7uorjNJlvDyvjlmkRjy3fH91QvFpf5okxM8Rc94=; fh=mgixLepzNGkyB3AoEmVNXq5zUZJ17gVX1HIqk5a+Lr0=; b=Wre7LFGWjREVv0ClsMDEPe5xXIW5DzjimzsPHDF/10ei2TNWaefIpTfECwTzSQxoDC l4E8iNftwm1BeItwZxLlydFqVwJCMsms5dOOZk/wnATQAJuvk0QVURegOnCB7A5NdRd2 F8IRkPL/8IVb+950TTvm2DVsnixPOduduTfGYOBQIJeem+RaVr+1zawAbQgBnpHWjphf diM//LyR6b4nnsSykgttxZnf4HtzQGJsd7UzHvfr6KZFF356mQcOQe5emkAuaSHadwHE yI6K4tY5ce2QYf7Qfm5UtmEnNM5wTnTz1SisQEqSwiXG9xH3B77Zt/s5SpR3tELF7BXr YRKw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=iRUEbIRD; arc=pass (i=1 spf=pass spfdomain=mediatek.com dkim=pass dkdomain=mediatek.com dmarc=pass fromdomain=mediatek.com); spf=pass (google.com: domain of linux-kernel+bounces-80967-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80967-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id e12-20020a63ee0c000000b005cf268638edsi3554240pgi.177.2024.02.26.01.53.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 01:53:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-80967-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=iRUEbIRD; arc=pass (i=1 spf=pass spfdomain=mediatek.com dkim=pass dkdomain=mediatek.com dmarc=pass fromdomain=mediatek.com); spf=pass (google.com: domain of linux-kernel+bounces-80967-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80967-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id C5224B245BC for ; Mon, 26 Feb 2024 09:31:57 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 87FA260DD5; Mon, 26 Feb 2024 08:51:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="iRUEbIRD" 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 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_K=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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791954764016700416 X-GMAIL-MSGID: 1791954764016700416 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 --- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 16 +++++++--------- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 6 +++--- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c index fe965ad7d282..d8b591aff3c2 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c @@ -276,9 +276,9 @@ static void mtk_crtc_ddp_clk_disable(struct mtk_crtc *mtk_crtc) } static -struct mtk_ddp_comp *mtk_drm_ddp_comp_for_plane(struct drm_crtc *crtc, - struct drm_plane *plane, - unsigned int *local_layer) +struct mtk_ddp_comp *mtk_ddp_comp_for_plane(struct drm_crtc *crtc, + struct drm_plane *plane, + unsigned int *local_layer) { struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc); struct mtk_ddp_comp *comp; @@ -428,7 +428,7 @@ static int mtk_crtc_ddp_hw_init(struct mtk_crtc *mtk_crtc) /* should not enable layer before crtc enabled */ plane_state->pending.enable = false; - comp = mtk_drm_ddp_comp_for_plane(crtc, plane, &local_layer); + comp = mtk_ddp_comp_for_plane(crtc, plane, &local_layer); if (comp) mtk_ddp_comp_layer_config(comp, local_layer, plane_state, NULL); @@ -519,8 +519,7 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc, if (!plane_state->pending.config) continue; - comp = mtk_drm_ddp_comp_for_plane(crtc, plane, - &local_layer); + comp = mtk_ddp_comp_for_plane(crtc, plane, &local_layer); if (comp) mtk_ddp_comp_layer_config(comp, local_layer, @@ -544,8 +543,7 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc, if (!plane_state->pending.async_config) continue; - comp = mtk_drm_ddp_comp_for_plane(crtc, plane, - &local_layer); + comp = mtk_ddp_comp_for_plane(crtc, plane, &local_layer); if (comp) mtk_ddp_comp_layer_config(comp, local_layer, @@ -709,7 +707,7 @@ int mtk_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane *plane, unsigned int local_layer; struct mtk_ddp_comp *comp; - comp = mtk_drm_ddp_comp_for_plane(crtc, plane, &local_layer); + comp = mtk_ddp_comp_for_plane(crtc, plane, &local_layer); if (comp) return mtk_ddp_comp_layer_check(comp, local_layer, state); return 0; diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h index 93d79a1366e9..ba985206fdd2 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h @@ -3,8 +3,8 @@ * Copyright (c) 2015 MediaTek Inc. */ -#ifndef MTK_DRM_DDP_COMP_H -#define MTK_DRM_DDP_COMP_H +#ifndef MTK_DDP_COMP_H +#define MTK_DDP_COMP_H #include #include @@ -340,4 +340,4 @@ void mtk_ddp_write_relaxed(struct cmdq_pkt *cmdq_pkt, unsigned int value, void mtk_ddp_write_mask(struct cmdq_pkt *cmdq_pkt, unsigned int value, struct cmdq_client_reg *cmdq_reg, void __iomem *regs, unsigned int offset, unsigned int mask); -#endif /* MTK_DRM_DDP_COMP_H */ +#endif /* MTK_DDP_COMP_H */