From patchwork Thu Sep 14 06:53:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alison Wang X-Patchwork-Id: 9952509 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B16DE60230 for ; Thu, 14 Sep 2017 07:24:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 91CDF287EB for ; Thu, 14 Sep 2017 07:24:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 85E3E28D1A; Thu, 14 Sep 2017 07:24:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DA9FD287EB for ; Thu, 14 Sep 2017 07:24:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=aU8otpwODLdYdaGd7KDL7tQCi4Nw6xZRHjZ2X1mI2wQ=; b=hgYwJDVvFCkQjG a8rps/JeOAisUQTG6BBIYu3dWdscEVJE97Uzxr7gbtbmmFm174bA8klrqGQLZ5KS9zbUqH+zzYfG6 zE9DIdjYZTEvkQDOCR7Hi1QehHnQx/7F/8ESKoVF+plGipzV0mlTrvQRrMDGfdDpiS4d85lYmbU3o CQmA0TW89T8HuP9a2bkjOxd65+PuXd7zQ8xMdM3uaPPgoyUD3dqzMKVj25MfSUjtOirGgRz2Ns9bu YP1NWTZoOGkHX/dAb0BT7pxHemdXho3R+ttRUls2nZ4u4DO1xfQqcO/Cm+0vTJUCgKzGhzdQJnRPm NtxpDxTfLYpnOHgv5sfA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dsOVk-0002oS-Rm; Thu, 14 Sep 2017 07:24:32 +0000 Received: from mail-cys01nam02on0099.outbound.protection.outlook.com ([104.47.37.99] helo=NAM02-CY1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dsOJ0-0004Mk-VX for linux-arm-kernel@lists.infradead.org; Thu, 14 Sep 2017 07:11:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freescale.onmicrosoft.com; s=selector1-freescale-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=G8tu8mm6a4PBUHVohJ/MQvv/ujVXB6T7Jm8IAW1RtFE=; b=j/Kso4EFyz/bs3+mqUddnSCIL1lYCkxWC13wR7SKDLryZFvuHegyVXKwHDxQ7kZAFXSKsKLILlYoq/NyB2AzFnMqJOi9Qfh0iXbiL7QPtr6/KpKHhstRgexHOAR5kLWOd8xlYrJn8BOGGUaY3nLpIIQTTvPlKcbyxxytJHuxK+c= Received: from BN6PR03CA0085.namprd03.prod.outlook.com (2603:10b6:405:6f::23) by BN1PR0301MB0770.namprd03.prod.outlook.com (2a01:111:e400:4c::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.11; Thu, 14 Sep 2017 07:11:00 +0000 Received: from BN1BFFO11FD030.protection.gbl (2a01:111:f400:7c10::1:191) by BN6PR03CA0085.outlook.office365.com (2603:10b6:405:6f::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.56.11 via Frontend Transport; Thu, 14 Sep 2017 07:11:00 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=none action=none header.from=freescale.com; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1BFFO11FD030.mail.protection.outlook.com (10.58.144.93) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.13.11 via Frontend Transport; Thu, 14 Sep 2017 07:11:00 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v8E7ArT6003664; Thu, 14 Sep 2017 00:10:57 -0700 From: Alison Wang To: , , , , Subject: [PATCH 2/2] drm/fsl-dcu: Fix the interrupt issue in suspend/resume functions Date: Thu, 14 Sep 2017 14:53:41 +0800 Message-ID: <20170914065341.17615-2-b18965@freescale.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170914065341.17615-1-b18965@freescale.com> References: <20170914065341.17615-1-b18965@freescale.com> X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(346002)(376002)(39860400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(8676002)(189998001)(2950100002)(47776003)(77096006)(76176999)(5660300001)(33646002)(50986999)(50466002)(42882006)(6666003)(97736004)(316002)(36756003)(105606002)(54906002)(498600001)(53936002)(305945005)(106466001)(50226002)(2906002)(104016004)(15650500001)(356003)(2201001)(8936002)(48376002)(5003940100001)(1076002)(85426001)(81166006)(68736007)(81156014)(4326008)(8656003)(16586007)(575784001)(42262002)(2101003); DIR:OUT; SFP:1102; SCL:1; SRVR:BN1PR0301MB0770; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD030; 1:g6njKWcSJEYqdhlpp0lAgZonr8bP0MvZliaqtcnCp0THAxzGE+kLZ83/8TDYa4nTqA8edp57F84sxjh+vICSegvkcKzod7FBoJHYcknydC8Hpe39oWU+13v2U4s0sAHB MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0fa243fb-1220-4be0-e91c-08d4fb3fc0ff X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:BN1PR0301MB0770; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0770; 3:UTCSRAe1DXLBf1hIIMXgfMFlf1dKRVz5114w5iO6baZsSOetXqkyov5Uy6fZcdEtfyv1PmNNIXwCLqASCvO59Mz59d8H78CDKh4j/h35dlCymEAyS3k5OIRyFNgOG0geVdgcqF2N3C1MPkokwRYYoz86kQoQJINuSchOJrhATjY1YGTGGIp+mu+nYOFI6jlFn9ITrjDm3O2j/iw44Z8EbWHYKCETzqpvg7x5CkirBlTHZkbwQSGjRjWr46MIEaljHHeYf86FqoE9DjF0Mxy004vKA/Hf3TCj0OkKNmxQ2GQzalvgsWxYrIwdb4kY4o+I/CLhOYAbcn+kzWgdrUcxksd8/uS7AwjJXEJT/F319bU=; 25:irQj/vbTqJybY2B401YW3Cme5K11K47pJWEDp3qCuezNcaAGbyUNKtIiUmU/YFMGmebUwfICiK3sss4hK3abcH+mFCUeZR0ry9wGLttkmly4SUrRxR4qyczwtZucuwuFD08Fh9aatR6ifbeUZqqPyL6XMdvHCDKJpwWv9hGikzucQhPVavONFl/t1Jq8/UY8fGLYptdxEvZNFKKHP4WcjP2UetyW+DXpVXn+CFeB1ZCA0J8WCdZEOiIyrg2/7Jyyqvsft0HK3CbFhvZeGueL0DZ7sOEeARV39MmiuDDfAyRZYjABsEVUd/ns2Zt3yyV+48JnzGnNS1aaHYljtdL4pA== X-MS-TrafficTypeDiagnostic: BN1PR0301MB0770: X-LD-Processed: 710a03f5-10f6-4d38-9ff4-a80b81da590d,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0770; 31:4IMVNYCwalP6NI3/pED3/XiY9fKYaZ0qXT0oAaITA3sAZZgc+TICESfl4zTxJHPimwf6tnvnNbv4mOkm71plV/10VuGBmWx9iEwn9L/5cdrbNuoAI7ZqKUf271OjRosGNrWTDvhrmuP9YCjpA9A4cdsiZ/3DBboKVPw0ECEWAxXxDoMfZzlYjY7GDM4wbZzYSxT0KcenRu5ZZd8hNotFL9++b1/N4vV8ORe4mc3mv6Y=; 20:Q9kEe+4s6kJuMDq6ixr9AjCi8P+JcnbpIowh+SVD/IWb+zSo/udI3HQi65d4H3Me//KdiqyXRYbbQZOcKwuWL1OBd4Stop8nsptZQvjKAbPndpskw6f0suEUOJCslVr6p4LTKS1pZNJAcczvpga1vB2AP86k1FBCKptXibd+58C32/RHyQSeDh2RhFe/RtY58bix9g9M4L8cYGaUdx/8Zo4GcXBbnXmGS6p5wN/DKyc8FX6LDJBDXlOVDw6gq4pueHmkuUZLdwo1odaI9x/TbRfV7JyPeZ3DCxySBdd7IyFQ6vYgtfqQlqIsnqz5jQ+LdYXp/r6tj30qTh8Izgd+GbBjHcHElnZpA75vZk03Wzz51GVdbcbYxZcqDia1lDIbtS+70TfcJV9gKECB05jai8VFLtiXreAvlNftxgC5MV9z49Xm0EKgcP/i+RfwkdmsPOXlpm0mSEV13GwTsXhyEXplSVgKWKcRvjgEA8g8H9Nh5uqgMW+xDmIWzUZKqwVP9NKpHey1HA7RrUftfS2YvfK4ZHGkBD9AugwmuO7wa1vS6Zm7Bwk80+NqzLs/2twdYpgn9faO8NAi7iuomlWoRe1ynYLjZJ7FiyJYgBqAVIc= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(93006095)(3002001)(10201501046)(6055026)(6041248)(20161123562025)(20161123564025)(20161123555025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061750153)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN1PR0301MB0770; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN1PR0301MB0770; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0770; 4:3X+wfMvviey23KaOnWFJAHTo8Gd4ht9FKuNb7witHkoh53X+5jfZ6b4ul15j2+thrha8lHqCo6lcrvU85Jf/QizGSyAV4HyMMrYxEVe7QWwnTWX2Sv6cbad7B7DoEJ60zybJ4c2GHtJCU5aCbB27gO53kY3A8lsZZljXbWSItdP66UwV2T6L0K8AvNDr7TN7yRcCZqSRStLim1ca2t32gO2+5V4juxTu0Mjs76fIOGTNUNWPs9qcvzZWiWahiKBCIltrXt7Q7nB1oY2Wt0YR4Iu1AQaw+jSUA7Nef7s8xyc= X-Forefront-PRVS: 0430FA5CB7 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR0301MB0770; 23:/DgpaCm05xeFhVZksU/DxeEoovyND7DYM/jTdmR?= =?us-ascii?Q?uqKqqIXF2L8X7j+yTm7N+O25dL4G6eQBZIxl1byK2YR33+2PbAN0r5y/9jbz?= =?us-ascii?Q?kretXVVk+NT4nl/cvtZpVzC5uK2QqmtY5Gxi/RSMfgglcgQ/3A1RJyqCC0gd?= =?us-ascii?Q?h8zOuJG71vb1TiDtxrfafbaDaSqZxQXnOq+iotRzZNpV49ngclCSWAkw9vo3?= =?us-ascii?Q?ffjSVcxn+9QsQcWiTQei4vxmOsXrRCEo8ToEA2Zd628I0yMllMSttUUMl2Ht?= =?us-ascii?Q?5YHAbDX8nF3BHzkdrsJrwR7dFBlO3VmMICUzsB947OGGFbpbhVquVUWirgQU?= =?us-ascii?Q?fFCGZRf+mmaemuB+UyszrpvHWTq0junL/hVNQ1sQ2WtChcxOQyGvy38bsh+v?= =?us-ascii?Q?m+w5mJCWu6UQJH7dgbkrbykgl/g86tv3NjmlBvjjhiAUp8b3OXXC01Yocb7Q?= =?us-ascii?Q?PZUgxeNz3qljowpusYdobW8ynfcpbuF2/70YIvbmIe0BQNfZozilbOyw3NtF?= =?us-ascii?Q?qwfziXNNczoNhCsTqISncF96MmCVJ8uZ8UaCBhmkkfHDZGM4/3U77L+csmWY?= =?us-ascii?Q?f+jjQIvP+uvpX+Q0tKQpsgWkg5ha2C18bTkQlWF2dT560i0h8jY6qIVGvhnp?= =?us-ascii?Q?2ctz0BkA2RNrH3Pl7yRHypkEJacv/YSnftF8AP+za0XDFNzKpSVUEilOFhn5?= =?us-ascii?Q?ifBZlNd8Tt2A9IR9WDkenJMcMT48k6/U2lYB755Xq7pnvT+PEgG4eh5Xaa/U?= =?us-ascii?Q?/bb/fFBgoRnAqab98FH3gFZ12/UfqP/r/Jjuw2HNHKiI2wh4fFeNKoqG6CDh?= =?us-ascii?Q?OF+7NiIEiPZk8FLGS4SLtzZ8aJja9gNnexEFJDI+tOdiAMWU+143IqK/GaYs?= =?us-ascii?Q?xG1TDj13svMVouLZku1ibNNXmUcY4AVUaZ2HF1DBfWrOwz870f0rdqnnHGoL?= =?us-ascii?Q?4ds/9U2j3N52C45fYEOUV/rNIke3UtYqJd9ZBm52KywXTLj8ooCuxCxRNaUX?= =?us-ascii?Q?0tRFpQ54Euvad30RfrlwuciCHgEo3eA4sVhLTtgXDIMEp3PCzIrGkH4aCm9s?= =?us-ascii?Q?JijYUojWagva67lVOnkx6TmL26nlw49OASFXKCIW9BtA6D8mlTFnTXpa4Z08?= =?us-ascii?Q?uSgNjeg2WqAyco8K0vBj9nt2IHCaetTxLKPZgPt2fl4kP58hpGIQACxs7Crz?= =?us-ascii?Q?bYXhc/sq9l8kxhBO5iob93UtfHiCgRQ1pOPRE?= X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0770; 6:lbSHfaewLGVvAt7Y+b9+6UgNhp1OVTnhwwsYrFuYJq6CsANkUuvUZCKL/6uECJry+F4MZ4v1CIXOf7IVtQDPutcf5haC/HV2SlDjW2u6ImzCvjtWHNLhThSv6bgD0Ts1jj8RbiwiZNHieEezgDSTnj6//FPmKNyv+EHoiCNFmtk1eYVEfjg0UjxcQ7nYHwBXiFST1xoXvduMybDQaXTDi650qPQ1pG1gpy2MOPhJ55cH+iOKi5VNQCE1Vr2+HUDaRArM2c4VfW48fzjkWSHbGFvWUWiDyhOxxEvYO7gokJWFgKyNLGRgSn1tLyGYAoAuCxHmLRW7gfWnKvtNsL8lcQ==; 5:PCEHq4zeybjRBpbScej3uJhdDrNJOdttbLW4NS+hGF7+NC+D18/HxO9hmw+twb8XwYbkl2Hu1YIEjXvJivXouklNPlgrB7e50TE3Ryu+TfIDkxCF5vuS/j04quRG3ztuDt3/9yVYcqGc6qi/VI6ivg==; 24:Ux64Df5AMah3G4suGypHJf6E0B2y/tmirw/kL1/JdMsSKIEos1WOD9yPXep1+/WuOoTd9fpgQKxClhpUF9a0GPCc/LdUJwdnt8lcbSw5m50=; 7:96EHpj3ldC7rwgO4+fNtUy58vitfYGP8oQBsoaiAxkfjHhaPc6/qYaNHfTDwaqzRFwHtEbD43fkbqGOaDZCIG+DQdx/92Y0NSauPkg0hq5AC7akAGt3PtmW/Twhmvkpxy+YxRCQiJ2h43TMZ1TOsdT5dqhORkkfuq6jJ/TUz0oFKSZ4ZyqlXfvY5UzMegKC/w4uxjD6b7V68v8IJO9UX0zUjDJOJRI2rvdG1PK/hDNw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2017 07:11:00.3874 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN1PR0301MB0770 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170914_001123_182778_3F09F6C1 X-CRM114-Status: GOOD ( 16.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alison Wang , alison.wang@freescale.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP drm_atomic_helper_suspend()/drm_atomic_helper_resume() are used in suspend/resume functions. Interrupt can not be disabled when calling drm_atomic_helper_resume(). Or else vblank interrupt will not generate and the error about vblank wait timed out will occur. This patch will enable interrupt before calling drm_atomic_helper_resume(). The patch is verified on LS1021ATWR board. Signed-off-by: Alison Wang --- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c index 875b0fdc4274..aa0393d32661 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c @@ -192,7 +192,6 @@ static int fsl_dcu_drm_pm_suspend(struct device *dev) if (!fsl_dev) return 0; - disable_irq(fsl_dev->irq); drm_kms_helper_poll_disable(fsl_dev->drm); console_lock(); @@ -210,6 +209,8 @@ static int fsl_dcu_drm_pm_suspend(struct device *dev) return PTR_ERR(fsl_dev->state); } + disable_irq(fsl_dev->irq); + clk_disable_unprepare(fsl_dev->pix_clk); clk_disable_unprepare(fsl_dev->clk); @@ -236,6 +237,8 @@ static int fsl_dcu_drm_pm_resume(struct device *dev) return ret; } + enable_irq(fsl_dev->irq); + if (fsl_dev->tcon) fsl_tcon_bypass_enable(fsl_dev->tcon); fsl_dcu_drm_init_planes(fsl_dev->drm); @@ -246,7 +249,6 @@ static int fsl_dcu_drm_pm_resume(struct device *dev) console_unlock(); drm_kms_helper_poll_enable(fsl_dev->drm); - enable_irq(fsl_dev->irq); return 0; }