From: Vinod Koul <vinod.koul@intel.com>
To: linux-kernel@vger.kernel.org
Cc: subhransu.s.prusty@intel.com, vinod.koul@intel.com,
"Alex Deucher" <alexander.deucher@amd.com>,
"Christian König" <christian.koenig@amd.com>,
"David Airlie" <airlied@linux.ie>,
dri-devel@lists.freedesktop.org
Subject: [PATCH 06/27] drm/radeon: use pm_runtime_last_busy_and_autosuspend helper
Date: Wed, 24 Sep 2014 21:44:56 +0530 [thread overview]
Message-ID: <1411575342-31048-7-git-send-email-vinod.koul@intel.com> (raw)
In-Reply-To: <1411575342-31048-1-git-send-email-vinod.koul@intel.com>
Use the new pm_runtime_last_busy_and_autosuspend helper instead of open
coding the same code
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
drivers/gpu/drm/radeon/radeon_connectors.c | 15 +++++----------
drivers/gpu/drm/radeon/radeon_drv.c | 5 ++---
drivers/gpu/drm/radeon/radeon_kms.c | 6 ++----
3 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index 300c4b3..b48cf9d 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -852,8 +852,7 @@ radeon_lvds_detect(struct drm_connector *connector, bool force)
/* check acpi lid status ??? */
radeon_connector_update_scratch_regs(connector, ret);
- pm_runtime_mark_last_busy(connector->dev->dev);
- pm_runtime_put_autosuspend(connector->dev->dev);
+ pm_runtime_last_busy_and_autosuspend(connector->dev->dev);
return ret;
}
@@ -1025,8 +1024,7 @@ radeon_vga_detect(struct drm_connector *connector, bool force)
radeon_connector_update_scratch_regs(connector, ret);
out:
- pm_runtime_mark_last_busy(connector->dev->dev);
- pm_runtime_put_autosuspend(connector->dev->dev);
+ pm_runtime_last_busy_and_autosuspend(connector->dev->dev);
return ret;
}
@@ -1103,8 +1101,7 @@ radeon_tv_detect(struct drm_connector *connector, bool force)
if (ret == connector_status_connected)
ret = radeon_connector_analog_encoder_conflict_solve(connector, encoder, ret, false);
radeon_connector_update_scratch_regs(connector, ret);
- pm_runtime_mark_last_busy(connector->dev->dev);
- pm_runtime_put_autosuspend(connector->dev->dev);
+ pm_runtime_last_busy_and_autosuspend(connector->dev->dev);
return ret;
}
@@ -1321,8 +1318,7 @@ out:
radeon_connector_update_scratch_regs(connector, ret);
exit:
- pm_runtime_mark_last_busy(connector->dev->dev);
- pm_runtime_put_autosuspend(connector->dev->dev);
+ pm_runtime_last_busy_and_autosuspend(connector->dev->dev);
return ret;
}
@@ -1638,8 +1634,7 @@ radeon_dp_detect(struct drm_connector *connector, bool force)
radeon_connector_update_scratch_regs(connector, ret);
out:
- pm_runtime_mark_last_busy(connector->dev->dev);
- pm_runtime_put_autosuspend(connector->dev->dev);
+ pm_runtime_last_busy_and_autosuspend(connector->dev->dev);
return ret;
}
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index 092d067..548d129 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -503,9 +503,8 @@ long radeon_drm_ioctl(struct file *filp,
return ret;
ret = drm_ioctl(filp, cmd, arg);
-
- pm_runtime_mark_last_busy(dev->dev);
- pm_runtime_put_autosuspend(dev->dev);
+
+ pm_runtime_last_busy_and_autosuspend(dev->dev);
return ret;
}
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index eb7164d..80f061d 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -147,8 +147,7 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)
pm_runtime_set_autosuspend_delay(dev->dev, 5000);
pm_runtime_set_active(dev->dev);
pm_runtime_allow(dev->dev);
- pm_runtime_mark_last_busy(dev->dev);
- pm_runtime_put_autosuspend(dev->dev);
+ pm_runtime_last_busy_and_autosuspend(dev->dev);
}
out:
@@ -632,8 +631,7 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
file_priv->driver_priv = fpriv;
}
- pm_runtime_mark_last_busy(dev->dev);
- pm_runtime_put_autosuspend(dev->dev);
+ pm_runtime_last_busy_and_autosuspend(dev->dev);
return 0;
}
--
1.7.0.4
next prev parent reply other threads:[~2014-09-24 16:46 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-24 16:14 [PATCH 00/27] add pm_runtime_last_busy_and_autosuspend() helper Vinod Koul
2014-09-24 16:14 ` [PATCH 01/27] PM: Add helper pm_runtime_last_busy_and_autosuspend() Vinod Koul
2014-09-24 17:54 ` Pavel Machek
2014-09-25 8:00 ` Vinod Koul
2014-09-25 8:13 ` Ulf Hansson
2014-09-24 16:14 ` [PATCH 02/27] dmaengine: ste_dma: use pm_runtime_last_busy_and_autosuspend helper Vinod Koul
2014-09-25 13:19 ` Linus Walleij
2014-09-24 16:14 ` [PATCH 03/27] extcon: arizona: " Vinod Koul
2014-09-25 1:05 ` Chanwoo Choi
2014-09-25 8:10 ` Charles Keepax
2014-09-24 16:14 ` [PATCH 04/27] drm/i915: " Vinod Koul
2014-09-24 18:35 ` Daniel Vetter
2014-09-24 16:14 ` [PATCH 05/27] drm/nouveau: " Vinod Koul
2014-09-24 16:14 ` Vinod Koul [this message]
2014-09-24 20:37 ` [PATCH 06/27] drm/radeon: " Alex Deucher
2014-09-24 16:14 ` [PATCH 07/27] vga_switcheroo: " Vinod Koul
2014-09-24 20:37 ` Alex Deucher
2014-09-24 16:14 ` [PATCH 08/27] i2c: designware: " Vinod Koul
2014-09-24 16:14 ` [PATCH 09/27] i2c: omap: " Vinod Koul
2014-09-24 16:15 ` [PATCH 10/27] i2c: qup: " Vinod Koul
2014-09-24 16:15 ` [PATCH 11/27] mfd: ab8500-gpadc: " Vinod Koul
2014-09-26 8:38 ` Linus Walleij
2014-10-06 21:40 ` Lee Jones
2014-10-07 7:21 ` Lee Jones
2014-10-07 7:38 ` Vinod Koul
2014-09-24 16:15 ` [PATCH 12/27] mfd: arizona: " Vinod Koul
2014-09-25 8:10 ` Charles Keepax
2014-10-06 21:41 ` Lee Jones
2014-10-07 7:21 ` Lee Jones
2014-09-24 16:15 ` [PATCH 13/27] mei: " Vinod Koul
2014-09-24 16:15 ` [PATCH 14/27] mmc: " Vinod Koul
2014-09-24 16:15 ` [PATCH 15/27] mmc: mmci: " Vinod Koul
2014-09-24 16:15 ` [PATCH 16/27] mmc: omap_hsmmc: " Vinod Koul
2014-09-24 16:15 ` [PATCH 17/27] mmc: sdhci-pxav3: " Vinod Koul
2014-09-24 16:15 ` [PATCH 18/27] mmc: sdhci: " Vinod Koul
2014-09-24 16:15 ` [PATCH 19/27] NFC: trf7970a: " Vinod Koul
2014-09-24 16:15 ` [PATCH 20/27] pm2301-charger: " Vinod Koul
2014-09-24 16:15 ` [PATCH 21/27] spi: omap2-mcspi: " Vinod Koul
2014-09-24 16:58 ` Mark Brown
2014-09-24 16:39 ` Vinod Koul
2014-09-25 13:03 ` Mark Brown
2014-09-24 16:15 ` [PATCH 22/27] spi: orion: " Vinod Koul
2014-09-25 13:03 ` Mark Brown
2014-09-24 16:15 ` [PATCH 23/27] spi: ti-qspi: " Vinod Koul
2014-09-25 13:04 ` Mark Brown
2014-09-24 16:15 ` [PATCH 24/27] spi: core: " Vinod Koul
2014-09-25 13:04 ` Mark Brown
2014-09-24 16:15 ` [PATCH 25/27] tty: serial: omap: " Vinod Koul
2014-09-24 16:15 ` [PATCH 26/27] usb: musb: omap2430: " Vinod Koul
2014-09-24 16:15 ` [PATCH 27/27] video: fbdev: " Vinod Koul
2014-09-24 20:28 ` [PATCH 00/27] add pm_runtime_last_busy_and_autosuspend() helper Rafael J. Wysocki
2014-09-25 7:46 ` Vinod Koul
[not found] ` <20140925142201.GD28045@saruman>
[not found] ` <20140925142758.GB1316@katana>
2014-09-25 19:54 ` Rafael J. Wysocki
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=1411575342-31048-7-git-send-email-vinod.koul@intel.com \
--to=vinod.koul@intel.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=subhransu.s.prusty@intel.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).