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 2BAC7C5475B for ; Thu, 14 Mar 2024 05:50:20 +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=/+kRfy/V1888/h3a7OtZzcsZlrm5ESSVhk4JhHt73Kg=; b=pZkxvZFSqdIdUF xiKoQyvP3LGy22GTdvWfxARcTM0Mmgi/svts/sc3owIMHlB/oazuZzRhji1Fnr9SrhSBI47hUOyki 4H9fcKzqLxNYT16ieMnaEktpfJHomxdBz0fuK5ZRJfYs6wz4S80hoHX7qmpU0qi+DmcOOgVaVGNZZ t+sfeymONNirBVl+GxCSuwTKWak/A7RrIRRPmj9wtZZD3mbjQqbI9EdNSg4Ymynv9o/BPCInDsByN E48nDYNKDTuSmlltKAogOOsmYoYdznQExPe+zyy5lIctyZJhaFWFH6lwktG/I05qnMYjSOrPEpGrg JLZK+K2Mp+tFiM7YR+Pw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rkdyf-0000000D5P0-3D7D; Thu, 14 Mar 2024 05:50:05 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rkdyd-0000000D5O3-3gjo; Thu, 14 Mar 2024 05:50:05 +0000 X-UUID: b0e721b2e1c611eeacdb61a41848c7d2-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=QoVOU8IZ6j2JVeQrELLgPx+Nqdhq+h5Wsi4DNg09YKI=; b=NoB2gpfTvbwg6XoOL2NK69xVdl+QqUshADb+agcG/P6G4MjRGO/6UNO0deo6WVutd0WdvDiy+crthPxq6+FqTwtouXCxvPLJxiWa9c2FcYQh5gcj0zi3Gzm/hYmvnYuTq271fsTshZLpxMpK4CXb68UMWmEMnBh5rddDqHeGueU=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.37,REQID:dc493096-fa7a-4455-876a-0874cd9d11b0,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:3b3ce1ff-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: b0e721b2e1c611eeacdb61a41848c7d2-20240313 Received: from mtkmbs11n2.mediatek.inc [(172.21.101.187)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 122281565; Wed, 13 Mar 2024 22:49:58 -0700 Received: from mtkmbs10n2.mediatek.inc (172.21.101.183) 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; Thu, 14 Mar 2024 13:49:55 +0800 Received: from APC01-SG2-obe.outbound.protection.outlook.com (172.21.101.237) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Thu, 14 Mar 2024 13:49:55 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h9SV/eg0qu6dRLOaEeDQZfKTCPiwTfyBxL5tV8TiKy8lY2uOv0c9VQle4Xy6Icn6tGAHd1JwrPdrDGVZAPPs4m8HrmqDX/j8ake6GpGLvsiIq30xrg5Ka2ImZ7rpi8/nOPYkCPDjYPskj/E7E7K0WMAzKTlx79u7ZowlLX31PS1u8gAClUGwiXyjs3DJEnu7HP6Ir5vMDfI1FRnGoTe5qZDIHyiDdQ9B3NkymYjQK7wsTtrYMzaTO26XWQWBXNt+BC9zCkEZUEVu1Ut4OM5ZfLHi/JDSQk5eiy945h9lABYUdwDNQs1syzpwa0wH5Z80pNah9npFLKodmV/H/NIpAQ== 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=QoVOU8IZ6j2JVeQrELLgPx+Nqdhq+h5Wsi4DNg09YKI=; b=AEKcWx+czHZuUn6mxamDcyTutCqW2AV+IN6kvf1s4isZ0RHgsC9gw7MnZZ/5HUukI2gacrkRSe8dEW90tZjJWYZYMtgit5Hw4FaQai3XnT7cKc3RVhBOAuDKG7UvaEVhp9xde65NXZizOL1s4sJbcOkJ6wFNo+67WWn8XtJHjY4oy82c+6Kok85ru67wWUooubm856bccPyR0C1BeSNQ1O7eGor/h9sFJeQ7uNvNFSZApPY6yaBs61cINybB5BTUJ0bbx9McJmvSYyJnwxEGQL3k+hSkSKI4DbIARaEwMEJUdfCmbd/5sSLIHzyM6UjZV9TyQPseeyZ0MibtnI30Dg== 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=QoVOU8IZ6j2JVeQrELLgPx+Nqdhq+h5Wsi4DNg09YKI=; b=q3BiMLgeD0zmYcwkpcFOyGnTJ0wlElkmV8ACLvnymR1RUaliZWK4nGgh51E8ar6WVrtdh7uw95oRItm4fIqhwhwiutR3fTJEbT7C2RMGCu7X4BWcPHhFOMlUXdO0KNs9VZJXy/Qo5mxPPlDEQnRDIka0iz3UNbqVE+XjW8Alf60= Received: from TYZPR03MB6624.apcprd03.prod.outlook.com (2603:1096:400:1f4::13) by OSQPR03MB8598.apcprd03.prod.outlook.com (2603:1096:604:296::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.31; Thu, 14 Mar 2024 05:49:52 +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 05:49:52 +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 04/11] drm/mediatek: Rename "mtk_drm_gem" to "mtk_gem" Thread-Topic: [PATCH 04/11] drm/mediatek: Rename "mtk_drm_gem" to "mtk_gem" Thread-Index: AQHaaJEY7RssYibkfUKrrQhW7tPMfrE21bqA Date: Thu, 14 Mar 2024 05:49:52 +0000 Message-ID: References: <20240226085059.26850-1-shawn.sung@mediatek.com> <20240226085059.26850-5-shawn.sung@mediatek.com> In-Reply-To: <20240226085059.26850-5-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_|OSQPR03MB8598:EE_ x-ms-office365-filtering-correlation-id: 66c26327-395c-4b00-84de-08dc43ea919f x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: O/OiAyd7qC/cLpaj+tzdCpvMC4eJMpZ8EXjk0akEWGDLIKq4Q/UgDbwmlOqrTe8A24PmD+wqifHnmzaSSeP77zzd3eLIHJyX/U/C9ABxdnaAuVcJjzbuduDNUSXAJGe0WbpGHzO9lCpD3XLn2DZf/Bw8Xq5dQ3JLUrkZ0QCXP4hUMBpDfOHKL/+/uKoVdtfsWCRYHtEiUC87LAFp/qq17NBoVJnvP6XXT2PbHi/dkX3oLpohItkgsu0bRfjQj3yFpCpYrZiqgcnYpSmW4i8gOUpqHDcyBGgqMnUv15yw65XXWw8H45ZgGO3UVF0UsGZj6AeOP4oME+/+GLEe3Owx0SJldeHn9rPuiJs2UhtpSa8HTUkNorPPy8rbePYHjjh+XOriDBYDMngmADXnMeC82HSyaP/x2hs9RRpbSr1RADPdST0dfWF4MrEwZvgnEttjE3PBG/DtMCdOB+v5TS4oxtACmHbky9xHyXNC7FNPDeMyHS+RdqrySgDMtbylnZk4cbqIbZCVNOjak3tbeVLBAuBOMiKxeFAOHLTZMBTZ/nbwceX4vfwC7rpOjgf7uNqEEDvO+LLgLflrKRW2MlRY1CSStYRmP9q8YTk0FhTTPyt0fGcveVnZ5ziai3u0ITZhDKr+mcEBcxyYNY9HAjhZNfXEj8b/gArL7x2wqyB94Wq2MoJ/Pau9x9ni+0dUTN0HsLypP0Xx0QrrZ/eFY6wE3g0IpiqTe+toWzLjr+WX7hQ= 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)(376005)(1800799015)(7416005)(38070700009);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?Z0RHOGk0Z05CVVdHdGJ0NzdmUDc0NTRHbjhZcEx4ODJGSUM3amloR0VyRld1?= =?utf-8?B?UHlCNzRHcXluelliNTl5d2NuOGUzRHZDT21DRmdxVzNtNG5qTzl4M1oyWUw2?= =?utf-8?B?ekFoUG4zMlVSdFBoUWZ1cndVcDA0Tk9Cbi8xMlk4MmtkKzY5MEtYSzFTeGww?= =?utf-8?B?ZHQvRy9VRG1vOXo5K1pvS3pXR1FrMFdkZnJIN0dvUUM1YXY2ZGZFcGlPMDhG?= =?utf-8?B?OEI0c1ZPSHBZZlYvbXJBaEFsWVhNSzhsKzQrcG9ZSnhtR2JQaDdOelVmNVdI?= =?utf-8?B?bk1ScEg5V0ZVYzNmNGpnSnF2V25ORG5XNUJXbmNWZ1hYZFdDTWVIU1lHOU1v?= =?utf-8?B?OEt2T3pXMGFZR3h0NGZiYnVNUnNVdkhJS2ZLanRaNko3MXRnV0RraWtlY0pP?= =?utf-8?B?VnRvMkQ4K3UzR0NaYlY0alArMzAya1RUOGRoOHI4WDgyRm9rVEIwNC82QU1m?= =?utf-8?B?RUtJdjlGMWxQTHJkVnBidEpZNWJzaStBY3c4RFhvTGVyVGtCOTJHeWpGdWZJ?= =?utf-8?B?OUd3djlLdVRyMDZzWnY3S09Ed0UzZkcrUDB4blVHODhMVkVRNWlQaDVoU25v?= =?utf-8?B?Vy92OFNHNjRBUUQrQnRtOXFpQU9xQnd4MzNBNEJCY2tYTXhNK3o0WWlUejdr?= =?utf-8?B?dU1kZFhzanJXeFlsZ2crTjU0RFRuVEtONVNTSWJYeitPenRBMlUvTFFxNnhq?= =?utf-8?B?SEptcXlBS0YwU1UrQnJVYTBHU0E5Ny8vcjhlV2N4akxzc2ZMRkVydXpJU0V4?= =?utf-8?B?T1NDUkVBMjRQQ3VoZGcwcHhnNzlrNm55a0VWYm50TlpmNHhEemxWTG8rNXc3?= =?utf-8?B?L3VIc3duTzlLTzZrYVNQUTYxWUt2NHVzVkR2WkJqUUYrRjFhUEtMTnF4Q1pC?= =?utf-8?B?cGdDWU1MNXZMU2xkTFZ6aERtejh3ekE4eHVwWWRkMnI3TW5FcnlkVVlEUFBQ?= =?utf-8?B?Qm5Cd3ZHTGV5S1RCWDB4YnA1dGRYbFdzTEdscnZHU0kzRDh0ZUJTMmpicWtN?= =?utf-8?B?ckgwS0s5R1hDRmJWeEU2RGxsL2V6MURueWZReFA2SzVvV1hkTi90VHI5Vmg0?= =?utf-8?B?eWJ0aUNmQnlUdFdnT1A2KzVPU3ZPN3ZNelBDZ3JDWXJIK1QzeVdqRDAvQXVs?= =?utf-8?B?OE43by9nZ0RtZUoraDU3SGdOK0g5Qlp0TzIzNGRhWDBkU3dDbVJjRXhsWG52?= =?utf-8?B?T2RnZ09LZEZxVm5QMEFxYkRyblB2K3RIcGI0UDNCMGo2TkN3MmVqSC9YclFO?= =?utf-8?B?b0JKT2FjOTZvemEzeUxxNitmVEx4cElNZkM1WGdXSmdTUGYvK2ZlZU1XWldQ?= =?utf-8?B?N09oVWNmTGx6cFNrVWF2Yi81MzA5SzFIYWxSSWQ1UEFqdDVoa09RUHVYZjFB?= =?utf-8?B?WkdadXI3L0JxS2NWZlI5NDdiV0RqRGp4Y3k5cnFocnM1K09DczB4UG1MOGdL?= =?utf-8?B?SW92RjlqNzhZN1RETFFqZkh3bzI0Y1FyWWR6VmpPcXFsUkpLU0Y4c05IMVVH?= =?utf-8?B?MTRERkFoT0NCUEo2RWg5N3IwSzJLd2xyTGVZQmUreFJTalNLdWpjbDdZV0xm?= =?utf-8?B?L0dYRTdsVnpUZVkyUUFTQ3BFZmEwdnRoR3BkVkNQVVVuR2M0bC9ML3Y5dUFZ?= =?utf-8?B?TFlzdmRiTjdKb2U1VnJBSHcrVkxEWkhOZnFqSjQ3VXh6UW9odmdPRlJRS2RJ?= =?utf-8?B?THBTM2xqcmhyS2pEaStpR20zUWYxK1l3UzM1bC9hc283SUUvYUdHb1FVZlZY?= =?utf-8?B?QVVjT0VpODIyaDNHRlVsem5ITS9hR2xJSkFXOTVxMGIwcFE1cEh6UUVOa0RU?= =?utf-8?B?cWxiOTBPZU9GYk9jZ0w4aFAvNTZodXZuUWhjQkphcnpwVEhMREpEd1JwZnRn?= =?utf-8?B?NW0xd1pjSGJ6WDJYSmhpbUtxOHROWTh6UUdFSzVyS2UwS1F3cGJYSEw5b2NB?= =?utf-8?B?MHpJMStPb3pDS1pSUUNkZFNzc2kxdU5jVEIrV2xSc1IxSnM5d1U1cFhIcXVx?= =?utf-8?B?SnFMUi9FZHpZRUlOWlpMOU9UMnl4b2pZWmUrODBxNkhkbUJ5Nm84SFVCMlR5?= =?utf-8?B?RXk1Tk9wK2JwdHdvQUdnN0ZxbWlZdmh5TXlUdUh2LzZFaFZtZm5naDhCd2RR?= =?utf-8?Q?hXYa3mQZu3gRm1nN8JdoqUcLc?= Content-ID: <02E0F2197ADF9F409C42631985A1C2C1@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: 66c26327-395c-4b00-84de-08dc43ea919f X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Mar 2024 05:49:52.4252 (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: SyGbcdiiJR2NWuqUyOXg8QLXiPgWmPJKmYF5p5QVdMqiRWt4tyaf4hS+OjgcRqbiowwTqRJH4U8oQvN1RjnE6w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSQPR03MB8598 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240313_225003_966888_8922EAED X-CRM114-Status: GOOD ( 19.88 ) 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_gem" to "mtk_gem": > - To align the naming rule > - To 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_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/mediatek/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 = dev->dev_private; > > @@ -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 = { > .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, > > - .dumb_create = mtk_drm_gem_dumb_create, > + .dumb_create = mtk_gem_dumb_create, > > - .gem_prime_import = mtk_drm_gem_prime_import, > + .gem_prime_import = mtk_gem_prime_import, > .gem_prime_import_sg_table = mtk_gem_prime_import_sg_table, > .fops = &mtk_drm_fops, > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c > b/drivers/gpu/drm/mediatek/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" > > -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); > > static const struct vm_operations_struct vm_ops = { > .open = drm_gem_vm_open, > .close = drm_gem_vm_close, > }; > > -static const struct drm_gem_object_funcs mtk_drm_gem_object_funcs = > { > - .free = mtk_drm_gem_free_object, > +static const struct drm_gem_object_funcs mtk_gem_object_funcs = { > + .free = mtk_gem_free_object, > .get_sg_table = mtk_gem_prime_get_sg_table, > - .vmap = mtk_drm_gem_prime_vmap, > - .vunmap = mtk_drm_gem_prime_vunmap, > - .mmap = mtk_drm_gem_object_mmap, > + .vmap = mtk_gem_prime_vmap, > + .vunmap = mtk_gem_prime_vunmap, > + .mmap = mtk_gem_object_mmap, > .vm_ops = &vm_ops, > }; > > -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; > > size = round_up(size, PAGE_SIZE); > @@ -42,7 +42,7 @@ static struct mtk_drm_gem_obj > *mtk_drm_gem_init(struct drm_device *dev, > if (!mtk_gem_obj) > return ERR_PTR(-ENOMEM); > > - mtk_gem_obj->base.funcs = &mtk_drm_gem_object_funcs; > + mtk_gem_obj->base.funcs = &mtk_gem_object_funcs; > > ret = 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; > } > > -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 = dev->dev_private; > - struct mtk_drm_gem_obj *mtk_gem; > + struct mtk_gem_obj *mtk_gem; > struct drm_gem_object *obj; > int ret; > > - mtk_gem = mtk_drm_gem_init(dev, size); > + mtk_gem = mtk_gem_init(dev, size); > if (IS_ERR(mtk_gem)) > return ERR_CAST(mtk_gem); > > @@ -97,9 +97,9 @@ struct mtk_drm_gem_obj *mtk_drm_gem_create(struct > drm_device *dev, > return ERR_PTR(ret); > } > > -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 = to_mtk_gem_obj(obj); > + struct mtk_gem_obj *mtk_gem = to_mtk_gem_obj(obj); > struct mtk_drm_private *priv = obj->dev->dev_private; > > if (mtk_gem->sg) > @@ -114,10 +114,10 @@ void mtk_drm_gem_free_object(struct > drm_gem_object *obj) > kfree(mtk_gem); > } > > -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; > > args->pitch = 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 = args->pitch; > args->size *= args->height; > > - mtk_gem = mtk_drm_gem_create(dev, args->size, false); > + mtk_gem = mtk_gem_create(dev, args->size, false); > if (IS_ERR(mtk_gem)) > return PTR_ERR(mtk_gem); > > @@ -148,16 +148,16 @@ int mtk_drm_gem_dumb_create(struct drm_file > *file_priv, struct drm_device *dev, > return 0; > > err_handle_create: > - mtk_drm_gem_free_object(&mtk_gem->base); > + mtk_gem_free_object(&mtk_gem->base); > return ret; > } > > -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) > > { > int ret; > - struct mtk_drm_gem_obj *mtk_gem = to_mtk_gem_obj(obj); > + struct mtk_gem_obj *mtk_gem = to_mtk_gem_obj(obj); > struct mtk_drm_private *priv = obj->dev->dev_private; > > /* > @@ -188,7 +188,7 @@ static int mtk_drm_gem_object_mmap(struct > drm_gem_object *obj, > */ > struct sg_table *mtk_gem_prime_get_sg_table(struct drm_gem_object > *obj) > { > - struct mtk_drm_gem_obj *mtk_gem = to_mtk_gem_obj(obj); > + struct mtk_gem_obj *mtk_gem = to_mtk_gem_obj(obj); > struct mtk_drm_private *priv = 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 *dev, > struct dma_buf_attachment *attach, struct > sg_table *sg) > { > - struct mtk_drm_gem_obj *mtk_gem; > + struct mtk_gem_obj *mtk_gem; > > /* 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(struct drm_device *dev, > return ERR_PTR(-EINVAL); > } > > - mtk_gem = mtk_drm_gem_init(dev, attach->dmabuf->size); > + mtk_gem = mtk_gem_init(dev, attach->dmabuf->size); > if (IS_ERR(mtk_gem)) > return ERR_CAST(mtk_gem); > > @@ -230,9 +230,9 @@ struct drm_gem_object > *mtk_gem_prime_import_sg_table(struct drm_device *dev, > return &mtk_gem->base; > } > > -int mtk_drm_gem_prime_vmap(struct drm_gem_object *obj, struct > iosys_map *map) > +int mtk_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map > *map) > { > - struct mtk_drm_gem_obj *mtk_gem = to_mtk_gem_obj(obj); > + struct mtk_gem_obj *mtk_gem = to_mtk_gem_obj(obj); > struct sg_table *sgt = NULL; > unsigned int npages; > > @@ -270,10 +270,9 @@ int mtk_drm_gem_prime_vmap(struct drm_gem_object > *obj, struct iosys_map *map) > return 0; > } > > -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 *map) > { > - struct mtk_drm_gem_obj *mtk_gem = to_mtk_gem_obj(obj); > + struct mtk_gem_obj *mtk_gem = to_mtk_gem_obj(obj); > void *vaddr = map->vaddr; > > if (!mtk_gem->pages) > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.h > b/drivers/gpu/drm/mediatek/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; > }; > > -#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) > > -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 *dev, > struct dma_buf_attachment *attach, struct > sg_table *sg); > -int mtk_drm_gem_prime_vmap(struct drm_gem_object *obj, struct > iosys_map *map); > -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 *map); > > #endif > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c > b/drivers/gpu/drm/mediatek/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 = 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; _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel