diff options
| author | Patrik Jakobsson <patrik.r.jakobsson@gmail.com> | 2013-07-12 15:38:52 +0200 |
|---|---|---|
| committer | Patrik Jakobsson <patrik.r.jakobsson@gmail.com> | 2013-07-24 01:47:31 +0200 |
| commit | 924cb5ffd81d66cc6461de955f7cb144cb3b7b6d (patch) | |
| tree | 7e8caa5e3d60d238ebf79d98b40622eb5aa05f67 /drivers/gpu | |
| parent | f0ff07b73b9b5be1f725f333d1516d569c697104 (diff) | |
drm/gma500: Add generic set_config() function
Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/gma500/gma_display.c | 16 | ||||
| -rw-r--r-- | drivers/gpu/drm/gma500/gma_display.h | 3 |
2 files changed, 19 insertions, 0 deletions
diff --git a/drivers/gpu/drm/gma500/gma_display.c b/drivers/gpu/drm/gma500/gma_display.c index cca40c0b64e4..2a3e9254e651 100644 --- a/drivers/gpu/drm/gma500/gma_display.c +++ b/drivers/gpu/drm/gma500/gma_display.c @@ -519,6 +519,22 @@ void gma_crtc_destroy(struct drm_crtc *crtc) kfree(psb_intel_crtc); } +int gma_crtc_set_config(struct drm_mode_set *set) +{ + struct drm_device *dev = set->crtc->dev; + struct drm_psb_private *dev_priv = dev->dev_private; + int ret; + + if (!dev_priv->rpm_enabled) + return drm_crtc_helper_set_config(set); + + pm_runtime_forbid(&dev->pdev->dev); + ret = drm_crtc_helper_set_config(set); + pm_runtime_allow(&dev->pdev->dev); + + return ret; +} + /** * Save HW states of given crtc */ diff --git a/drivers/gpu/drm/gma500/gma_display.h b/drivers/gpu/drm/gma500/gma_display.h index 8847de069516..1044c165c714 100644 --- a/drivers/gpu/drm/gma500/gma_display.h +++ b/drivers/gpu/drm/gma500/gma_display.h @@ -22,6 +22,8 @@ #ifndef _GMA_DISPLAY_H_ #define _GMA_DISPLAY_H_ +#include <linux/pm_runtime.h> + struct gma_clock_t { /* given values */ int n; @@ -80,6 +82,7 @@ extern void gma_crtc_prepare(struct drm_crtc *crtc); extern void gma_crtc_commit(struct drm_crtc *crtc); extern void gma_crtc_disable(struct drm_crtc *crtc); extern void gma_crtc_destroy(struct drm_crtc *crtc); +extern int gma_crtc_set_config(struct drm_mode_set *set); extern void gma_crtc_save(struct drm_crtc *crtc); extern void gma_crtc_restore(struct drm_crtc *crtc); |