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 1287ACDB474 for ; Wed, 18 Oct 2023 02:04:02 +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=NFqVFN/xJJfcI1EzTqXwpqih28mgneAmBhx8XpgVQMk=; b=A8IzRpuexo99X1 GMiS15YW9d9g62EDK8fFB5IDJZzbgEsUxw+K/OWo2dItPX81Lk/wfQWlAhJMz24MwACGDSztiVT6b F6mzqofkGY48VH8NuEDPbN69pDUsm9JoDULlvfxDuRAWwrkoLouCw7O7uF+eGUjudwNlSmaOBli5m kxsGjDFsCN4i0wL/k219rBjGJb9PcvS5vQOO1MGw54UYZbgqqzTKUN5f8AE1X0eQFF9VK/4nHlNDx Yj2YqgerCd15TQJLkGsbBzqFj9B6yLM/fg3zVuMTFxuOjN7U5ZLaIeh1RczM5+lAAaVA2aZivbShb 0tIGZHTm3mzpBFoG1HLA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qsvu8-00DZFo-28; Wed, 18 Oct 2023 02:03:24 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qsvu5-00DZF8-0p; Wed, 18 Oct 2023 02:03:23 +0000 X-UUID: 7dbdb7a06d5a11ee86758d4a7c00f3a0-20231017 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=4HJpeMDyDrkf6WwGcCL7T9cnC7FhKrBv9gfRAVssPSs=; b=hoJQ02U5puiN3Pwer7cg5JJW7xIEkZ7LiqBJpVyDL4NCXDmxDJL0wZuf0TUBpn0pKMvlS8n7eNe2cQz8vZGWZqKQHg3Ub2cdECcFasPe2J1h5GKxjznLt6x6E043s6rsVc9Zn+k0eP0+SoQwuCnmfaKHnb8U+LNHlAKNy5IH8h0=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.32,REQID:38c7f6da-0ab9-4710-9d70-6f2b0128cf05,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:5f78ec9,CLOUDID:e383eaf0-9a6e-4c39-b73e-f2bc08ca3dc5,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,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: 7dbdb7a06d5a11ee86758d4a7c00f3a0-20231017 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 1601315639; Tue, 17 Oct 2023 19:03:11 -0700 Received: from mtkmbs10n1.mediatek.inc (172.21.101.34) 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; Wed, 18 Oct 2023 10:02:38 +0800 Received: from APC01-TYZ-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; Wed, 18 Oct 2023 10:02:38 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TNaN9C1MmNr58cNojeWEItufzcCdu4sWcu+dE6wbXFMSKt14L2CMheXIoFgYozaQagJ/xAusK/3M4CUEEN4f1SvLQGPoMOkHjzu7bGFMnsweB5XUXYlRQipDZubCjsr80ul5Xio7i0g40g5GOTnN6JZBdHB5ycaKWIC0zjjUpRwpwDVDA6ctZQCJwV7j183SZFDd5nVoV7mMN9mY4ExN4b2ML38jbHf0EnKvcN8Iu8CJY1oHaJg/4QZ9jbdbqGNyfO002id0enoWcDo0t/ktmwEi+VnHUGqoRS2rMEcZeGk0rTlL0cCU9MHqip8CtxgzaP/Ol328WsFBIhPpzRZ1/g== 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=4HJpeMDyDrkf6WwGcCL7T9cnC7FhKrBv9gfRAVssPSs=; b=OxI0VZf9NNL/NYAmpDLZI+VN6+35UIFYtbM71+o/TTCVuaSoE5eBX1lPphjaVVf5HZLpRqPoV0x/cMKzFfOieSbkrVCbFg8gO0AjHMcbm9/165v687odJyeuSy/NEy2kcsfanmTM6W02245BNDR0iSrf39AEK3iOdqwWbc+lzIp4Feub1SAqih9paaQehBNjFiQzd+U0fc6M++0ygal82dg89AECDlKsmf1hSaG7NGm0PI/lsItpYY+esJ7YKT8oE45VxkA3zoDfQV4bBBFPMgN0WCLdGSMm0ARL8swqfUJsMbyzlINE5EO/9KXi76SnaJOCbngJwhvfxzW/Jhap8A== 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=4HJpeMDyDrkf6WwGcCL7T9cnC7FhKrBv9gfRAVssPSs=; b=ALdI6BdGo0x8TMQBCtswvtF8P7GHMQsfFsxXqf3uSrnUmLS0rKIa3HRuqOFTRATcwbsAfDDQw1FiW52bFRwEzalrXmUz7ImwJ6hVCfeNvkmdtwhPBJgppISXtmcDdcoqxNv1/CBUm+mprDzVZXVk/TqqOCNxeScWBshcmzHpM+c= Received: from TYZPR03MB6624.apcprd03.prod.outlook.com (2603:1096:400:1f4::13) by SI2PR03MB6056.apcprd03.prod.outlook.com (2603:1096:4:14c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.36; Wed, 18 Oct 2023 02:02:35 +0000 Received: from TYZPR03MB6624.apcprd03.prod.outlook.com ([fe80::9c2c:c08a:212f:e984]) by TYZPR03MB6624.apcprd03.prod.outlook.com ([fe80::9c2c:c08a:212f:e984%7]) with mapi id 15.20.6886.034; Wed, 18 Oct 2023 02:02:35 +0000 From: =?utf-8?B?Q0sgSHUgKOiDoeS/iuWFiSk=?= To: =?utf-8?B?U2hhd24gU3VuZyAo5a6L5a2d6KyZKQ==?= , "matthias.bgg@gmail.com" , "angelogioacchino.delregno@collabora.com" , "robh+dt@kernel.org" , "krzysztof.kozlowski+dt@linaro.org" CC: =?utf-8?B?WW9uZ3FpYW5nIE5pdSAo54mb5rC45by6KQ==?= , "linux-kernel@vger.kernel.org" , "linux-mediatek@lists.infradead.org" , "chunkuang.hu@kernel.org" , =?utf-8?B?SmFzb24tSkggTGluICjmnpfnnb/npaUp?= , "devicetree@vger.kernel.org" , =?utf-8?B?TmFuY3kgTGluICjmnpfmrKPonqIp?= , =?utf-8?B?TW91ZHkgSG8gKOS9leWul+WOnyk=?= , "daniel@ffwll.ch" , "p.zabel@pengutronix.de" , "mchehab@kernel.org" , "dri-devel@lists.freedesktop.org" , =?utf-8?B?TmF0aGFuIEx1ICjlkYLmnbHpnJYp?= , "airlied@gmail.com" , "sean@poorly.run" , "hverkuil-cisco@xs4all.nl" , "linux-arm-kernel@lists.infradead.org" , "fshao@chromium.org" , "johnson.wang@mediatek.corp-partner.google.com" Subject: Re: [PATCH v8 22/23] drm/mediatek: Power on devices in OVL adaptor when atomic enable Thread-Topic: [PATCH v8 22/23] drm/mediatek: Power on devices in OVL adaptor when atomic enable Thread-Index: AQHaAB1HhjBBScvygEyk2ZfOYTkEOrBOzhIA Date: Wed, 18 Oct 2023 02:02:35 +0000 Message-ID: References: <20231016104010.3270-1-shawn.sung@mediatek.com> <20231016104010.3270-23-shawn.sung@mediatek.com> In-Reply-To: <20231016104010.3270-23-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_|SI2PR03MB6056:EE_ x-ms-office365-filtering-correlation-id: f5c48ea3-e31c-4931-9e3d-08dbcf7e4c66 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: ex/WnK78ecgaakYGjOf/QACnzQNoHiYd/Jtgt4IXbKsfH8TyCHXfOYpn8UQ3Ie4sYg9OXwb90komkyMvcarJc12jSctRVWTyPvqI0Sxsw5nVj84cw4sU31nxBe8++Rrm9HlQbPnIqOetK1ZOHAxsbyWZ7oZUOq//aeFgYvyMkrlR/oitJXhGoY8ZtgTN+N/xKgi8xm4brkiIQH+MNVz+XmFWi32iMTP+tQIhYsONYn2NaUPUT92kzIRH8dh0imK5bDafeuGkXKq/HCGDtCHPg9H7SpUOJmOwXSL40fYuGwcoUM3zz6mHGBInhQrPPEJfRtMUOgHr9IzKDc6Rby8W2fSu+Zb6CATjcH6aIUjcn6lOU/KkVAmChxBcb2Zh13BGap4n29NWJPt470KDDIEkj1aJyyECxx2sslzHOQmkP8InwGJvLhHVwJ6S11HzXWMhZAS012MK1aDjfIagAx6wTpx6kXgr3uVlzR9LyOLN7SMgQMNhIAn+bXe/64pxdrNPQvLrGTocYskKuxyKmY7ESyaOElYTJgW5Cvr/zFPaBC2y7URCF7BJzQUcUgDdmkn8uZmRyYPtX53Uz9O22lEI6YaF+4zr34Q8CWvl6AqUNMAVvNmp9rvgsR71oaeA0ggk0RZrrs9FPqblxIZPCVibgHnOtt6yw9VefYHmcpBV4Jc= 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)(396003)(39860400002)(136003)(366004)(376002)(346002)(230922051799003)(64100799003)(451199024)(1800799009)(186009)(71200400001)(26005)(6506007)(2616005)(508600001)(6486002)(83380400001)(5660300002)(7416002)(41300700001)(4326008)(4001150100001)(8936002)(8676002)(2906002)(30864003)(76116006)(316002)(110136005)(66946007)(66476007)(64756008)(66446008)(66556008)(54906003)(38070700005)(122000001)(38100700002)(86362001)(36756003)(6512007)(85182001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?TWNRMk03UnR5NklKZ2UxWW5nVUU5SUUwcHVST2tzak5kZ0pON1ltOVBoTWNs?= =?utf-8?B?aENnUGRFVUhwMVpFRVNuS3NnTmZiNmI5TVIvVnk5TisrU3Bsc05CZEQyWXl2?= =?utf-8?B?bFRBb1lMTDY3K1psaVcvQW1mc1pFYWRNenM5b1ZDaWVVSkg5T3VHcDJ3ZDNO?= =?utf-8?B?cC9ra0k5WGdmeFlJSTU4cDBrQ1J1MFFvbW1aUExiSUZuVjI3c0VGc2FVOWtk?= =?utf-8?B?WFUrVTFMVGw0WmhES24xM2lXOFp4M1h5d2RHS3hqVUxYYk9wYW1yamZDbXR5?= =?utf-8?B?V2hYM1FldDhLb3NpWmplTHYyUkIxUGlKTkx0N29LMzVVa2RCTS9tTlYya2tq?= =?utf-8?B?a3JaOGwvVERjT0dyRWxTM0JYSS9PY3VQbkxOOVZwWExjc1ZOY1VKd1kwOVNi?= =?utf-8?B?SEJDQ2FhTHRnMlNpczVHNHE4L1BlNGl4d3BVVDZ2SFRmby92azNTcklXVmNx?= =?utf-8?B?YkwrZ05tekZ0ZExEbEcreEtMQ1VYTWptazVtVTdTeTdiYnFXYTY3WSs2NzRT?= =?utf-8?B?b3RRS1E2a2xnU3NuMHlYUC96TGFFOVhxZ01QQ3EwZkRKVW9WUEhGaHpqT2Yv?= =?utf-8?B?aDRGVWJ2WHZib3NUZlRmTERjd3JKbkZhMmwrY3RPai9DSDUxQUFiOHhhWEV3?= =?utf-8?B?UEhkY01WN1BJNkF4QWJDYVI3NzN4SXY3YlN2bm1KQVFIUVNFTHE4R096bnlx?= =?utf-8?B?V245bWxoQUlHYXJ4MVJYREtjZUs3OU1KTnBrOFE5NkRYS0dKZ1RZSWw5ZXNK?= =?utf-8?B?VldrRzI0a1lCaHB2UElZZitjTHYzZGRMQVM2MVpZTCtzU3hUOTJEd0xLSHZO?= =?utf-8?B?WXhXWTl6WmUvL1hLeTRac0tqU2l5TFZsSlQ0dVRYNkdBVWN1SmtrZkI5MCtV?= =?utf-8?B?YmRHVUZlSlpWajY5SmRVK01jU1grM1JwRnVJNzRKbUtIaWZuaUFjMmJxZGZi?= =?utf-8?B?cUlTRlRBcDlWV3dNS1BsbS9zbGNQc1MrdmY0ZmxmWFBLUjV5NGVmUHRxVFVV?= =?utf-8?B?OEVSdjRhOU02WlNPMC9Zblk3UFhMWEFzQUZnUDhOaWlKK29GVVRxdGEvQ1Zr?= =?utf-8?B?RDQyWXVhaEpzRDBDay9kdm5LVTJlTmE4SlBRRU9yQkplaVdNOUpXcFh1czhq?= =?utf-8?B?eXVUOGRwNWVybU8zTTRyd0dGaVZ3U3l5S2NZWnVpaGM4aTZxeGV5dng2UjIv?= =?utf-8?B?ZEhHSXhYVnhtOGw5QjBVZnBzVDVnSktQbGhBQnlCS0Y1cUVrV2xOb1poeVd4?= =?utf-8?B?VGtZTnpTcmxMUTM2L05ydmJhOUlvVFRBcUg5cUwrNVcrRUorcWdaelk2OENX?= =?utf-8?B?RWIySU9WYzRDRlFBY0lUdVpUcVlnU3BGVjdFaGgrSDNQTTNSZ3E1K1FBZTZG?= =?utf-8?B?aUxKV0NWN3dLZXdoellROCtGOUh0Wi9DZnBZamtreEdiRWJKSXhRVjhYQmNR?= =?utf-8?B?QlBkT2ZFNWxsbEJoTE44ZlFSNHFyZ21US1NrdE5pTW1JZjFKM01XWUJuQjl0?= =?utf-8?B?TE5MSG1od1FpWGoxbm1xejI2NFBWa1JTR2cyZGRuTGFVMmxoZDZUSXFBNjhZ?= =?utf-8?B?cUlJYUhBbEllZFhvcmZFUFAxWWJHbWx1STNaVCtycTRISkg3blJ3ODc1SVVB?= =?utf-8?B?c1NPcUoxaHplbS9qaHI1ejVvSE4xemJJNDNtS2ZxakR2NDExd2ZUR3d2NVov?= =?utf-8?B?VUtaTlpSOEoxVk1pdEZxMnpJZVpkRnJtZi95VjRwZVczZkJNWm4yS0p4ZnI3?= =?utf-8?B?Rkt0a3VyNjBhbGd4RE43UDRHekFGTVJHZGZCMVVLQkRTVUtMbDUxWEM1TXJn?= =?utf-8?B?cVJabTlWYk1ncERJZWxHbU9GNzN3N2FnQy9oWVVIdGNtR2h2aGpGSEkrR3My?= =?utf-8?B?Z1VkcnhXQVkvamZHUEF4WGFQbVQwcWhuZDErQi9sY01ubThqY1BKUGpkMDFl?= =?utf-8?B?KzlKRm1sZkRuWm00d2h2aG5RcDlHbU9Xc0pXbFhZNGJoMW9sOXNlUTExNkFJ?= =?utf-8?B?SnRVd2tLUWR0WGpzNHBOMlJpY0VPdE9CS2FMSjRxNWVCYnY1dWtDWWFiWDRQ?= =?utf-8?B?c0MrYS8wRm1QVFp6ZXhSeHZ6amw4ZjF6b1NQRzhKbnJlclRSZXhkU2lsNk1M?= =?utf-8?Q?DtEcIznEfmln+3Fdi08NvREtQ?= Content-ID: <66243EA7F2EF59439A098EADFD2D6633@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: f5c48ea3-e31c-4931-9e3d-08dbcf7e4c66 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Oct 2023 02:02:35.7515 (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: wu2NruoyeCrDsgSSMJfj5s7p7m3SJzjm9i1gs2XhXoU294gGf8MwLTI06CR9rI14vKZAT+O5suJIOI4HVsCO3g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR03MB6056 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231017_190321_326453_DFF6E898 X-CRM114-Status: GOOD ( 21.23 ) 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, Hsiao-chien: On Mon, 2023-10-16 at 18:40 +0800, Hsiao Chien Sung wrote: > Different from OVL, OVL adaptor is a pseudo device so we didn't > define it in the device tree, consequently, > pm_runtime_resume_and_get() > called by .atomic_enable() powers on no device in OVL adaptor and > leads to power outage in the corresponding IOMMU. > > To resolve the issue, we implement a function to power on the RDMAs > in OVL adaptor, and the system will make sure the IOMMU is powered on > as well because of the device link (iommus) in the RDMA nodes in DTS. > > Fixes: 5db12f5d843b ("media: drm/mediatek: Add pm runtime support for > ovl and rdma") > > Signed-off-by: Hsiao Chien Sung > --- > drivers/gpu/drm/mediatek/mtk_disp_drv.h | 4 ++ > .../gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 62 > +++++++++++++++++++ > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 28 +++------ > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 2 + > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 20 ++++++ > drivers/gpu/drm/mediatek/mtk_mdp_rdma.c | 16 +++++ > 6 files changed, 111 insertions(+), 21 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h > b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > index e2b602037ac3..c44f5b31bab5 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h > +++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > @@ -109,6 +109,8 @@ void mtk_ovl_adaptor_connect(struct device *dev, > struct device *mmsys_dev, > unsigned int next); > void mtk_ovl_adaptor_disconnect(struct device *dev, struct device > *mmsys_dev, > unsigned int next); > +int mtk_ovl_adaptor_power_on(struct device *dev); > +void mtk_ovl_adaptor_power_off(struct device *dev); > int mtk_ovl_adaptor_clk_enable(struct device *dev); > void mtk_ovl_adaptor_clk_disable(struct device *dev); > void mtk_ovl_adaptor_config(struct device *dev, unsigned int w, > @@ -150,6 +152,8 @@ void mtk_rdma_disable_vblank(struct device *dev); > const u32 *mtk_rdma_get_formats(struct device *dev); > size_t mtk_rdma_get_num_formats(struct device *dev); > > +int mtk_mdp_rdma_power_on(struct device *dev); > +void mtk_mdp_rdma_power_off(struct device *dev); > int mtk_mdp_rdma_clk_enable(struct device *dev); > void mtk_mdp_rdma_clk_disable(struct device *dev); > void mtk_mdp_rdma_start(struct device *dev, struct cmdq_pkt > *cmdq_pkt); > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c > b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c > index b80425360e76..8de57a5f5518 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c > @@ -98,6 +98,8 @@ static const struct mtk_ddp_comp_funcs _padding = { > }; > > static const struct mtk_ddp_comp_funcs _rdma = { > + .power_on = mtk_mdp_rdma_power_on, > + .power_off = mtk_mdp_rdma_power_off, > .clk_enable = mtk_mdp_rdma_clk_enable, > .clk_disable = mtk_mdp_rdma_clk_disable, > }; > @@ -241,6 +243,66 @@ void mtk_ovl_adaptor_stop(struct device *dev) > } > } > > +/** > + * mtk_ovl_adaptor_power_on - Power on devices in OVL adaptor > + * @dev: device to be powered on > + * > + * Different from OVL, OVL adaptor is a pseudo device so > + * we didn't define it in the device tree, > pm_runtime_resume_and_get() > + * called by .atomic_enable() power on no device in OVL adaptor, > + * we have to implement a function to do the job instead. > + * > + * returns: > + * zero on success, errno on failures. > + */ > +int mtk_ovl_adaptor_power_on(struct device *dev) > +{ > + int i, ret; > + struct mtk_disp_ovl_adaptor *ovl_adaptor = > dev_get_drvdata(dev); > + > + for (i = 0; i < OVL_ADAPTOR_ID_MAX; i++) { > + if (!ovl_adaptor->ovl_adaptor_comp[i] || > + !comp_matches[i].funcs->power_on) > + continue; To simplify the code, you could call mtk_ddp_comp_power_on() for all sub device, and drop power_on()/power_off() of mdp_rdma. Regards, CK > + > + /* > + * do not power on the devices that don't define > + * .power_off() function > + */ > + if (!comp_matches[i].funcs->power_off) { > + dev_warn(dev, ".power_off() is undefined\n"); > + continue; > + } > + > + ret = comp_matches[i].funcs->power_on(ovl_adaptor- > >ovl_adaptor_comp[i]); > + if (ret < 0) { > + mtk_ovl_adaptor_power_off(dev); > + return ret; > + } > + } > + return 0; > +} > + > +/** > + * mtk_ovl_adaptor_power_off - Power off devices in OVL adaptor > + * @dev: device to be powered off > + * > + * call .power_off() function if defined > + */ > +void mtk_ovl_adaptor_power_off(struct device *dev) > +{ > + int i; > + struct mtk_disp_ovl_adaptor *ovl_adaptor = > dev_get_drvdata(dev); > + > + for (i = 0; i < OVL_ADAPTOR_ID_MAX; i++) { > + if (!ovl_adaptor->ovl_adaptor_comp[i] || > + !comp_matches[i].funcs->power_off) > + continue; > + > + comp_matches[i].funcs->power_off(ovl_adaptor- > >ovl_adaptor_comp[i]); > + } > +} > + > int mtk_ovl_adaptor_clk_enable(struct device *dev) > { > int i; > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > index a0b2ba3cbcdb..c7edd80be428 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > @@ -6,7 +6,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -362,22 +361,16 @@ static int mtk_crtc_ddp_hw_init(struct > mtk_drm_crtc *mtk_crtc, struct drm_atomic > drm_connector_list_iter_end(&conn_iter); > } > > - ret = pm_runtime_resume_and_get(crtc->dev->dev); > - if (ret < 0) { > - DRM_ERROR("Failed to enable power domain: %d\n", ret); > - return ret; > - } > - > ret = mtk_mutex_prepare(mtk_crtc->mutex); > if (ret < 0) { > DRM_ERROR("Failed to enable mutex clock: %d\n", ret); > - goto err_pm_runtime_put; > + goto error; > } > > ret = mtk_crtc_ddp_clk_enable(mtk_crtc); > if (ret < 0) { > DRM_ERROR("Failed to enable component clocks: %d\n", > ret); > - goto err_mutex_unprepare; > + goto error; > } > > for (i = 0; i < mtk_crtc->ddp_comp_nr - 1; i++) { > @@ -426,16 +419,13 @@ static int mtk_crtc_ddp_hw_init(struct > mtk_drm_crtc *mtk_crtc, struct drm_atomic > > return 0; > > -err_mutex_unprepare: > +error: > mtk_mutex_unprepare(mtk_crtc->mutex); > -err_pm_runtime_put: > - pm_runtime_put(crtc->dev->dev); > return ret; > } > > static void mtk_crtc_ddp_hw_fini(struct mtk_drm_crtc *mtk_crtc) > { > - struct drm_device *drm = mtk_crtc->base.dev; > struct drm_crtc *crtc = &mtk_crtc->base; > int i; > > @@ -465,8 +455,6 @@ static void mtk_crtc_ddp_hw_fini(struct > mtk_drm_crtc *mtk_crtc) > mtk_crtc_ddp_clk_disable(mtk_crtc); > mtk_mutex_unprepare(mtk_crtc->mutex); > > - pm_runtime_put(drm->dev); > - > if (crtc->state->event && !crtc->state->active) { > spin_lock_irq(&crtc->dev->event_lock); > drm_crtc_send_vblank_event(crtc, crtc->state->event); > @@ -774,7 +762,7 @@ static void mtk_drm_crtc_atomic_enable(struct > drm_crtc *crtc, > return; > } > > - ret = pm_runtime_resume_and_get(comp->dev); > + ret = mtk_ddp_comp_power_on(comp); > if (ret < 0) { > DRM_DEV_ERROR(comp->dev, "Failed to enable power > domain: %d\n", ret); > return; > @@ -782,7 +770,7 @@ static void mtk_drm_crtc_atomic_enable(struct > drm_crtc *crtc, > > ret = mtk_crtc_ddp_hw_init(mtk_crtc, state); > if (ret) { > - pm_runtime_put(comp->dev); > + mtk_ddp_comp_power_off(comp); > return; > } > > @@ -795,7 +783,7 @@ static void mtk_drm_crtc_atomic_disable(struct > drm_crtc *crtc, > { > struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); > struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0]; > - int i, ret; > + int i; > > DRM_DEBUG_DRIVER("%s %d\n", __func__, crtc->base.id); > if (!mtk_crtc->enabled) > @@ -825,9 +813,7 @@ static void mtk_drm_crtc_atomic_disable(struct > drm_crtc *crtc, > > drm_crtc_vblank_off(crtc); > mtk_crtc_ddp_hw_fini(mtk_crtc); > - ret = pm_runtime_put(comp->dev); > - if (ret < 0) > - DRM_DEV_ERROR(comp->dev, "Failed to disable power > domain: %d\n", ret); > + mtk_ddp_comp_power_off(comp); > > mtk_crtc->enabled = false; > } > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > index 10402e07a4a7..9940909c7435 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > @@ -396,6 +396,8 @@ static const struct mtk_ddp_comp_funcs ddp_ufoe = > { > }; > > static const struct mtk_ddp_comp_funcs ddp_ovl_adaptor = { > + .power_on = mtk_ovl_adaptor_power_on, > + .power_off = mtk_ovl_adaptor_power_off, > .clk_enable = mtk_ovl_adaptor_clk_enable, > .clk_disable = mtk_ovl_adaptor_clk_disable, > .config = mtk_ovl_adaptor_config, > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h > b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h > index 1c1d670cfe41..2597dd7ac0d2 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h > @@ -7,6 +7,7 @@ > #define MTK_DRM_DDP_COMP_H > > #include > +#include > #include > #include > #include > @@ -46,6 +47,8 @@ enum mtk_ddp_comp_type { > struct mtk_ddp_comp; > struct cmdq_pkt; > struct mtk_ddp_comp_funcs { > + int (*power_on)(struct device *dev); > + void (*power_off)(struct device *dev); > int (*clk_enable)(struct device *dev); > void (*clk_disable)(struct device *dev); > void (*config)(struct device *dev, unsigned int w, > @@ -91,6 +94,23 @@ struct mtk_ddp_comp { > int encoder_index; > }; > > +static inline int mtk_ddp_comp_power_on(struct mtk_ddp_comp *comp) > +{ > + if (comp->funcs && comp->funcs->power_on) > + return comp->funcs->power_on(comp->dev); > + else > + return pm_runtime_resume_and_get(comp->dev); > + return 0; > +} > + > +static inline void mtk_ddp_comp_power_off(struct mtk_ddp_comp *comp) > +{ > + if (comp->funcs && comp->funcs->power_off) > + comp->funcs->power_off(comp->dev); > + else > + pm_runtime_put(comp->dev); > +} > + > static inline int mtk_ddp_comp_clk_enable(struct mtk_ddp_comp *comp) > { > if (comp->funcs && comp->funcs->clk_enable) > diff --git a/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c > b/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c > index cb36a961786f..8feeb6dce217 100644 > --- a/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c > +++ b/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c > @@ -243,6 +243,22 @@ size_t mtk_mdp_rdma_get_num_formats(struct > device *dev) > return ARRAY_SIZE(formats); > } > > +int mtk_mdp_rdma_power_on(struct device *dev) > +{ > + int ret = pm_runtime_resume_and_get(dev); > + > + if (ret < 0) { > + dev_err(dev, "Failed to power on: %d\n", ret); > + return ret; > + } > + return 0; > +} > + > +void mtk_mdp_rdma_power_off(struct device *dev) > +{ > + pm_runtime_put(dev); > +} > + > int mtk_mdp_rdma_clk_enable(struct device *dev) > { > struct mtk_mdp_rdma *rdma = dev_get_drvdata(dev); _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel