Received: by 2002:ab2:620c:0:b0:1ef:ffd0:ce49 with SMTP id o12csp690646lqt; Tue, 19 Mar 2024 00:04:04 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUAtXPxSKyWvjxB/bsxZz155fJIFDD8UI2kaLPmtMboU2xZOFKMLz54UkhWkGpjaXryJNDQEC7L64NKSfQLHiH9/WkiDPSYHov9xZFbLg== X-Google-Smtp-Source: AGHT+IFtbXVOc7Ca7EsbRPKO5d8ohhYx0d0pNcxvhemCgWZp9bAj6wehJomEOGp6agIrbeySaME1 X-Received: by 2002:a17:906:6957:b0:a46:cee9:e412 with SMTP id c23-20020a170906695700b00a46cee9e412mr901204ejs.15.1710831844825; Tue, 19 Mar 2024 00:04:04 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1710831844; cv=pass; d=google.com; s=arc-20160816; b=PBF3nQzEsDQ7f/Zhf9sIdbxMXfubYUzxjYOsl9t6LwJ/q6I/pYYQfbJ/4m+b7E4ZT9 760kA4BOhM2fSRF117OViNrZnqC+QTeIz5YSPLRqdttIYAu/XZhOV9DcuQcs7J8QMkpl YcmRl/JcyM6KoSBGWhqC16iKYehcO/U5A6Yybbe1Z4cLbtpcAaWVhFUVZmu5Ga79R5cY MjweSe3ING0shYz/pdgsuHogPSQT5XHgSCqjDW51tpOFL+7K4wJGUxBIYUao/jdownAh ZYaskuz+XIN1m1lf/ybbpuciqC0IdNBJKVvTlxoQw/DIft5GKJLcCPCYpJ6hAbR8TFY1 DoRw== 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=we3EkR9nVk9faLcsJPhSj1v9F5U4JNYTsmeoXHMr7vg=; fh=mgixLepzNGkyB3AoEmVNXq5zUZJ17gVX1HIqk5a+Lr0=; b=bcVSoFi3FjHctO6k/yBseKRJ8veX95MuCq9BNL1VE/7403rhUh0BlCGuYQjjZPu66l UL19up7Zm10Ybg4rI4gXcLojifFx5nd0KmZZvx5urJtTdSeWuypTqE13Rb46bedyOoTE ZojG1lqrt3716RLUrrWbtkvy0NjhRQDcj8Cu5bWd2q9OFRwsxbpXJ0sQwMj42VZE37AM 0/d9NCM4nb/242GLW1Lc1Mxx4hRMNZa1h94FneT7ijl5bdTlJhwxVBEkdtIOlWjmFMLT RBoJ5+cFlBPdHn758H4n8tIVc/oP7doz9sZwNbOihG4C13HgLR0FUCzXUABvYQ/fIEY0 VOdQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=dUBlSU1D; 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-107137-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-107137-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id sh20-20020a1709076e9400b00a46a154ff39si3305870ejc.756.2024.03.19.00.04.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Mar 2024 00:04:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-107137-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=dUBlSU1D; 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-107137-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-107137-linux.lists.archive=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 am.mirrors.kernel.org (Postfix) with ESMTPS id 6B13A1F22092 for ; Tue, 19 Mar 2024 07:04:04 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E6210548ED; Tue, 19 Mar 2024 07:03:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="dUBlSU1D" 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 D0EB851026; Tue, 19 Mar 2024 07:03:11 +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=1710831793; cv=none; b=rPvjdJHcZvLFWfx3faCR7nuirv9pNRAYCU6BpY1U8mVgEkGq5Df/x9sqOW13ltwr6kAOfgKpUaqLn7vKvvaa1SAtC0PEWTsD2uttCLWZOYEzualoj0NhhEU6uLia7g1E6l6LMZIwHWefQfyvkKOgK6Tf0EVe7e3YZsr+J+ucGVQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710831793; c=relaxed/simple; bh=EOA6/YUSSWQHWdOkDcq7NbvZVI8S5Hy6qQWDgzgf39g=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=b3OpnkPzfpJaQrcIzKU+CeDDOiJfu2fQS6J4fi90RkOQ7ThL/gOHIeVPuMG4kNXGw7kaELBq2CW87YmNd1GUuYKggUvGRLrGq18pyOxO3cINfJupu2HGygqEOi2S3a/8FQpgTift4Klvbyi2W2ykkKqPcVuKtaropDT20DWywek= 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=dUBlSU1D; 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 X-UUID: b8e3ff24e5be11ee935d6952f98a51a9-20240319 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=we3EkR9nVk9faLcsJPhSj1v9F5U4JNYTsmeoXHMr7vg=; b=dUBlSU1DWKNNxrxA9aa5EClnDpY9Gf3e+f/LJ52eX6EfkjAfgU4VAMqcizxncqTi5A7/KUYno4WNqbyAIiXLtgad8eecD8oi+jOsEQvQqRQZdYdJifFFjNzCo/wHN0P/xxroE9mBGyKry+UkotJikgqrKFv9hvOPEbLgvS5H4LY=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.37,REQID:64e88cfa-bd44-4718-90fc-d0fb08474147,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:fa94aa81-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: b8e3ff24e5be11ee935d6952f98a51a9-20240319 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 1024618653; Tue, 19 Mar 2024 15:03:00 +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; Tue, 19 Mar 2024 15:02:59 +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; Tue, 19 Mar 2024 15:02:59 +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 v2 02/14] drm/mediatek: Rename "mtk_drm_ddp_comp" to "mtk_ddp_comp" Date: Tue, 19 Mar 2024 15:02:45 +0800 Message-ID: <20240319070257.6443-3-shawn.sung@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20240319070257.6443-1-shawn.sung@mediatek.com> References: <20240319070257.6443-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 Content-Type: text/plain X-MTK: N From: Hsiao Chien Sung Rename all "mtk_drm_ddp_comp" to "mtk_ddp_comp": - To align the naming rule - To reduce the code size Reviewed-by: AngeloGiaocchino Del Regno Reviewed-by: CK Hu Signed-off-by: Hsiao Chien Sung --- 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 8a4b68898c601..16a6fc0bbdc9e 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c @@ -278,9 +278,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; @@ -430,7 +430,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); @@ -521,8 +521,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, @@ -546,8 +545,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, @@ -711,7 +709,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 93d79a1366e91..ba985206fdd24 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 */ -- 2.18.0