From: Vince Hsu <vinceh@nvidia.com>
To: thierry.reding@gmail.com, swarren@wwwdotorg.org,
gnurou@gmail.com, bskeggs@redhat.com, martin.peres@free.fr,
seven@nimrod-online.com, samuel.pitoiset@gmail.com
Cc: nouveau@lists.freedesktop.org, linux-tegra@vger.kernel.org,
linux-kernel@vger.kernel.org, Vince Hsu <vinceh@nvidia.com>
Subject: [PATCH nouveau 11/11] platform: add PM runtime suspend/resume support
Date: Tue, 23 Dec 2014 18:40:04 +0800 [thread overview]
Message-ID: <1419331204-26679-12-git-send-email-vinceh@nvidia.com> (raw)
In-Reply-To: <1419331204-26679-1-git-send-email-vinceh@nvidia.com>
The runtime suspend/resume flow is almost the same as the suspend/resume
except the the arguments passed to nouveau_do_{suspend,resume}.
Signed-off-by: Vince Hsu <vinceh@nvidia.com>
---
drm/nouveau_platform.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 70 insertions(+)
diff --git a/drm/nouveau_platform.c b/drm/nouveau_platform.c
index 51bfce59c498..c71c62081b9c 100644
--- a/drm/nouveau_platform.c
+++ b/drm/nouveau_platform.c
@@ -177,6 +177,9 @@ static int nouveau_platform_probe(struct platform_device *pdev)
if (err < 0)
goto err_unref;
+ if (nouveau_runtime_pm != 0)
+ pm_runtime_enable(&pdev->dev);
+
return 0;
err_unref:
@@ -197,6 +200,9 @@ static int nouveau_platform_remove(struct platform_device *pdev)
struct nouveau_device *device = nvkm_device(&drm->device);
struct nouveau_platform_gpu *gpu = nv_device_to_platform(device)->gpu;
+ if (nouveau_runtime_pm != 0)
+ pm_runtime_disable(&pdev->dev);
+
nouveau_drm_device_remove(drm_dev);
return nouveau_platform_power_down(gpu);
@@ -265,9 +271,73 @@ nouveau_platform_pmops_resume(struct device *dev)
return 0;
}
+static int
+nouveau_platform_pmops_runtime_suspend(struct device *dev)
+{
+ struct platform_device *pdev = to_platform_device(dev);
+ struct drm_device *drm_dev = platform_get_drvdata(pdev);
+ struct nouveau_drm *drm = nouveau_drm(drm_dev);
+ struct nouveau_device *device = nvkm_device(&drm->device);
+ struct nouveau_platform_gpu *gpu = nv_device_to_platform(device)->gpu;
+ int ret;
+
+ ret = nouveau_do_suspend(drm_dev, true);
+ if (ret) {
+ dev_err(dev, "failed to suspend drm device (err:%d)\n", ret);
+ return ret;
+ }
+
+ ret = nouveau_platform_power_down(gpu);
+ if (ret) {
+ dev_err(dev, "failed to power down gpu (err:%d)\n", ret);
+ return ret;
+ }
+
+ drm_dev->switch_power_state = DRM_SWITCH_POWER_DYNAMIC_OFF;
+ return ret;
+}
+
+static int
+nouveau_platform_pmops_runtime_resume(struct device *dev)
+{
+ struct platform_device *pdev = to_platform_device(dev);
+ struct drm_device *drm_dev = platform_get_drvdata(pdev);
+ struct nouveau_drm *drm = nouveau_drm(drm_dev);
+ struct nouveau_device *device = nvkm_device(&drm->device);
+ struct nouveau_platform_gpu *gpu = nv_device_to_platform(device)->gpu;
+ int ret;
+
+ ret = nouveau_platform_power_up(gpu);
+ if (ret) {
+ dev_err(dev, "failed to power up gpu\n");
+ return ret;
+ }
+
+ ret = nouveau_do_resume(drm_dev, true);
+ if (ret) {
+ dev_err(dev, "failed to resume\n");
+ return ret;
+ }
+
+ drm_dev->switch_power_state = DRM_SWITCH_POWER_ON;
+ return ret;
+}
+
+static int
+nouveau_platform_pmops_runtime_idle(struct device *dev)
+{
+ pm_runtime_mark_last_busy(dev);
+ pm_runtime_autosuspend(dev);
+
+ return 1;
+}
+
static const struct dev_pm_ops nouveau_platform_pm_ops = {
.suspend = nouveau_platform_pmops_suspend,
.resume = nouveau_platform_pmops_resume,
+ .runtime_suspend = nouveau_platform_pmops_runtime_suspend,
+ .runtime_resume = nouveau_platform_pmops_runtime_resume,
+ .runtime_idle = nouveau_platform_pmops_runtime_idle,
};
struct platform_driver nouveau_platform_driver = {
--
1.9.1
prev parent reply other threads:[~2014-12-23 10:40 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-23 10:39 [PATCH 0/11] Add suspend/resume support for GK20A Vince Hsu
2014-12-23 10:39 ` [PATCH 1/11] ARM: tegra: add function to control the GPU rail clamp Vince Hsu
2014-12-24 13:16 ` Lucas Stach
2014-12-25 2:28 ` Vince Hsu
2014-12-25 20:34 ` Lucas Stach
2014-12-29 2:49 ` Vince Hsu
2014-12-30 16:42 ` Lucas Stach
2015-01-05 6:55 ` Vince Hsu
2015-01-05 15:09 ` Thierry Reding
2015-01-06 2:11 ` Vince Hsu
2015-01-06 11:15 ` Thierry Reding
2015-01-06 12:03 ` Vince Hsu
2015-01-06 13:29 ` Thierry Reding
2015-01-06 13:51 ` Vince Hsu
2015-01-06 14:23 ` Thierry Reding
2015-01-07 10:19 ` Peter De Schrijver
2015-01-07 10:49 ` Vince Hsu
2015-01-07 13:27 ` Thierry Reding
2015-01-07 14:08 ` Peter De Schrijver
2015-01-07 14:28 ` Vince Hsu
2015-01-07 14:48 ` Thierry Reding
2015-01-08 4:25 ` Vince Hsu
2015-01-08 8:03 ` Thierry Reding
2015-01-07 14:12 ` Peter De Schrijver
2015-01-07 14:19 ` Vince Hsu
2015-01-07 15:12 ` Thierry Reding
2015-01-08 4:23 ` Vince Hsu
2015-01-08 9:32 ` Peter De Schrijver
2015-01-08 11:41 ` Thierry Reding
2015-01-08 12:41 ` Peter De Schrijver
2015-01-08 9:39 ` Peter De Schrijver
2015-01-08 11:44 ` Thierry Reding
2014-12-24 13:52 ` Dmitry Osipenko
2014-12-25 2:05 ` Vince Hsu
2014-12-23 10:39 ` [PATCH 2/11] memory: tegra: add mc flush support Vince Hsu
2015-01-06 14:18 ` Thierry Reding
2015-01-07 10:08 ` Peter De Schrijver
2015-01-07 13:34 ` Thierry Reding
2014-12-23 10:39 ` [PATCH 3/11] memory: tegra: add flush operation for Tegra124 memory clients Vince Hsu
2015-01-06 14:30 ` Thierry Reding
2015-01-06 15:07 ` Vince Hsu
2015-01-06 15:27 ` Thierry Reding
2015-01-06 15:53 ` Vince Hsu
2014-12-23 10:39 ` [PATCH 4/11] ARM: tegra: add mc node for Tegra124 GPU Vince Hsu
2014-12-23 10:39 ` [PATCH nouveau 05/11] platform: switch to the new gpu rail clamping function Vince Hsu
2014-12-23 10:39 ` [PATCH nouveau 06/11] platform: complete the power up/down sequence Vince Hsu
2014-12-24 13:23 ` Lucas Stach
2014-12-25 2:42 ` Vince Hsu
2015-01-05 15:25 ` Thierry Reding
2015-01-06 9:34 ` Vince Hsu
2015-01-06 11:36 ` Thierry Reding
2015-01-06 12:13 ` Vince Hsu
2015-01-06 13:55 ` Thierry Reding
2015-01-06 14:19 ` Vince Hsu
2015-01-06 14:24 ` Thierry Reding
2014-12-23 10:40 ` [PATCH nouveau 07/11] instmem: make nv50_instmem_priv public Vince Hsu
2014-12-23 10:40 ` [PATCH nouveau 08/11] instmem: add dummy support for GK20A Vince Hsu
2014-12-23 16:39 ` [Nouveau] " Ilia Mirkin
2014-12-24 2:44 ` Vince Hsu
2014-12-23 10:40 ` [PATCH nouveau 09/11] drm: export some variable and functions to resue the PM functions Vince Hsu
2014-12-30 2:34 ` [Nouveau] " Emil Velikov
2014-12-30 3:18 ` Vince Hsu
2015-01-05 15:32 ` Thierry Reding
2015-01-05 19:50 ` Alexandre Courbot
2015-01-06 9:36 ` Vince Hsu
2015-01-06 11:49 ` Thierry Reding
2015-01-06 12:27 ` Vince Hsu
2015-01-06 14:37 ` Thierry Reding
2015-01-06 14:44 ` Ilia Mirkin
2015-01-06 14:50 ` Thierry Reding
2015-01-06 15:03 ` Ilia Mirkin
2015-01-06 15:35 ` Thierry Reding
2014-12-23 10:40 ` [PATCH nouveau 10/11] platform: add suspend/resume support Vince Hsu
2014-12-23 10:40 ` Vince Hsu [this message]
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=1419331204-26679-12-git-send-email-vinceh@nvidia.com \
--to=vinceh@nvidia.com \
--cc=bskeggs@redhat.com \
--cc=gnurou@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=martin.peres@free.fr \
--cc=nouveau@lists.freedesktop.org \
--cc=samuel.pitoiset@gmail.com \
--cc=seven@nimrod-online.com \
--cc=swarren@wwwdotorg.org \
--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;
as well as URLs for NNTP newsgroup(s).