From patchwork Tue Dec 27 08:10:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?TmFuY3kgTGluICjmnpfmrKPonqIp?= X-Patchwork-Id: 13082114 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 A75FFC10F1B for ; Tue, 27 Dec 2022 08:13:17 +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:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=a9STFr2xmPgfwe0i3TyrTsL00uFkX1FSuau40ysPuqY=; b=TlDk4CEcc/qJ0p RX1Jv+eAPFhMAI0ayFVsNQtjA+kMcmIqbJ+y5YfFFSlhZg52Rf41F0/q9POSxzCgox03xL5pZtU4z IvoeCSWD2ct0YwI0XYsK+nDuSlD73v1TEeuZsjXuqnPrs5DZSKRyKl94srQAkPVjyxMqNiiqQTdHJ 60v9TxnzCn3aetqTJEYdoG9TE44hkhvNECn3khLsXKeVgHGIlRWWoce9ZBj5U4emiGD29MU5Ye9sS BnaI0axsIOMtb5okr3L5xW7JzsyLBBQzrpmP2HQy9yQFqXZphBxSUVlpBcSN1Xcp1eEOYX6M8YDLp wjsx3ehghlXqsf1kh1mQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pA54H-00BEXC-ER; Tue, 27 Dec 2022 08:12:13 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pA535-00BE3L-Jt; Tue, 27 Dec 2022 08:11:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:CC:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=JKdfQkKaCv2Djx4vHo/T77OGyTt0M7lfCyXqFM+MAQY=; b=BYiEpIxh66y/FQHK8MfHuRvpsX gGeIpv1Rs7Kk5cioRs4bp2zAWwARzRgnfsXrWNfDzZnjlaUTXGIDe9WaLsBrD/2jlilbxbZMZxs+4 B+URK1JommxN7P1q7wx6Lp0Vo4SaUsDPKauZUI0m+BdSnBbOxNJdw8NIWObqJP34JgbfRYbx3j8sm G2fBvpw4TPL0wh6NeoI/61kRBxiCLeL0SF+s81crWJ07wjYBFTuDNqsTGAXPlhtUtAR0x/ZsdCJWY +Ro+aLdKgVEwrAGTizA2mRWmqFHeP5JZ5aPHX6zFzi1YJjzVFgo4DGmu/lPmjOqn8Gh6tqoQv9phi a0IgPODQ==; Received: from mailgw01.mediatek.com ([216.200.240.184]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pA52y-00FaKy-37; Tue, 27 Dec 2022 08:10:55 +0000 X-UUID: 446fd158ec2a45c6b32cb20f1626b09b-20221227 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=JKdfQkKaCv2Djx4vHo/T77OGyTt0M7lfCyXqFM+MAQY=; b=lzT4phT1/HuHue8TdPaMsRtBAm5TIf/kvFD81BAKPYkPOuLJKNyCYYohiIu0t4hQobKSmNGqECXvmft2/TI75oxBrPy5ggeVk+Hza8CNv9TJNicpcRSfrPaojPngFGrluXEWjBTaizCg1OSGkMqW6xRxHpbosIJoIal/nR1Ui54=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.14,REQID:e5f55f7f-f3a2-4ba7-b7aa-4968818cd8bd,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:dcaaed0,CLOUDID:a3e2e852-dd49-462e-a4be-2143a3ddc739,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:11|1,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0 X-UUID: 446fd158ec2a45c6b32cb20f1626b09b-20221227 Received: from mtkmbs13n2.mediatek.inc [(172.21.101.108)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1998841197; Tue, 27 Dec 2022 01:10:49 -0700 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.15; Tue, 27 Dec 2022 16:10:13 +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.792.15 via Frontend Transport; Tue, 27 Dec 2022 16:10:13 +0800 From: Nancy.Lin To: Chun-Kuang Hu , Philipp Zabel , Matthias Brugger , CC: David Airlie , Daniel Vetter , "Rob Herring" , Nathan Chancellor , "Nick Desaulniers" , CK Hu , , , , , , , , , Nancy.Lin Subject: [PATCH v29 7/7] drm/mediatek: add mediatek-drm of vdosys1 support for MT8195 Date: Tue, 27 Dec 2022 16:10:11 +0800 Message-ID: <20221227081011.6426-8-nancy.lin@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20221227081011.6426-1-nancy.lin@mediatek.com> References: <20221227081011.6426-1-nancy.lin@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221227_081053_619677_007AB53C X-CRM114-Status: GOOD ( 10.70 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add driver data of mt8195 vdosys1 to mediatek-drm. Signed-off-by: Nancy.Lin Reviewed-by: AngeloGioacchino Del Regno Reviewed-by: CK Hu Tested-by: AngeloGioacchino Del Regno Tested-by: Bo-Chen Chen --- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index 442ef79d5a3f..b0b584440e1a 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -208,6 +208,12 @@ static const unsigned int mt8195_mtk_ddp_main[] = { DDP_COMPONENT_DP_INTF0, }; +static const unsigned int mt8195_mtk_ddp_ext[] = { + DDP_COMPONENT_DRM_OVL_ADAPTOR, + DDP_COMPONENT_MERGE5, + DDP_COMPONENT_DP_INTF1, +}; + static const struct mtk_mmsys_driver_data mt2701_mmsys_driver_data = { .main_path = mt2701_mtk_ddp_main, .main_len = ARRAY_SIZE(mt2701_mtk_ddp_main), @@ -277,7 +283,14 @@ static const struct mtk_mmsys_driver_data mt8192_mmsys_driver_data = { static const struct mtk_mmsys_driver_data mt8195_vdosys0_driver_data = { .main_path = mt8195_mtk_ddp_main, .main_len = ARRAY_SIZE(mt8195_mtk_ddp_main), - .mmsys_dev_num = 1, + .mmsys_dev_num = 2, +}; + +static const struct mtk_mmsys_driver_data mt8195_vdosys1_driver_data = { + .ext_path = mt8195_mtk_ddp_ext, + .ext_len = ARRAY_SIZE(mt8195_mtk_ddp_ext), + .mmsys_id = 1, + .mmsys_dev_num = 2, }; static const struct of_device_id mtk_drm_of_ids[] = { @@ -301,6 +314,8 @@ static const struct of_device_id mtk_drm_of_ids[] = { .data = &mt8195_vdosys0_driver_data}, { .compatible = "mediatek,mt8195-vdosys0", .data = &mt8195_vdosys0_driver_data}, + { .compatible = "mediatek,mt8195-vdosys1", + .data = &mt8195_vdosys1_driver_data}, { } }; MODULE_DEVICE_TABLE(of, mtk_drm_of_ids);