From patchwork Thu Jun 13 09:53:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mayuresh Kulkarni X-Patchwork-Id: 2715461 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 690BDC1459 for ; Thu, 13 Jun 2013 10:31:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 46BDD201CF for ; Thu, 13 Jun 2013 10:31:51 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A4D57201D5 for ; Thu, 13 Jun 2013 10:31:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 85865E64B3 for ; Thu, 13 Jun 2013 03:31:46 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from hqemgate04.nvidia.com (hqemgate04.nvidia.com [216.228.121.35]) by gabe.freedesktop.org (Postfix) with ESMTP id 52098E6018 for ; Thu, 13 Jun 2013 02:54:34 -0700 (PDT) Received: from hqnvupgp07.nvidia.com (Not Verified[216.228.121.13]) by hqemgate04.nvidia.com id ; Thu, 13 Jun 2013 02:54:41 -0700 Received: from hqemhub01.nvidia.com ([172.20.12.94]) by hqnvupgp07.nvidia.com (PGP Universal service); Thu, 13 Jun 2013 02:53:17 -0700 X-PGP-Universal: processed; by hqnvupgp07.nvidia.com on Thu, 13 Jun 2013 02:53:17 -0700 Received: from mkulkarni-linux.nvidia.com (172.20.144.16) by hqemhub01.nvidia.com (172.20.150.30) with Microsoft SMTP Server (TLS) id 8.3.298.1; Thu, 13 Jun 2013 02:54:27 -0700 From: Mayuresh Kulkarni To: , , , , , Subject: [PATCH v2 2/4] gpu: host1x: add runtime pm support for gr2d Date: Thu, 13 Jun 2013 15:23:36 +0530 Message-ID: <1371117218-2326-3-git-send-email-mkulkarni@nvidia.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1371117218-2326-1-git-send-email-mkulkarni@nvidia.com> References: <1371117218-2326-1-git-send-email-mkulkarni@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 13 Jun 2013 03:29:54 -0700 Cc: Mayuresh Kulkarni , linux-kernel@vger.kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Mayuresh Kulkarni --- drivers/gpu/host1x/drm/gr2d.c | 56 ++++++++++++++++++++++++++++++++++++++++++- drivers/gpu/host1x/job.c | 9 +++++++ 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/host1x/drm/gr2d.c b/drivers/gpu/host1x/drm/gr2d.c index 27ffcf1..eb506cd 100644 --- a/drivers/gpu/host1x/drm/gr2d.c +++ b/drivers/gpu/host1x/drm/gr2d.c @@ -22,6 +22,7 @@ #include #include #include +#include #include "channel.h" #include "drm.h" @@ -275,11 +276,18 @@ static int gr2d_probe(struct platform_device *pdev) return PTR_ERR(gr2d->clk); } + platform_set_drvdata(pdev, gr2d); + +#ifdef CONFIG_PM_RUNTIME + pm_runtime_enable(&pdev->dev); + pm_runtime_get_sync(&pdev->dev); +#else err = clk_prepare_enable(gr2d->clk); if (err) { dev_err(dev, "cannot turn on clock\n"); return err; } +#endif gr2d->channel = host1x_channel_request(dev); if (!gr2d->channel) @@ -305,7 +313,9 @@ static int gr2d_probe(struct platform_device *pdev) gr2d_init_addr_reg_map(dev, gr2d); - platform_set_drvdata(pdev, gr2d); +#ifdef CONFIG_PM_RUNTIME + pm_runtime_put(&pdev->dev); +#endif return 0; } @@ -328,10 +338,51 @@ static int __exit gr2d_remove(struct platform_device *pdev) host1x_channel_free(gr2d->channel); clk_disable_unprepare(gr2d->clk); +#ifdef CONFIG_PM_RUNTIME + pm_runtime_disable(&pdev->dev); +#endif + + return 0; +} + +#ifdef CONFIG_PM_RUNTIME +static int gr2d_runtime_suspend(struct device *dev) +{ + struct gr2d *gr2d; + + gr2d = dev_get_drvdata(dev); + if (!gr2d) + return -EINVAL; + + clk_disable_unprepare(gr2d->clk); return 0; } +static int gr2d_runtime_resume(struct device *dev) +{ + int err = 0; + struct gr2d *gr2d; + + gr2d = dev_get_drvdata(dev); + if (!gr2d) + return -EINVAL; + + err = clk_prepare_enable(gr2d->clk); + if (err < 0) + dev_err(dev, "failed to enable clock\n"); + + return err; +} +#endif /* CONFIG_PM_RUNTIME */ + +#ifdef CONFIG_PM +static const struct dev_pm_ops gr2d_pm_ops = { + SET_RUNTIME_PM_OPS(gr2d_runtime_suspend, + gr2d_runtime_resume, NULL) +}; +#endif + struct platform_driver tegra_gr2d_driver = { .probe = gr2d_probe, .remove = __exit_p(gr2d_remove), @@ -339,5 +390,8 @@ struct platform_driver tegra_gr2d_driver = { .owner = THIS_MODULE, .name = "gr2d", .of_match_table = gr2d_match, +#ifdef CONFIG_PM + .pm = &gr2d_pm_ops, +#endif } }; diff --git a/drivers/gpu/host1x/job.c b/drivers/gpu/host1x/job.c index 05bafa4..a1b05f0 100644 --- a/drivers/gpu/host1x/job.c +++ b/drivers/gpu/host1x/job.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include "channel.h" @@ -591,10 +592,18 @@ int host1x_job_submit(struct host1x_job *job) { struct host1x *host = dev_get_drvdata(job->channel->dev->parent); +#ifdef CONFIG_PM_RUNTIME + pm_runtime_get_sync(job->channel->dev); +#endif + return host1x_hw_channel_submit(host, job); } int host1x_job_complete(struct host1x_job *job) { +#ifdef CONFIG_PM_RUNTIME + return pm_runtime_put(job->channel->dev); +#else return 0; +#endif }