diff options
| author | Patrik Jakobsson <patrik.r.jakobsson@gmail.com> | 2013-07-10 01:20:19 +0200 |
|---|---|---|
| committer | Patrik Jakobsson <patrik.r.jakobsson@gmail.com> | 2013-07-24 01:47:20 +0200 |
| commit | d1fa08f3bacb6fc9a7642c85a4fa8976a3f1afac (patch) | |
| tree | 810999f20e1b058677595349388b950a77711341 /drivers/gpu/drm/gma500/oaktrail_crtc.c | |
| parent | ad3c46eae3f51b34adea55e0625d255b21ec0a15 (diff) | |
| download | talos-op-linux-d1fa08f3bacb6fc9a7642c85a4fa8976a3f1afac.tar.gz talos-op-linux-d1fa08f3bacb6fc9a7642c85a4fa8976a3f1afac.zip | |
drm/gma500: Make all chips use gma_wait_for_vblank
Also remove the duplicated oaktrail function.
Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/gma500/oaktrail_crtc.c')
| -rw-r--r-- | drivers/gpu/drm/gma500/oaktrail_crtc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/gma500/oaktrail_crtc.c b/drivers/gpu/drm/gma500/oaktrail_crtc.c index 75567ee8a519..8af461f3a72d 100644 --- a/drivers/gpu/drm/gma500/oaktrail_crtc.c +++ b/drivers/gpu/drm/gma500/oaktrail_crtc.c @@ -242,7 +242,7 @@ static void oaktrail_crtc_dpms(struct drm_crtc *crtc, int mode) REG_READ(map->conf); } /* Wait for for the pipe disable to take effect. */ - psb_intel_wait_for_vblank(dev); + gma_wait_for_vblank(dev); temp = REG_READ(map->dpll); if ((temp & DPLL_VCO_ENABLE) != 0) { @@ -484,10 +484,10 @@ static int oaktrail_crtc_mode_set(struct drm_crtc *crtc, REG_WRITE(map->conf, pipeconf); REG_READ(map->conf); - psb_intel_wait_for_vblank(dev); + gma_wait_for_vblank(dev); REG_WRITE(map->cntr, dspcntr); - psb_intel_wait_for_vblank(dev); + gma_wait_for_vblank(dev); oaktrail_crtc_mode_set_exit: gma_power_end(dev); |
