From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 01C4BC5475B for ; Thu, 14 Mar 2024 03:26:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Content-ID:In-Reply-To: References:Message-ID:Date:Subject:CC:To:From:Reply-To:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Aembe5zToEBFhbMW9nwtWjosF2An3FTJfxDPgTXRI9A=; b=cHvekoZEsFIA4h iuqQ+LQsisFHdmmhAoHhlwHCB+At7LU5hNC9k52cP9XIc84o2Pl7HI+ziJqG0v8oVPmtsim766QaJ 1l4Mv++MgIvNNr9gz/eJ4ngTeANmxwDXjbIl0ekVx5EO2m1nDbH8/m+mjDLSSTc6C/OiKLcrrn4CA sM8N4zyC1JALq5OcUxiQ+T4vvbsf7MiHutHsajvbMlGETaR9swk6TtRCGqnJXnmx/i4IWyMki9jo0 jLE6JNuTLV/WSc4okZurf+H21I4RcXnmTKeI1LunTNCy5u3kZjkVW33d70+4dD73z5aZsZPQyEYR8 86T+8n9KEgch5zX4HwmA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rkbjr-0000000Cnnp-3M3J; Thu, 14 Mar 2024 03:26:39 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rkbjn-0000000Cnn7-2tzz; Thu, 14 Mar 2024 03:26:37 +0000 X-UUID: a484dd2ee1b211ee9aa9374d6d45775a-20240313 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=MIME-Version:Content-Transfer-Encoding:Content-ID:Content-Type:In-Reply-To:References:Message-ID:Date:Subject:CC:To:From; bh=3M3wLGi1MbRKIf/WpWHHuNheqhuSqSiQPcQrHtQ0+YI=; b=mKYaQ6g04m4OsrWscMSZodYdIkWvtQFp4SCMXL3NG5lFrtEEUCHRfxAzGkKs4z8lfohkW8g7K65EYv/+f4MuarDgBSWr7pIPqLv1ZyFIOlryOGaViPQwunEqUrRjXqkTa1WYRn2oLA04L0MvoJDgzXHQu9M/1toyIC5B+aLDaHo=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.37,REQID:e3092419-d8b9-4c03-a4e4-f4f7e0f9918c,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:5c4ffb84-8d4f-477b-89d2-1e3bdbef96d1,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: a484dd2ee1b211ee9aa9374d6d45775a-20240313 Received: from mtkmbs11n2.mediatek.inc [(172.21.101.187)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 377658618; Wed, 13 Mar 2024 20:26:27 -0700 Received: from mtkmbs10n1.mediatek.inc (172.21.101.34) 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; Thu, 14 Mar 2024 11:26:24 +0800 Received: from APC01-SG2-obe.outbound.protection.outlook.com (172.21.101.237) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Thu, 14 Mar 2024 11:26:23 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IZRUyHvG8O4lziU+vOM0M6ryZpSO/VtXG/ZUbDK+jTLr0KEPIH63pJawW9YSq5TdyaIgeWCvtVn3br71gxrenucErraodX5fEA9MnLRlcJBVs+cv9b/9V57x+1yPFmKKhzECJPKrigh8bWEtVrJla9sUT6BrxIFBgkR1miv7PUL6lo7bvHD+4X5M6kMyWYhkfPozlwQwmTYtW35uQY0A7vp7qJPjWNqAZSTBg59BujaaWQeKsk7Kt1qYSwj66m1LgQe02MZf9lPVoD7arX/LFUZ27h99wP3WYrH7Cfj5pGX4GmYR0+20rFP9cukr/HBm9nx7kOi0YR84hQoC4hwXag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3M3wLGi1MbRKIf/WpWHHuNheqhuSqSiQPcQrHtQ0+YI=; b=kpH7GmmQVhnKyfNxvMAHMtkvZnS7vM9WKomvb5HWBouP06i7IOewkN269e0bxDT6eBoZe7LHnHI8tgXEQNIlXqFLYJT4vZNeh1kVtA7VeSKrPCQZfeeYAJv5IMlYSiwEga+iQdmxsZJeWTlnzNuvqQveGIluAbrSluWstBJ+Iw6P/cBP+mbFkXcYXQvVaBoz5gieKQN3tgvYMbhK/Xp+dg9islbKZqFAHJn3/+Ir07fHMzN8g7VDlXOXu3hRSYgBGeXdRzwOsvwy5he+bF4a+DQuP84K4YzywiNtLiD+stfRMXQTtnoi1qR25LYF2xotYXz8rIqVaRGxhKovMdNghQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mediatek.com; dmarc=pass action=none header.from=mediatek.com; dkim=pass header.d=mediatek.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mediateko365.onmicrosoft.com; s=selector2-mediateko365-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3M3wLGi1MbRKIf/WpWHHuNheqhuSqSiQPcQrHtQ0+YI=; b=XL0P5lN5ODHxSyMVpDbURQ/9l+5kr//JDkDce6wd67d6gBUkSXFG3Neu2dM6czTDhlJqojqFHzzajG4NkMy7DC76Cg+8p1z+ptFCoIEf6gDvFhB5cZWA73mwpBOXspWC5WY6mkAAIvLbJ5ud97IQ0oypJa8Qp+2w8ZLkdaKjGUM= Received: from TYZPR03MB6624.apcprd03.prod.outlook.com (2603:1096:400:1f4::13) by TY0PR03MB8197.apcprd03.prod.outlook.com (2603:1096:405:1a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.18; Thu, 14 Mar 2024 03:26:20 +0000 Received: from TYZPR03MB6624.apcprd03.prod.outlook.com ([fe80::f3b6:91a7:e0fb:cb27]) by TYZPR03MB6624.apcprd03.prod.outlook.com ([fe80::f3b6:91a7:e0fb:cb27%7]) with mapi id 15.20.7362.031; Thu, 14 Mar 2024 03:26:19 +0000 From: =?utf-8?B?Q0sgSHUgKOiDoeS/iuWFiSk=?= To: =?utf-8?B?U2hhd24gU3VuZyAo5a6L5a2d6KyZKQ==?= , "chunkuang.hu@kernel.org" , "angelogioacchino.delregno@collabora.com" CC: "sumit.semwal@linaro.org" , "linux-mediatek@lists.infradead.org" , "linux-kernel@vger.kernel.org" , "linaro-mm-sig@lists.linaro.org" , "christian.koenig@amd.com" , "linux-media@vger.kernel.org" , "daniel@ffwll.ch" , "p.zabel@pengutronix.de" , "dri-devel@lists.freedesktop.org" , "shawn.sung@mediatek.corp-partner.google.com" , "airlied@gmail.com" , "linux-arm-kernel@lists.infradead.org" , "matthias.bgg@gmail.com" Subject: Re: [PATCH 01/11] drm/mediatek: Rename "mtk_drm_crtc" to "mtk_crtc" Thread-Topic: [PATCH 01/11] drm/mediatek: Rename "mtk_drm_crtc" to "mtk_crtc" Thread-Index: AQHaaJEoGO2Ekiv/8Ea06XKiNSQcAbE2rZ+A Date: Thu, 14 Mar 2024 03:26:19 +0000 Message-ID: <3ff67cb199818415d5e884b9927ae42fd8b9e6ea.camel@mediatek.com> References: <20240226085059.26850-1-shawn.sung@mediatek.com> <20240226085059.26850-2-shawn.sung@mediatek.com> In-Reply-To: <20240226085059.26850-2-shawn.sung@mediatek.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=mediatek.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: TYZPR03MB6624:EE_|TY0PR03MB8197:EE_ x-ms-office365-filtering-correlation-id: 15449a65-8e28-4600-5d5b-08dc43d68402 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 1Yc76hNFvk8UnQejVtvc3XcrIQnoMRguXC6Ju6knhwAGTICrSidOjcv0c8dZeQGORUgkcOewyej3sVuLYiyTWFFPqAH/dN9IY0qkITs7KotHk5d8GRPqcFEoA5zEPuEPEpWiYxh1spiK38AsA8iM1Nig1fV6xA8qpVVk6TBx7gjFOGbtY8a2DPDg66oTUB4SWDTAm2AaPv5MoVgKnIXwo9T+oZ6EMHsZO1lV1iKyqd3634gGCHk4PI0Tc176kRD9kpku54yIft4ZzLxapwk6xZSdM6wY4QkJrlL3k23fSr2SD0EJJS2C8lkpK4Ybj32TigMAAoQC7HB6fp0x2Hf8ghIMvzyjD5/a+ZhHL04vY6hK4LccJAO/Z0JBvxkrETQYphjVvHT9jVohJVB8j5Tjr5PeHW53HHIBlkbA7lfiehcocWC7ZavHdOcwIi3eWvSUMuDWcVl/fkh2PNjJDuy6SG3lgU0D0mTDCQGsOCcWyZqDB42x8rcgWL87dLMJIZJg1Bzbei0Gi9sNg0aPr4xo3Dj5MOXYmGCeoLj9wpSt0wxqdIl8Vvnyt54zS0q71juDGqbCJS8kE4mw11RQ4Ul3Vdvn+Mgmeo5NI2ArIY6h9GuBQ95kyOBSrmvDdFF3qQLo9ruXbPk8Utw0GZyuCaDcENq07r+KNEg6dirvCGC2puybAkGnYWUXWBNQYNUkdW5lRPoUF5iQ5OpzBPhVU5+a1efiilH/wk6qgp8KcPy1tSI= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYZPR03MB6624.apcprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(7416005)(1800799015)(376005)(38070700009);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?SDRvSHNaNHhLOTlsSUU4S0ZCcHNMS05vTmNSS0VINGxiYkNUQTRaUXFnajR1?= =?utf-8?B?bjZkN1pUT0VjbSttZkljMUxOZzFZNzhWVmZBYWpzeURnYVc0R3ZqKzV3bUxv?= =?utf-8?B?Mm9DSXk5alh0dkI2NGNVYno5Vk4rK25hUEVZUDJtM0h2Z1pUcmdOYzlVb3F5?= =?utf-8?B?UkNCemZteEx1S2pqT0loQUlMT1g3cTAxYUNyT2NFNFplbHVrMjVmT0huSUZY?= =?utf-8?B?dVZQWmxyVVlXY0k3VGNRdzdmOUVXMHJZOFo0T1RhbGQ3Wm1nRDdxSFR1UFh5?= =?utf-8?B?N1FuRHkyL0t0dVBXTzE2c2xLU3piQTBtNVM0T0ljZW9CeUR6bElROXd6RXZh?= =?utf-8?B?VktVMnYvaS9vaSsxdnZqY1VyNGtLaXFnVzB6Q0p3aGt2L1Z1cHB4Ym9iYlQ2?= =?utf-8?B?VDBSVnp3VTJiNEdQMFBwQkFIQ2I3eUw5TUh5ckZiUXFNSGwvN2NsN2ozTGtJ?= =?utf-8?B?cHJmWGxCMkFlOVRPdlRmcnNzOWROeXUyVDZVSS8vcUZ1S1ZvYVpPcGJHZWgw?= =?utf-8?B?U1lLRmxiRkFhUGVidzVVOXIrbFh4WVpzdkdjaTJyUXBTRmlCQUN0bzQyMzRR?= =?utf-8?B?TUhTQi9ObDNNNkJHV1o5TU9IZncyOExRcEhOQml0cmdRbmZRenZ4LzJlLyts?= =?utf-8?B?UlVNNE5CenBmSkNZV2JRelp3OGpOcTJyWmhaOEUwZisrampBMml0Rm5qNFl2?= =?utf-8?B?VW9KdmJHTmkxVFpQTGl3RHhXRFhvYmR5bUlkSXhzejFVSW9neVIvYnFuSU1v?= =?utf-8?B?eTR3MUt4VTlTMzVaOGQ0c25sZmc0b0htOGpCVnhDbmNjeXJsTzNmeFc1UitF?= =?utf-8?B?ZXNsOUpsQ0lZWG5nNkQvK2Rqb3B4WFE0cmJYSXNhVnpxWlcwcUNZTnVsZkxu?= =?utf-8?B?Z0tDQVhibWZZa2NPZUR1ajBQLzVyZmZSWlpSZm5IQ0pHVEVGcDhDekpuczJH?= =?utf-8?B?K0tSd09oYnlBSUQ4eDVmYThla2V1YjZZbzRsTjF3dEZkVXlKdXQvc3E2MkZL?= =?utf-8?B?SmRpNFRsSWxDV3BldDlWMkRodTB6K2dwV0RyeEdzZi9JN3ZEUlo5SU5EbDJk?= =?utf-8?B?bUFoOXR5eHBYR3FyWE40TFZmN1Y4KzhnRVJQc2h4ZDgxK280eG1qbytYaDNO?= =?utf-8?B?djRFb05sOWFjVWw2T1dwQ1dFZVhOUXlOd3ZNU1l1Um1jRSt0NzZ6MC9tRGhE?= =?utf-8?B?MUxIMkRId0RYcDEzLzNVa1NkWUMxcFVRM0lPNkhrRzlub0NJUnJiVUNvdC9S?= =?utf-8?B?TmlMV1c5OXN2eUZTamExMDZValM4SzFHK1hiREtFMnRaSU1FQk0zelp5QlpN?= =?utf-8?B?bkM3dmNWOUZBMzM0WGMyS0Y5YXpETTUvTmhvcWFqV0VrQ0RsbUovamdTTHMx?= =?utf-8?B?dGtzcFRmL3JKcndFZ1h0SjhlVEJuVmlDVmlpR3JOY1kxNEN3bkcwdUFXZXZo?= =?utf-8?B?RWU0T2UwbFhvcXMxMmxzV1ZHUml3bEtBSE9VbEdneUhFSGp3RVF6YkxEK0gr?= =?utf-8?B?YisremwwQ1lLOHNKV01UdG1rSnAzeGg5QjAzamRzMU5aOEMxems0VlJHMmpj?= =?utf-8?B?S0d1NVpCNEluMFZrVnladlJEaVZ4NERSOVdjTlJQZ1JrYVltMG5EUUVCTjNr?= =?utf-8?B?dGdqMkNlZElvWnVIcjVTK3FmcmpwNXA5b2xsc0txZDlRVE8vUmxiQUF1emlv?= =?utf-8?B?cFlKQmJrODlNMmIwU3VXTzI2M2VmWVNwRjhtRmRlMjFCd3FuRzdVd05ZY3Fk?= =?utf-8?B?ekp1R1dxVkIrVUJDa1N2cndjdTM1TkNMaDZxMnhUZm1nWEVzcEtLK2MveHpE?= =?utf-8?B?ZjV1OWZFZUZGeHJZcXg4Y1V1R0FwR3pGRU5STmtKL09ySm9Tc1FQL2xIQTJq?= =?utf-8?B?bHc1amdFcytjeTlRSVlXZzVQRWlLS2kxZVJrNGxWQW1SQ2NCN3BYbjV3Qk1P?= =?utf-8?B?OWtrU2NHUWFQUWhSSjZsa01TNDJhc1YxeER1ay9ZWmRLVk8wMU1saXJqVyt0?= =?utf-8?B?cXFQVEJwcmZtZk5sQmJVOHpUTjdOUWJHU1gzSnNGZEMwNk1JZGZrNEFsa1ph?= =?utf-8?B?S1FtSVd3VHdERkY0QXlZTjQ4QTl4c25CRGhZQWlwY0IvVFhhYW96NjRQNFZo?= =?utf-8?Q?SAfXSoSRwIfK+F1d/HwF+AH4H?= Content-ID: <801916F47A4BA646A4DC26A22C7090B7@apcprd03.prod.outlook.com> MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TYZPR03MB6624.apcprd03.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 15449a65-8e28-4600-5d5b-08dc43d68402 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Mar 2024 03:26:19.6347 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a7687ede-7a6b-4ef6-bace-642f677fbe31 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: d2V/rCf1q/akMIxek/yr/SQmO7g91cjX45W5uYdonGOkr2FBvm+a4hdVek78EJxwStZrm4K7iuSUmeCmK+7O1g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY0PR03MB8197 X-TM-AS-Product-Ver: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-AS-Result: No-10--17.160100-8.000000 X-TMASE-MatchedRID: Jm7Yxmmj9On+DXQl7XSOUt7SWiiWSV/1jLOy13Cgb49qSjxROy+AU3a2 v7MgC776yAUgFH8TZu7Ddw4qHopkTB2xw+/E2etAQpxiLlDD9FW/yN2q8U674sRd6VScTqylxsr 6m7RljBGBpNX44QA4FnF5zpucqy2iJBVW14/3QK0D2WXLXdz+AQVksFXF7ERlsy/PerNdPBnWK1 xixsVQ/HcL0cb0qMYcnUFFZxtBJb6QqMvYg6LYsAOa3TYC1j5CXru95hSuhjS/wPtA9baOj5K5l UHMd8YxvX+3OiqxW1m5IuNFDAv4qPGU4m5A0eV9Dko+EYiDQxEK3n1SHen81TvquqZAZLBPH+9N xCXWsGgDo2mr8q4cyXMPxAree1voEMLyFlMqyFvJ5W6OZe5hha6JG5H2YJq6B2iWkpIudpYkRNZ f+kpyzmsRPSp/FWsqgiJroqebj3WIwQxjX3ChzLMjW/sniEQK+LidURF+DB0Ul9bvAS7WQCpHtF tT8N+EdqCclJTIH6gdjcJQBafotUL9tcyTZdAsgxsfzkNRlfKx5amWK2anSPoLR4+zsDTt/KO2L NTSuGMmO0aqp2SMy55iMXzyJgBVFm25/Bau2shpapOedEpwtg== X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--17.160100-8.000000 X-TMASE-Version: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-SNTS-SMTP: 0342635ECC93E0D0DB053F8961B5927F895E2D877A536C29B7A363536A9363132000:8 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240313_202635_801834_F7A1BA2A X-CRM114-Status: GOOD ( 16.43 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi, Shawn: On Mon, 2024-02-26 at 16:50 +0800, Shawn Sung wrote: > 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 Reviewed-by: CK Hu > > Signed-off-by: Hsiao Chien Sung < > shawn.sung@mediatek.corp-partner.google.com> > --- > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 186 +++++++++++-------- > ---- > drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 30 ++-- > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 18 +-- > drivers/gpu/drm/mediatek/mtk_drm_drv.h | 2 +- > drivers/gpu/drm/mediatek/mtk_drm_plane.c | 10 +- > drivers/gpu/drm/mediatek/mtk_dsi.c | 2 +- > 6 files changed, 121 insertions(+), 127 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > index 3b55c7a68bde..fe965ad7d282 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > @@ -26,7 +26,7 @@ > #include "mtk_drm_plane.h" > > /* > - * struct mtk_drm_crtc - MediaTek specific crtc structure. > + * struct mtk_crtc - MediaTek specific crtc structure. > * @base: crtc object. > * @enabled: records whether crtc_enable succeeded > * @planes: array of 4 drm_plane structures, one for each overlay > plane > @@ -38,7 +38,7 @@ > * > * TODO: Needs update: this header is missing a bunch of member > descriptions. > */ > -struct mtk_drm_crtc { > +struct mtk_crtc { > struct drm_crtc base; > bool enabled; > > @@ -80,9 +80,9 @@ struct mtk_crtc_state { > unsigned int pending_vrefresh; > }; > > -static inline struct mtk_drm_crtc *to_mtk_crtc(struct drm_crtc *c) > +static inline struct mtk_crtc *to_mtk_crtc(struct drm_crtc *c) > { > - return container_of(c, struct mtk_drm_crtc, base); > + return container_of(c, struct mtk_crtc, base); > } > > static inline struct mtk_crtc_state *to_mtk_crtc_state(struct > drm_crtc_state *s) > @@ -90,7 +90,7 @@ static inline struct mtk_crtc_state > *to_mtk_crtc_state(struct drm_crtc_state *s) > return container_of(s, struct mtk_crtc_state, base); > } > > -static void mtk_drm_crtc_finish_page_flip(struct mtk_drm_crtc > *mtk_crtc) > +static void mtk_crtc_finish_page_flip(struct mtk_crtc *mtk_crtc) > { > struct drm_crtc *crtc = &mtk_crtc->base; > unsigned long flags; > @@ -102,11 +102,11 @@ static void > mtk_drm_crtc_finish_page_flip(struct mtk_drm_crtc *mtk_crtc) > spin_unlock_irqrestore(&crtc->dev->event_lock, flags); > } > > -static void mtk_drm_finish_page_flip(struct mtk_drm_crtc *mtk_crtc) > +static void mtk_drm_finish_page_flip(struct mtk_crtc *mtk_crtc) > { > drm_crtc_handle_vblank(&mtk_crtc->base); > if (!mtk_crtc->config_updating && mtk_crtc- > >pending_needs_vblank) { > - mtk_drm_crtc_finish_page_flip(mtk_crtc); > + mtk_crtc_finish_page_flip(mtk_crtc); > mtk_crtc->pending_needs_vblank = false; > } > } > @@ -149,9 +149,9 @@ static void mtk_drm_cmdq_pkt_destroy(struct > cmdq_pkt *pkt) > } > #endif > > -static void mtk_drm_crtc_destroy(struct drm_crtc *crtc) > +static void mtk_crtc_destroy(struct drm_crtc *crtc) > { > - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); > + struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc); > int i; > > mtk_mutex_put(mtk_crtc->mutex); > @@ -174,7 +174,7 @@ static void mtk_drm_crtc_destroy(struct drm_crtc > *crtc) > drm_crtc_cleanup(crtc); > } > > -static void mtk_drm_crtc_reset(struct drm_crtc *crtc) > +static void mtk_crtc_reset(struct drm_crtc *crtc) > { > struct mtk_crtc_state *state; > > @@ -189,7 +189,7 @@ static void mtk_drm_crtc_reset(struct drm_crtc > *crtc) > __drm_atomic_helper_crtc_reset(crtc, &state->base); > } > > -static struct drm_crtc_state *mtk_drm_crtc_duplicate_state(struct > drm_crtc *crtc) > +static struct drm_crtc_state *mtk_crtc_duplicate_state(struct > drm_crtc *crtc) > { > struct mtk_crtc_state *state; > > @@ -206,18 +206,17 @@ static struct drm_crtc_state > *mtk_drm_crtc_duplicate_state(struct drm_crtc *crtc > return &state->base; > } > > -static void mtk_drm_crtc_destroy_state(struct drm_crtc *crtc, > - struct drm_crtc_state *state) > +static void mtk_crtc_destroy_state(struct drm_crtc *crtc, > + struct drm_crtc_state *state) > { > __drm_atomic_helper_crtc_destroy_state(state); > kfree(to_mtk_crtc_state(state)); > } > > static enum drm_mode_status > -mtk_drm_crtc_mode_valid(struct drm_crtc *crtc, > - const struct drm_display_mode *mode) > +mtk_crtc_mode_valid(struct drm_crtc *crtc, const struct > drm_display_mode *mode) > { > - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); > + struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc); > enum drm_mode_status status = MODE_OK; > int i; > > @@ -229,15 +228,15 @@ mtk_drm_crtc_mode_valid(struct drm_crtc *crtc, > return status; > } > > -static bool mtk_drm_crtc_mode_fixup(struct drm_crtc *crtc, > - const struct drm_display_mode > *mode, > - struct drm_display_mode > *adjusted_mode) > +static bool mtk_crtc_mode_fixup(struct drm_crtc *crtc, > + const struct drm_display_mode *mode, > + struct drm_display_mode *adjusted_mode) > { > /* Nothing to do here, but this callback is mandatory. */ > return true; > } > > -static void mtk_drm_crtc_mode_set_nofb(struct drm_crtc *crtc) > +static void mtk_crtc_mode_set_nofb(struct drm_crtc *crtc) > { > struct mtk_crtc_state *state = to_mtk_crtc_state(crtc->state); > > @@ -248,7 +247,7 @@ static void mtk_drm_crtc_mode_set_nofb(struct > drm_crtc *crtc) > state->pending_config = true; > } > > -static int mtk_crtc_ddp_clk_enable(struct mtk_drm_crtc *mtk_crtc) > +static int mtk_crtc_ddp_clk_enable(struct mtk_crtc *mtk_crtc) > { > int ret; > int i; > @@ -268,7 +267,7 @@ static int mtk_crtc_ddp_clk_enable(struct > mtk_drm_crtc *mtk_crtc) > return ret; > } > > -static void mtk_crtc_ddp_clk_disable(struct mtk_drm_crtc *mtk_crtc) > +static void mtk_crtc_ddp_clk_disable(struct mtk_crtc *mtk_crtc) > { > int i; > > @@ -281,7 +280,7 @@ struct mtk_ddp_comp > *mtk_drm_ddp_comp_for_plane(struct drm_crtc *crtc, > struct drm_plane > *plane, > unsigned int > *local_layer) > { > - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); > + struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc); > struct mtk_ddp_comp *comp; > int i, count = 0; > unsigned int local_index = plane - mtk_crtc->planes; > @@ -304,7 +303,7 @@ static void ddp_cmdq_cb(struct mbox_client *cl, > void *mssg) > { > struct cmdq_cb_data *data = mssg; > struct cmdq_client *cmdq_cl = container_of(cl, struct > cmdq_client, client); > - struct mtk_drm_crtc *mtk_crtc = container_of(cmdq_cl, struct > mtk_drm_crtc, cmdq_client); > + struct mtk_crtc *mtk_crtc = container_of(cmdq_cl, struct > mtk_crtc, cmdq_client); > struct mtk_crtc_state *state; > unsigned int i; > > @@ -344,7 +343,7 @@ static void ddp_cmdq_cb(struct mbox_client *cl, > void *mssg) > } > #endif > > -static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc) > +static int mtk_crtc_ddp_hw_init(struct mtk_crtc *mtk_crtc) > { > struct drm_crtc *crtc = &mtk_crtc->base; > struct drm_connector *connector; > @@ -444,7 +443,7 @@ static int mtk_crtc_ddp_hw_init(struct > mtk_drm_crtc *mtk_crtc) > return ret; > } > > -static void mtk_crtc_ddp_hw_fini(struct mtk_drm_crtc *mtk_crtc) > +static void mtk_crtc_ddp_hw_fini(struct mtk_crtc *mtk_crtc) > { > struct drm_device *drm = mtk_crtc->base.dev; > struct drm_crtc *crtc = &mtk_crtc->base; > @@ -489,7 +488,7 @@ static void mtk_crtc_ddp_hw_fini(struct > mtk_drm_crtc *mtk_crtc) > static void mtk_crtc_ddp_config(struct drm_crtc *crtc, > struct cmdq_pkt *cmdq_handle) > { > - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); > + struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc); > struct mtk_crtc_state *state = to_mtk_crtc_state(mtk_crtc- > >base.state); > struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0]; > unsigned int i; > @@ -561,8 +560,7 @@ static void mtk_crtc_ddp_config(struct drm_crtc > *crtc, > } > } > > -static void mtk_drm_crtc_update_config(struct mtk_drm_crtc > *mtk_crtc, > - bool needs_vblank) > +static void mtk_crtc_update_config(struct mtk_crtc *mtk_crtc, bool > needs_vblank) > { > #if IS_REACHABLE(CONFIG_MTK_CMDQ) > struct cmdq_pkt *cmdq_handle = &mtk_crtc->cmdq_handle; > @@ -634,7 +632,7 @@ static void mtk_drm_crtc_update_config(struct > mtk_drm_crtc *mtk_crtc, > static void mtk_crtc_ddp_irq(void *data) > { > struct drm_crtc *crtc = data; > - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); > + struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc); > struct mtk_drm_private *priv = crtc->dev->dev_private; > > #if IS_REACHABLE(CONFIG_MTK_CMDQ) > @@ -650,9 +648,9 @@ static void mtk_crtc_ddp_irq(void *data) > mtk_drm_finish_page_flip(mtk_crtc); > } > > -static int mtk_drm_crtc_enable_vblank(struct drm_crtc *crtc) > +static int mtk_crtc_enable_vblank(struct drm_crtc *crtc) > { > - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); > + struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc); > struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0]; > > mtk_ddp_comp_enable_vblank(comp); > @@ -660,22 +658,22 @@ static int mtk_drm_crtc_enable_vblank(struct > drm_crtc *crtc) > return 0; > } > > -static void mtk_drm_crtc_disable_vblank(struct drm_crtc *crtc) > +static void mtk_crtc_disable_vblank(struct drm_crtc *crtc) > { > - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); > + struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc); > struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0]; > > mtk_ddp_comp_disable_vblank(comp); > } > > -static void mtk_drm_crtc_update_output(struct drm_crtc *crtc, > - struct drm_atomic_state *state) > +static void mtk_crtc_update_output(struct drm_crtc *crtc, > + struct drm_atomic_state *state) > { > int crtc_index = drm_crtc_index(crtc); > int i; > struct device *dev; > struct drm_crtc_state *crtc_state = state- > >crtcs[crtc_index].new_state; > - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); > + struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc); > struct mtk_drm_private *priv; > unsigned int encoder_mask = crtc_state->encoder_mask; > > @@ -705,8 +703,8 @@ static void mtk_drm_crtc_update_output(struct > drm_crtc *crtc, > } > } > > -int mtk_drm_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane > *plane, > - struct mtk_plane_state *state) > +int mtk_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane > *plane, > + struct mtk_plane_state *state) > { > unsigned int local_layer; > struct mtk_ddp_comp *comp; > @@ -717,21 +715,21 @@ int mtk_drm_crtc_plane_check(struct drm_crtc > *crtc, struct drm_plane *plane, > return 0; > } > > -void mtk_drm_crtc_async_update(struct drm_crtc *crtc, struct > drm_plane *plane, > - struct drm_atomic_state *state) > +void mtk_crtc_async_update(struct drm_crtc *crtc, struct drm_plane > *plane, > + struct drm_atomic_state *state) > { > - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); > + struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc); > > if (!mtk_crtc->enabled) > return; > > - mtk_drm_crtc_update_config(mtk_crtc, false); > + mtk_crtc_update_config(mtk_crtc, false); > } > > -static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc, > - struct drm_atomic_state *state) > +static void mtk_crtc_atomic_enable(struct drm_crtc *crtc, > + struct drm_atomic_state *state) > { > - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); > + struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc); > struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0]; > int ret; > > @@ -743,7 +741,7 @@ static void mtk_drm_crtc_atomic_enable(struct > drm_crtc *crtc, > return; > } > > - mtk_drm_crtc_update_output(crtc, state); > + mtk_crtc_update_output(crtc, state); > > ret = mtk_crtc_ddp_hw_init(mtk_crtc); > if (ret) { > @@ -755,10 +753,10 @@ static void mtk_drm_crtc_atomic_enable(struct > drm_crtc *crtc, > mtk_crtc->enabled = true; > } > > -static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc, > - struct drm_atomic_state *state) > +static void mtk_crtc_atomic_disable(struct drm_crtc *crtc, > + struct drm_atomic_state *state) > { > - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); > + struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc); > struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0]; > int i; > > @@ -777,7 +775,7 @@ static void mtk_drm_crtc_atomic_disable(struct > drm_crtc *crtc, > } > mtk_crtc->pending_planes = true; > > - mtk_drm_crtc_update_config(mtk_crtc, false); > + mtk_crtc_update_config(mtk_crtc, false); > #if IS_REACHABLE(CONFIG_MTK_CMDQ) > /* Wait for planes to be disabled by cmdq */ > if (mtk_crtc->cmdq_client.chan) > @@ -795,13 +793,13 @@ static void mtk_drm_crtc_atomic_disable(struct > drm_crtc *crtc, > mtk_crtc->enabled = false; > } > > -static void mtk_drm_crtc_atomic_begin(struct drm_crtc *crtc, > - struct drm_atomic_state *state) > +static void mtk_crtc_atomic_begin(struct drm_crtc *crtc, > + struct drm_atomic_state *state) > { > struct drm_crtc_state *crtc_state = > drm_atomic_get_new_crtc_state(state, > > crtc); > struct mtk_crtc_state *mtk_crtc_state = > to_mtk_crtc_state(crtc_state); > - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); > + struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc); > unsigned long flags; > > if (mtk_crtc->event && mtk_crtc_state->base.event) > @@ -819,10 +817,10 @@ static void mtk_drm_crtc_atomic_begin(struct > drm_crtc *crtc, > } > } > > -static void mtk_drm_crtc_atomic_flush(struct drm_crtc *crtc, > - struct drm_atomic_state *state) > +static void mtk_crtc_atomic_flush(struct drm_crtc *crtc, > + struct drm_atomic_state *state) > { > - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); > + struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc); > int i; > > if (crtc->state->color_mgmt_changed) > @@ -830,33 +828,32 @@ static void mtk_drm_crtc_atomic_flush(struct > drm_crtc *crtc, > mtk_ddp_gamma_set(mtk_crtc->ddp_comp[i], crtc- > >state); > mtk_ddp_ctm_set(mtk_crtc->ddp_comp[i], crtc- > >state); > } > - mtk_drm_crtc_update_config(mtk_crtc, !!mtk_crtc->event); > + mtk_crtc_update_config(mtk_crtc, !!mtk_crtc->event); > } > > static const struct drm_crtc_funcs mtk_crtc_funcs = { > .set_config = drm_atomic_helper_set_config, > .page_flip = drm_atomic_helper_page_flip, > - .destroy = mtk_drm_crtc_destroy, > - .reset = mtk_drm_crtc_reset, > - .atomic_duplicate_state = mtk_drm_crtc_duplicate_state, > - .atomic_destroy_state = mtk_drm_crtc_destroy_state, > - .enable_vblank = mtk_drm_crtc_enable_vblank, > - .disable_vblank = mtk_drm_crtc_disable_vblank, > + .destroy = mtk_crtc_destroy, > + .reset = mtk_crtc_reset, > + .atomic_duplicate_state = mtk_crtc_duplicate_state, > + .atomic_destroy_state = mtk_crtc_destroy_state, > + .enable_vblank = mtk_crtc_enable_vblank, > + .disable_vblank = mtk_crtc_disable_vblank, > }; > > static const struct drm_crtc_helper_funcs mtk_crtc_helper_funcs = { > - .mode_fixup = mtk_drm_crtc_mode_fixup, > - .mode_set_nofb = mtk_drm_crtc_mode_set_nofb, > - .mode_valid = mtk_drm_crtc_mode_valid, > - .atomic_begin = mtk_drm_crtc_atomic_begin, > - .atomic_flush = mtk_drm_crtc_atomic_flush, > - .atomic_enable = mtk_drm_crtc_atomic_enable, > - .atomic_disable = mtk_drm_crtc_atomic_disable, > + .mode_fixup = mtk_crtc_mode_fixup, > + .mode_set_nofb = mtk_crtc_mode_set_nofb, > + .mode_valid = mtk_crtc_mode_valid, > + .atomic_begin = mtk_crtc_atomic_begin, > + .atomic_flush = mtk_crtc_atomic_flush, > + .atomic_enable = mtk_crtc_atomic_enable, > + .atomic_disable = mtk_crtc_atomic_disable, > }; > > -static int mtk_drm_crtc_init(struct drm_device *drm, > - struct mtk_drm_crtc *mtk_crtc, > - unsigned int pipe) > +static int mtk_crtc_init(struct drm_device *drm, struct mtk_crtc > *mtk_crtc, > + unsigned int pipe) > { > struct drm_plane *primary = NULL; > struct drm_plane *cursor = NULL; > @@ -883,8 +880,7 @@ static int mtk_drm_crtc_init(struct drm_device > *drm, > return ret; > } > > -static int mtk_drm_crtc_num_comp_planes(struct mtk_drm_crtc > *mtk_crtc, > - int comp_idx) > +static int mtk_crtc_num_comp_planes(struct mtk_crtc *mtk_crtc, int > comp_idx) > { > struct mtk_ddp_comp *comp; > > @@ -902,8 +898,8 @@ static int mtk_drm_crtc_num_comp_planes(struct > mtk_drm_crtc *mtk_crtc, > } > > static inline > -enum drm_plane_type mtk_drm_crtc_plane_type(unsigned int plane_idx, > - unsigned int num_planes) > +enum drm_plane_type mtk_crtc_plane_type(unsigned int plane_idx, > + unsigned int num_planes) > { > if (plane_idx == 0) > return DRM_PLANE_TYPE_PRIMARY; > @@ -914,11 +910,11 @@ enum drm_plane_type > mtk_drm_crtc_plane_type(unsigned int plane_idx, > > } > > -static int mtk_drm_crtc_init_comp_planes(struct drm_device *drm_dev, > - struct mtk_drm_crtc *mtk_crtc, > - int comp_idx, int pipe) > +static int mtk_crtc_init_comp_planes(struct drm_device *drm_dev, > + struct mtk_crtc *mtk_crtc, > + int comp_idx, int pipe) > { > - int num_planes = mtk_drm_crtc_num_comp_planes(mtk_crtc, > comp_idx); > + int num_planes = mtk_crtc_num_comp_planes(mtk_crtc, comp_idx); > struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[comp_idx]; > int i, ret; > > @@ -926,8 +922,7 @@ static int mtk_drm_crtc_init_comp_planes(struct > drm_device *drm_dev, > ret = mtk_plane_init(drm_dev, > &mtk_crtc->planes[mtk_crtc->layer_nr], > BIT(pipe), > - mtk_drm_crtc_plane_type(mtk_crtc- > >layer_nr, > - num_planes), > + mtk_crtc_plane_type(mtk_crtc->layer_nr, > num_planes), > mtk_ddp_comp_supported_rotations(comp), > mtk_ddp_comp_get_formats(comp), > mtk_ddp_comp_get_num_formats(comp)); > @@ -939,9 +934,9 @@ static int mtk_drm_crtc_init_comp_planes(struct > drm_device *drm_dev, > return 0; > } > > -struct device *mtk_drm_crtc_dma_dev_get(struct drm_crtc *crtc) > +struct device *mtk_crtc_dma_dev_get(struct drm_crtc *crtc) > { > - struct mtk_drm_crtc *mtk_crtc = NULL; > + struct mtk_crtc *mtk_crtc = NULL; > > if (!crtc) > return NULL; > @@ -953,14 +948,14 @@ struct device *mtk_drm_crtc_dma_dev_get(struct > drm_crtc *crtc) > return mtk_crtc->dma_dev; > } > > -int mtk_drm_crtc_create(struct drm_device *drm_dev, > - const unsigned int *path, unsigned int > path_len, > - int priv_data_index, const struct mtk_drm_route > *conn_routes, > - unsigned int num_conn_routes) > +int mtk_crtc_create(struct drm_device *drm_dev, const unsigned int > *path, > + unsigned int path_len, int priv_data_index, > + const struct mtk_drm_route *conn_routes, > + unsigned int num_conn_routes) > { > struct mtk_drm_private *priv = drm_dev->dev_private; > struct device *dev = drm_dev->dev; > - struct mtk_drm_crtc *mtk_crtc; > + struct mtk_crtc *mtk_crtc; > unsigned int num_comp_planes = 0; > int ret; > int i; > @@ -1045,7 +1040,7 @@ int mtk_drm_crtc_create(struct drm_device > *drm_dev, > } > > for (i = 0; i < mtk_crtc->ddp_comp_nr; i++) > - num_comp_planes += > mtk_drm_crtc_num_comp_planes(mtk_crtc, i); > + num_comp_planes += mtk_crtc_num_comp_planes(mtk_crtc, > i); > > mtk_crtc->planes = devm_kcalloc(dev, num_comp_planes, > sizeof(struct drm_plane), > GFP_KERNEL); > @@ -1053,8 +1048,7 @@ int mtk_drm_crtc_create(struct drm_device > *drm_dev, > return -ENOMEM; > > for (i = 0; i < mtk_crtc->ddp_comp_nr; i++) { > - ret = mtk_drm_crtc_init_comp_planes(drm_dev, mtk_crtc, > i, > - crtc_i); > + ret = mtk_crtc_init_comp_planes(drm_dev, mtk_crtc, i, > crtc_i); > if (ret) > return ret; > } > @@ -1066,7 +1060,7 @@ int mtk_drm_crtc_create(struct drm_device > *drm_dev, > */ > mtk_crtc->dma_dev = mtk_ddp_comp_dma_dev_get(&priv- > >ddp_comp[path[0]]); > > - ret = mtk_drm_crtc_init(drm_dev, mtk_crtc, crtc_i); > + ret = mtk_crtc_init(drm_dev, mtk_crtc, crtc_i); > if (ret < 0) > return ret; > > @@ -1136,7 +1130,7 @@ int mtk_drm_crtc_create(struct drm_device > *drm_dev, > mtk_crtc->num_conn_routes = num_conn_routes; > mtk_crtc->conn_routes = conn_routes; > > - /* increase ddp_comp_nr at the end of > mtk_drm_crtc_create */ > + /* increase ddp_comp_nr at the end of mtk_crtc_create > */ > mtk_crtc->ddp_comp_nr++; > } > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h > b/drivers/gpu/drm/mediatek/mtk_drm_crtc.h > index 1f988ff1bf9f..f081c54a349b 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h > +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.h > @@ -3,8 +3,8 @@ > * Copyright (c) 2015 MediaTek Inc. > */ > > -#ifndef MTK_DRM_CRTC_H > -#define MTK_DRM_CRTC_H > +#ifndef MTK_CRTC_H > +#define MTK_CRTC_H > > #include > #include "mtk_drm_ddp_comp.h" > @@ -14,17 +14,17 @@ > #define MTK_MAX_BPC 10 > #define MTK_MIN_BPC 3 > > -void mtk_drm_crtc_commit(struct drm_crtc *crtc); > -int mtk_drm_crtc_create(struct drm_device *drm_dev, > - const unsigned int *path, > - unsigned int path_len, > - int priv_data_index, > - const struct mtk_drm_route *conn_routes, > - unsigned int num_conn_routes); > -int mtk_drm_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane > *plane, > - struct mtk_plane_state *state); > -void mtk_drm_crtc_async_update(struct drm_crtc *crtc, struct > drm_plane *plane, > - struct drm_atomic_state *plane_state); > -struct device *mtk_drm_crtc_dma_dev_get(struct drm_crtc *crtc); > +void mtk_crtc_commit(struct drm_crtc *crtc); > +int mtk_crtc_create(struct drm_device *drm_dev, > + const unsigned int *path, > + unsigned int path_len, > + int priv_data_index, > + const struct mtk_drm_route *conn_routes, > + unsigned int num_conn_routes); > +int mtk_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane > *plane, > + struct mtk_plane_state *state); > +void mtk_crtc_async_update(struct drm_crtc *crtc, struct drm_plane > *plane, > + struct drm_atomic_state *plane_state); > +struct device *mtk_crtc_dma_dev_get(struct drm_crtc *crtc); > > -#endif /* MTK_DRM_CRTC_H */ > +#endif /* MTK_CRTC_H */ > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > index 74832c213092..c46773569b3c 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > @@ -494,24 +494,24 @@ static int mtk_drm_kms_init(struct drm_device > *drm) > priv_n = private->all_drm_private[j]; > > if (i == CRTC_MAIN && priv_n->data->main_len) { > - ret = mtk_drm_crtc_create(drm, priv_n- > >data->main_path, > - priv_n->data- > >main_len, j, > - priv_n->data- > >conn_routes, > - priv_n->data- > >num_conn_routes); > + ret = mtk_crtc_create(drm, priv_n- > >data->main_path, > + priv_n->data- > >main_len, j, > + priv_n->data- > >conn_routes, > + priv_n->data- > >num_conn_routes); > if (ret) > goto err_component_unbind; > > continue; > } else if (i == CRTC_EXT && priv_n->data- > >ext_len) { > - ret = mtk_drm_crtc_create(drm, priv_n- > >data->ext_path, > - priv_n->data- > >ext_len, j, NULL, 0); > + ret = mtk_crtc_create(drm, priv_n- > >data->ext_path, > + priv_n->data- > >ext_len, j, NULL, 0); > if (ret) > goto err_component_unbind; > > continue; > } else if (i == CRTC_THIRD && priv_n->data- > >third_len) { > - ret = mtk_drm_crtc_create(drm, priv_n- > >data->third_path, > - priv_n->data- > >third_len, j, NULL, 0); > + ret = mtk_crtc_create(drm, priv_n- > >data->third_path, > + priv_n->data- > >third_len, j, NULL, 0); > if (ret) > goto err_component_unbind; > > @@ -523,7 +523,7 @@ static int mtk_drm_kms_init(struct drm_device > *drm) > /* Use OVL device for all DMA memory allocations */ > crtc = drm_crtc_from_index(drm, 0); > if (crtc) > - dma_dev = mtk_drm_crtc_dma_dev_get(crtc); > + dma_dev = mtk_crtc_dma_dev_get(crtc); > if (!dma_dev) { > ret = -ENODEV; > dev_err(drm->dev, "Need at least one OVL device\n"); > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h > b/drivers/gpu/drm/mediatek/mtk_drm_drv.h > index 33fadb08dc1c..24c4d59085bd 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h > @@ -13,7 +13,7 @@ > #define DDP_COMPONENT_DRM_OVL_ADAPTOR (DDP_COMPONENT_ID_MAX + 1) > #define DDP_COMPONENT_DRM_ID_MAX (DDP_COMPONENT_DRM_OVL_ADAPTOR + 1) > > -enum mtk_drm_crtc_path { > +enum mtk_crtc_path { > CRTC_MAIN, > CRTC_EXT, > CRTC_THIRD, > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c > b/drivers/gpu/drm/mediatek/mtk_drm_plane.c > index ddc9355b06d5..cbdb70677d30 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c > @@ -117,8 +117,8 @@ static int mtk_plane_atomic_async_check(struct > drm_plane *plane, > if (!plane->state->fb) > return -EINVAL; > > - ret = mtk_drm_crtc_plane_check(new_plane_state->crtc, plane, > - to_mtk_plane_state(new_plane_sta > te)); > + ret = mtk_crtc_plane_check(new_plane_state->crtc, plane, > + to_mtk_plane_state(new_plane_state)) > ; > if (ret) > return ret; > > @@ -232,7 +232,7 @@ static void mtk_plane_atomic_async_update(struct > drm_plane *plane, > swap(plane->state->fb, new_state->fb); > wmb(); /* Make sure the above parameters are set before update > */ > new_plane_state->pending.async_dirty = true; > - mtk_drm_crtc_async_update(new_state->crtc, plane, state); > + mtk_crtc_async_update(new_state->crtc, plane, state); > } > > static const struct drm_plane_funcs mtk_plane_funcs = { > @@ -260,8 +260,8 @@ static int mtk_plane_atomic_check(struct > drm_plane *plane, > if (WARN_ON(!new_plane_state->crtc)) > return 0; > > - ret = mtk_drm_crtc_plane_check(new_plane_state->crtc, plane, > - to_mtk_plane_state(new_plane_sta > te)); > + ret = mtk_crtc_plane_check(new_plane_state->crtc, plane, > + to_mtk_plane_state(new_plane_state)) > ; > if (ret) > return ret; > > diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c > b/drivers/gpu/drm/mediatek/mtk_dsi.c > index 9501f4019199..ec9d96396d7b 100644 > --- a/drivers/gpu/drm/mediatek/mtk_dsi.c > +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c > @@ -662,7 +662,7 @@ static void mtk_dsi_poweroff(struct mtk_dsi *dsi) > > /* > * mtk_dsi_stop() and mtk_dsi_start() is asymmetric, since > - * mtk_dsi_stop() should be called after > mtk_drm_crtc_atomic_disable(), > + * mtk_dsi_stop() should be called after > mtk_crtc_atomic_disable(), > * which needs irq for vblank, and mtk_dsi_stop() will disable > irq. > * mtk_dsi_start() needs to be called in > mtk_output_dsi_enable(), > * after dsi is fully set. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel