summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/gma500/cdv_intel_dp.c
diff options
context:
space:
mode:
authorPatrik Jakobsson <patrik.r.jakobsson@gmail.com>2013-07-10 01:20:19 +0200
committerPatrik Jakobsson <patrik.r.jakobsson@gmail.com>2013-07-24 01:47:20 +0200
commitd1fa08f3bacb6fc9a7642c85a4fa8976a3f1afac (patch)
tree810999f20e1b058677595349388b950a77711341 /drivers/gpu/drm/gma500/cdv_intel_dp.c
parentad3c46eae3f51b34adea55e0625d255b21ec0a15 (diff)
downloadtalos-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/cdv_intel_dp.c')
-rw-r--r--drivers/gpu/drm/gma500/cdv_intel_dp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/gma500/cdv_intel_dp.c b/drivers/gpu/drm/gma500/cdv_intel_dp.c
index 88d9ef6b5b4a..839ab83ff6ec 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_dp.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_dp.c
@@ -34,6 +34,7 @@
#include "psb_drv.h"
#include "psb_intel_drv.h"
#include "psb_intel_reg.h"
+#include "gma_display.h"
#include <drm/drm_dp_helper.h>
#define _wait_for(COND, MS, W) ({ \
@@ -1317,7 +1318,7 @@ cdv_intel_dp_start_link_train(struct psb_intel_encoder *encoder)
/* Enable output, wait for it to become active */
REG_WRITE(intel_dp->output_reg, reg);
REG_READ(intel_dp->output_reg);
- psb_intel_wait_for_vblank(dev);
+ gma_wait_for_vblank(dev);
DRM_DEBUG_KMS("Link config\n");
/* Write the link configuration data */
OpenPOWER on IntegriCloud