From: Stefan Agner <stefan@agner.ch>
To: thierry.reding@gmail.com, airlied@linux.ie,
dri-devel@lists.freedesktop.org, stefan@agner.ch
Cc: alison.wang@freescale.com, jianwei.wang.chn@gmail.com,
meng.yi@nxp.com, alexander.stein@systec-electronic.com,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 4/6] drm/fsl-dcu: use clk helpers
Date: Fri, 3 Jun 2016 15:56:42 -0700 [thread overview]
Message-ID: <1464994604-4473-5-git-send-email-stefan@agner.ch> (raw)
In-Reply-To: <1464994604-4473-1-git-send-email-stefan@agner.ch>
Use clk_prepare_enable and clk_disable_unprepare helpers. This also
fixes a sequence issue in the enable path which lead to a warning
on resume.
Signed-off-by: Stefan Agner <stefan@agner.ch>
---
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 11 ++---------
1 file changed, 2 insertions(+), 9 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 9daca1f..06a4d01 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
@@ -232,8 +232,7 @@ static int fsl_dcu_drm_pm_suspend(struct device *dev)
drm_kms_helper_poll_disable(fsl_dev->drm);
regcache_cache_only(fsl_dev->regmap, true);
regcache_mark_dirty(fsl_dev->regmap);
- clk_disable(fsl_dev->clk);
- clk_unprepare(fsl_dev->clk);
+ clk_disable_unprepare(fsl_dev->clk);
return 0;
}
@@ -246,15 +245,9 @@ static int fsl_dcu_drm_pm_resume(struct device *dev)
if (!fsl_dev)
return 0;
- ret = clk_enable(fsl_dev->clk);
+ ret = clk_prepare_enable(fsl_dev->clk);
if (ret < 0) {
dev_err(dev, "failed to enable dcu clk\n");
- clk_unprepare(fsl_dev->clk);
- return ret;
- }
- ret = clk_prepare(fsl_dev->clk);
- if (ret < 0) {
- dev_err(dev, "failed to prepare dcu clk\n");
return ret;
}
--
2.8.2
next prev parent reply other threads:[~2016-06-03 22:57 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-03 22:56 [PATCH v2 0/6] drm/fsl-dcu: suspend/resume rework using atomic helpers Stefan Agner
2016-06-03 22:56 ` [PATCH v2 1/6] drm/fb_cma_helper: add suspend helper Stefan Agner
2016-06-03 23:09 ` Daniel Vetter
2016-06-03 22:56 ` [PATCH v2 2/6] drm/fsl-dcu: store layer registers in soc_data Stefan Agner
2016-06-03 22:56 ` [PATCH v2 3/6] drm/fsl-dcu: move layer initialization to plane file Stefan Agner
2016-06-03 22:56 ` Stefan Agner [this message]
2016-06-03 22:56 ` [PATCH v2 5/6] drm/fsl-dcu: implement suspend/resume using atomic helpers Stefan Agner
2016-06-03 23:13 ` Daniel Vetter
2016-06-03 22:56 ` [PATCH v2 6/6] drm/fsl-dcu: disable vblank events on CRTC disable Stefan Agner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1464994604-4473-5-git-send-email-stefan@agner.ch \
--to=stefan@agner.ch \
--cc=airlied@linux.ie \
--cc=alexander.stein@systec-electronic.com \
--cc=alison.wang@freescale.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jianwei.wang.chn@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=meng.yi@nxp.com \
--cc=thierry.reding@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®