From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751255AbdINHLC (ORCPT ); Thu, 14 Sep 2017 03:11:02 -0400 Received: from mail-dm3nam03on0136.outbound.protection.outlook.com ([104.47.41.136]:45287 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751085AbdINHLA (ORCPT ); Thu, 14 Sep 2017 03:11:00 -0400 Authentication-Results: spf=neutral (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; From: Alison Wang To: , , , , CC: , Alison Wang Subject: [PATCH 1/2] drm/fsl-dcu: Fix DCU pixel clock issue in suspend/resume functions Date: Thu, 14 Sep 2017 14:53:40 +0800 Message-ID: <20170914065341.17615-1-b18965@freescale.com> X-Mailer: git-send-email 2.14.1 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)(376002)(346002)(39860400002)(2980300002)(189002)(199003)(5660300001)(356003)(316002)(47776003)(189998001)(305945005)(15650500001)(8676002)(16586007)(81156014)(81166006)(1076002)(2201001)(5003940100001)(36756003)(2906002)(50466002)(48376002)(8656003)(498600001)(575784001)(8936002)(50986999)(4326008)(53936002)(54906002)(50226002)(104016004)(77096006)(6666003)(97736004)(106466001)(105606002)(68736007)(42882006)(33646002)(42262002)(2101003);DIR:OUT;SFP:1102;SCL:1;SRVR:BY2PR0301MB0776;H:tx30smr01.am.freescale.net;FPR:;SPF:Neutral;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BN1AFFO11OLC004;1:hJN/Q8s0pUp/V6bhGfZq+FkfeyhIWoOK2P5MEL3IxysqSWfu/jKCS6Y+w3Sp4QHDdjrzvAynS5bd5rxqt+bBdfKAuGHr4i7QajUebo1ROH0pZNAKLTpz/Qj7pDPbJlS9 MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cbdbf0a8-f3b0-4f52-c2d2-08d4fb3fbf3d 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:BY2PR0301MB0776; X-Microsoft-Exchange-Diagnostics: 1;BY2PR0301MB0776;3:J+yiEidacgvXQi7us332CDlhvV8nouAM5SpvHa0M/BDY7Qca8UK6W4ezEe4krW6pPmce9BnDtCe0zIkztrrCMIykkSIgP+e2OcRJ145Yo4JkCCz/QN/S3B69bPdk0MQXHHmHk1QVuapOPsmpWCAu/mzxWpnG1OUBWHWrTKgi9rkZO2eZH2gMoHwdo3hgUnxNmyNvIV/Ryb+UqOc9K1GXRep1wExJfHkE1voi4EYROuiOv7IYmjOdjDgkiunwe0a5C2qJdA4B9jC3fWYIaJq9Pbso//7k1J6XMLQ1OiNDZdmp4QIGIuz74X76MJ+Qyj/sJrFePNLNyPQtIK0qGwcnUwINE/VuMQ4wFzer52G9xR8=;25:PYUlKAUlPNysklCijb8JCUpQJXmDv3VNHjRyQ1kGFkscLllBuL8RpmOmGqKhiVkOUJgyjjnp2ewn+/doT42Uvy6+Bd5Tk0E8w497cNw0zZCUelV4Y4B3qZOuOLXSyYuxtbD208OvkHySeDk7epN5BBcn8BD7VkB3BXBDh1+UNTxoOdLQ1Sd/6xgzzkvOal7izEEduxFoTSbyTkslxk4909CURL0nOhcBW3w6o5xgkueENmLs5CcDyBeMCDJkE0sTYBaYCca2tPk7SVVZ3Zd4LkPaanKdbbyXqdYMj1P2c1r3CH2k6cdKYMkS2sMPSR+1c0jhd2YFydk15dGs5zdUzw== X-MS-TrafficTypeDiagnostic: BY2PR0301MB0776: X-LD-Processed: 710a03f5-10f6-4d38-9ff4-a80b81da590d,ExtAddr X-Microsoft-Exchange-Diagnostics: 1;BY2PR0301MB0776;31:JRz9lmIV3+Gx/MvwkYc3/3TRyYT8U7p9bHd1EIXeXbSoJiwTmO3mgWMJuwiSlgox4fMpe1XH3hgYf5FGKOINNj9f3HvmlYyHONREyQsJ9C2Ra+Jlfo7cnykegTAoUF2R0JSPyjXJQXeCecW03dnm90w7ky/JRtqyv9b/yZ3jUeQDXar7lNbgR/nfFaVnQ3ARqWjqI6y7WuiotaxLDN8yytY25sCsWlHe72S6FZ8nboo=;20:Yjyv0YaCr+qyVITHWtkkNm/rb22t8uaPhpzH7pqONpzZvK6lIfwuQZwQj1rwmgIG10k1AdFn12ZkBEduPlGIS5PdUAGafzNOwdZi8UdSeOAYGY6XRbCOxbw3ey/N1O1XRMZCt7JbltvUHAUDEnETlDYLImmh6MqU48/hM/+rw4fr5npEqs/DHua8r5Kb2m3OnOtVy7dRl7CqoEVZv+MOBrYU8dtuyIXJ8N+Z0cnLIdFQKKaEDZPOFSWCFdtsF1MRgPCtGE4z3G2w0Bl/6zwGtGumM0qgHLEtQ/0BSUMhinl7BYCJXz9WtI1OeCM+CMX8FMvCzC5qj9Xjc6ANNRM9UxLSGKTbi2e1cEDtip027KB/VZLPBcsoJ9BuauhJvZ1XK/m59ep1r3n2Js2MhgQ9g/RSG56ypzelAIqNA707URW+dIFjnaKQgh1IIJKR6ecMet+2HCY7qMibym6Hn9EA60UInqwQZrRodeR09jOZqGZjq7SlDI84i+diiDXi7U0ETdgFk8V22+tPayNPsFGHQzy8Nsjw7SSqtKuMLbfImthTjjhdKKjaI01nr6OGxJkAL+xfrwgl+eqPlyTraEj670EhYwAQm2BRysa6CjcGOGI= 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)(8121501046)(5005006)(3002001)(10201501046)(93006095)(100000703101)(100105400095)(6055026)(6041248)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061750153)(20161123555025)(20161123558100)(20161123562025)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:BY2PR0301MB0776;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:BY2PR0301MB0776; X-Microsoft-Exchange-Diagnostics: 1;BY2PR0301MB0776;4:wdArR1d1GYdcBigYIqtRdymAxUBAx8gyi26nKAg1lsCfpEXDV4ZL0vM4m1RANMzeU158o+Z3cckJqacx6RgyCjk9El2Frr2cbjmcViU6asy/1/eG1l6LesOSNAXoNgDBhsI9y/XNbDkYbCXG8pZdYRpBVoFZ+bTRtX0dCvnJ8yF8H71g2/YT6wJpmZwbvnXAhYndk1kwPbQBamKLLM3kFhD7DEo8BxXXJcXv2O2LKUbd/6yydHx1gidvKfj235i+dvZvINuN66tkVsvP5nsI8w6REcTZAODdpSF7SAJLGus= X-Forefront-PRVS: 0430FA5CB7 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY2PR0301MB0776;23:/G7dfPcaYa52ePy/hkt7Sy+XGtFtRjwL/X19hhP?= =?us-ascii?Q?Z0kTMCumUz12xC1XmsJC3DLeLBtQOglmadVAfDTUhVQBnj2OeIlAJfhxZUTc?= =?us-ascii?Q?9OX/Gk49SquR0GVQHvtczdDuhRDn14n8lerSSYomJgG0Nqfp6v/FydJHX+48?= =?us-ascii?Q?Djwbj6i07gn1++WhoAf/s4qPNkDql/E7Fz1OTbdcVpsh0LFrmYJUWX6bjslA?= =?us-ascii?Q?HMlghurPGREjwk7HcAkI/HOiIgzJaJJ80WJK9iUfGbTlYBWNVUKyVti795Ao?= =?us-ascii?Q?XtTTicoJ780kSg2zLabahqYx54OFDvjccsZ6upGxOwBuBn9osAzrItBayunw?= =?us-ascii?Q?WWBjf1tvderJDN0sTuX1Xq+401qs/cSSTgvLz4bjy0PEbl9U6gQW+uyzPIZd?= =?us-ascii?Q?WqcHMARGAYT9zwrr+RYeNcp7RY0e5m+nM40KgP7gPDEvLXwFajx65JuJnWqx?= =?us-ascii?Q?RGKlHJT2m87e9ciwHV9fCrkBYjhS4ZBhCs4Ez4DIx6jG4Yhbn2k6Kg3FtJ33?= =?us-ascii?Q?VjiqU9jb5tovT+n2qtu40YKDssCY7561VYUbejzaJGiTPXmzBetCUIpeXPId?= =?us-ascii?Q?YyTiYv1NPlttdiwTiDKxXRM+1i58Gwx26oZT7LHl1fNeniY/vQSPmvcioBaM?= =?us-ascii?Q?eqtnGDmWj0SC7xuGjfY8o84zIgqz88ZD6Z1tGSSeANp8me96uS9wV+gnKsJj?= =?us-ascii?Q?YEol17K4Xu4wKBDZAqyigdnyY7NPQQnglXVlVL1QfEDHOqWcsFtMs5ih11EA?= =?us-ascii?Q?nNraO81B5FTKc6pFUpYm9CkLvmtVWgSD4BukBqQp7UF13ldMwvUCQfHacplG?= =?us-ascii?Q?IK/LwDx2yPVwV7/9cu1ly56qhdkaDCgqCPCrNRPS4LwdES/lViUSAVhvcB4I?= =?us-ascii?Q?HaX3UjxmaoJTDma8TRGTCyFSoJeyu81vVuD91SZ0XxVO8NVi+znO6tk7FOIw?= =?us-ascii?Q?5ETsOgrAlSwX0o6mBJuw/uKJwch+WqZ3TkpKzw2xHvDQAXf9TWo80icUuFFf?= =?us-ascii?Q?kqL+aPxwZ+Fw5LXaJlhw9z4Z5MEPtNbU4cekMXKOCEaa5rp62SRKeEE40gA/?= =?us-ascii?Q?5NrAwiqd7/XdC2wzle2oG+K+QQKDH?= X-Microsoft-Exchange-Diagnostics: 1;BY2PR0301MB0776;6:qxaDl0/2KyX/Zx54Rs3h82wllUx7hTq34Fvn/MN99WCyx8BWXV2Mkw6pI7s0nOD+Mt92ppoaFN6pAeSHenkf/Jn82e3P1vS5Uja8kjcwjaNpK+efO5C6fV+susnNCSEXGZSANvK14G2ulUYY6zRqttMf4ASIlALux4gPD9Bfnl9pVKV7G3FjnrY+6aeFI6Tu+TRRyXg1smLDTpxroI10AuOQ5Kg0wFjftR9X9gvhNf9bRyMQJ5sLWbbZIWk5u4uCuLp+d+Dvo0tceYNh6MCkVEZCgrKCsCB2eqKi3lNt98v0B7iLXQOqntjxmPYp0bfbKEk79s1OLiAiA6NwP4VIDQ==;5:j4kvLf74sPT1nCujyVAeVya5pA1COguIQJ+RFfUkBufjMq8beKnJzVZ5dNwIYvEnx7pQFXDkdMEeltT+PwsxfR5Ml2A4Lk0IAGRaMbamn5l4JwRYGR5FrOFywKcJLuYLCNZHJoxcdVgo/aDvto9wjA==;24:S6bE5L/Gv/Qys8mk0jqXq8vuNwTVlm6q65Qqo7FgJfMTCv/UezydAv8ToB3gfIO9ji/u9g2qocc5p5MeCSUuVmTP0C9tAE/Dz/XM+nnkp9o=;7:qmDQ1WD3d0LFIC8A5r9Zcf/q3hYz18feQvduAe8Y9Q/Q2hlHwIvOhHmNb8/Mc56UbiThWDJoUGhjCUFKvIj/J665Urb2ZE+1zYd0aSIkruidhZij9ESLk8gdsT2wAs3mfNAYabFnmveB6sU3xFmY7p9UvWR03WYScMHw3AL8Zm/IC8dxQ0N4LwpHmEp8WPTgcuG0Axr5cW9g16eq5HyFbAlPbszsiUfWl+4mCPO6YQ0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2017 07:10:57.4373 (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: BY2PR0301MB0776 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As there is not corresponding clk_prepare_enable() for fsl_dev->pix_clk in previous contexts, clk_disable_unprepare() for fsl_dcu->pix_clk in suspend function will fail. This patch will add clk_prepare_enable() for fsl_dev->pix_clk in previous contexts and resume function to fix the issue. This patch is verified on LS1021ATWR board. Signed-off-by: Alison Wang --- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 58e9e0601a61..875b0fdc4274 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c @@ -230,6 +230,12 @@ static int fsl_dcu_drm_pm_resume(struct device *dev) return ret; } + ret = clk_prepare_enable(fsl_dev->pix_clk); + if (ret < 0) { + dev_err(dev, "failed to enable dcu pix clk\n"); + return ret; + } + if (fsl_dev->tcon) fsl_tcon_bypass_enable(fsl_dev->tcon); fsl_dcu_drm_init_planes(fsl_dev->drm); @@ -351,6 +357,12 @@ static int fsl_dcu_drm_probe(struct platform_device *pdev) goto disable_clk; } + ret = clk_prepare_enable(fsl_dev->pix_clk); + if (ret < 0) { + dev_err(dev, "failed to enable dcu pix clk\n"); + return ret; + } + fsl_dev->tcon = fsl_tcon_init(dev); drm = drm_dev_alloc(driver, dev); -- 2.14.1