diff options
| author | Patrik Jakobsson <patrik.r.jakobsson@gmail.com> | 2013-07-12 15:43:54 +0200 |
|---|---|---|
| committer | Patrik Jakobsson <patrik.r.jakobsson@gmail.com> | 2013-07-24 01:47:32 +0200 |
| commit | c5c81f4e1bc9c8ee1c3637de51ee180efbbf629c (patch) | |
| tree | dae109a434d149806573d2e40c577e87f3a07ed7 /drivers/gpu/drm | |
| parent | 43a83027d4705bb6b6506f9467c9c4d3e2a1b504 (diff) | |
| download | blackbird-op-linux-c5c81f4e1bc9c8ee1c3637de51ee180efbbf629c.tar.gz blackbird-op-linux-c5c81f4e1bc9c8ee1c3637de51ee180efbbf629c.zip | |
drm/gma500/cdv: Convert to generic set_config()
Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/gma500/cdv_intel_display.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/drivers/gpu/drm/gma500/cdv_intel_display.c b/drivers/gpu/drm/gma500/cdv_intel_display.c index b84912ff1711..6bca1fe470ab 100644 --- a/drivers/gpu/drm/gma500/cdv_intel_display.c +++ b/drivers/gpu/drm/gma500/cdv_intel_display.c @@ -19,7 +19,6 @@ */ #include <linux/i2c.h> -#include <linux/pm_runtime.h> #include <drm/drmP.h> #include "framebuffer.h" @@ -867,24 +866,6 @@ static int cdv_intel_crtc_mode_set(struct drm_crtc *crtc, return 0; } -static int cdv_crtc_set_config(struct drm_mode_set *set) -{ - int ret = 0; - struct drm_device *dev = set->crtc->dev; - struct drm_psb_private *dev_priv = dev->dev_private; - - 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; -} - /** Derive the pixel clock for the given refclk and divisors for 8xx chips. */ /* FIXME: why are we using this, should it be cdv_ in this tree ? */ @@ -1040,7 +1021,7 @@ const struct drm_crtc_funcs cdv_intel_crtc_funcs = { .cursor_set = gma_crtc_cursor_set, .cursor_move = gma_crtc_cursor_move, .gamma_set = gma_crtc_gamma_set, - .set_config = cdv_crtc_set_config, + .set_config = gma_crtc_set_config, .destroy = gma_crtc_destroy, }; |
