| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <1380024325-18280-5-git-send-email-amerilainen@nvidia.com>
Date: Tue, 24 Sep 2013 15:05:25 +0300
From: Arto Merilainen <amerilainen@...dia.com>
To: <tbergstrom@...dia.com>, <treding@...dia.com>
CC: <dri-devel@...ts.freedesktop.org>, <linux-tegra@...r.kernel.org>,
<linux-kernel@...r.kernel.org>, <amerilainen@...dia.com>,
<mkulkarni@...dia.com>
Subject: [PATCHv3 4/4] gpu: host1x: Add runtime pm support for host1x
From: Mayuresh Kulkarni <mkulkarni@...dia.com>
This patch adds runtime pm support for host1x hardware unit. This
allows host1x clock to be turned off when it is idle. If pm runtime
is not configured, we enable host1x clock in device probe and disable
it in remove.
Signed-off-by: Mayuresh Kulkarni <mkulkarni@...dia.com>
Signed-off-by: Arto Merilainen <amerilainen@...dia.com>
---
drivers/gpu/host1x/dev.c | 57 ++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 53 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c
index 4716302..5f0b91e 100644
--- a/drivers/gpu/host1x/dev.c
+++ b/drivers/gpu/host1x/dev.c
@@ -23,6 +23,7 @@
#include <linux/of_device.h>
#include <linux/clk.h>
#include <linux/io.h>
+#include <linux/pm_runtime.h>
#define CREATE_TRACE_POINTS
#include <trace/events/host1x.h>
@@ -34,6 +35,9 @@
#include "hw/host1x01.h"
#include "host1x_client.h"
+static int host1x_runtime_suspend(struct device *dev);
+static int host1x_runtime_resume(struct device *dev);
+
void host1x_set_drm_data(struct device *dev, void *data)
{
struct host1x *host1x = dev_get_drvdata(dev);
@@ -143,12 +147,15 @@ static int host1x_probe(struct platform_device *pdev)
return err;
}
- err = clk_prepare_enable(host->clk);
- if (err < 0) {
- dev_err(&pdev->dev, "failed to enable clock\n");
- return err;
+ pm_runtime_enable(&pdev->dev);
+ if (!pm_runtime_enabled(&pdev->dev)) {
+ err = host1x_runtime_resume(&pdev->dev);
+ if (err < 0)
+ return err;
}
+ pm_runtime_get_sync(&pdev->dev);
+
err = host1x_syncpt_init(host);
if (err) {
dev_err(&pdev->dev, "failed to initialize syncpts\n");
@@ -165,10 +172,14 @@ static int host1x_probe(struct platform_device *pdev)
host1x_drm_alloc(pdev);
+ pm_runtime_put(&pdev->dev);
+
return 0;
fail_deinit_syncpt:
host1x_syncpt_deinit(host);
+ pm_runtime_put(&pdev->dev);
+ pm_runtime_disable(&pdev->dev);
return err;
}
@@ -178,11 +189,48 @@ static int __exit host1x_remove(struct platform_device *pdev)
host1x_intr_deinit(host);
host1x_syncpt_deinit(host);
+
+ if (pm_runtime_enabled(&pdev->dev))
+ pm_runtime_disable(&pdev->dev);
+ else
+ host1x_runtime_suspend(&pdev->dev);
+
+ return 0;
+}
+
+static int host1x_runtime_suspend(struct device *dev)
+{
+ struct host1x *host;
+
+ host = dev_get_drvdata(dev);
+ if (!host)
+ return -EINVAL;
+
clk_disable_unprepare(host->clk);
return 0;
}
+static int host1x_runtime_resume(struct device *dev)
+{
+ int err = 0;
+ struct host1x *host;
+
+ host = dev_get_drvdata(dev);
+ if (!host)
+ return -EINVAL;
+
+ err = clk_prepare_enable(host->clk);
+ if (err < 0)
+ dev_err(dev, "failed to enable clock\n");
+
+ return err;
+}
+
+static const struct dev_pm_ops host1x_pm_ops = {
+ SET_RUNTIME_PM_OPS(host1x_runtime_suspend, host1x_runtime_resume, NULL)
+};
+
static struct platform_driver tegra_host1x_driver = {
.probe = host1x_probe,
.remove = __exit_p(host1x_remove),
@@ -190,6 +238,7 @@ static struct platform_driver tegra_host1x_driver = {
.owner = THIS_MODULE,
.name = "tegra-host1x",
.of_match_table = host1x_of_match,
+ .pm = &host1x_pm_ops,
},
};
--
1.8.1.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists