summaryrefslogtreecommitdiffstats
path: root/kernel/drivers/gpu/drm/shmobile
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/drivers/gpu/drm/shmobile')
-rw-r--r--kernel/drivers/gpu/drm/shmobile/shmob_drm_crtc.c2
-rw-r--r--kernel/drivers/gpu/drm/shmobile/shmob_drm_drv.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/kernel/drivers/gpu/drm/shmobile/shmob_drm_crtc.c b/kernel/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
index 859ccb658..e9272b0a8 100644
--- a/kernel/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
+++ b/kernel/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
@@ -248,7 +248,7 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc)
lcdc_write(sdev, LDDDSR, value);
/* Setup planes. */
- drm_for_each_legacy_plane(plane, &dev->mode_config.plane_list) {
+ drm_for_each_legacy_plane(plane, dev) {
if (plane->crtc == crtc)
shmob_drm_plane_setup(plane);
}
diff --git a/kernel/drivers/gpu/drm/shmobile/shmob_drm_drv.c b/kernel/drivers/gpu/drm/shmobile/shmob_drm_drv.c
index 666321de7..04e66e375 100644
--- a/kernel/drivers/gpu/drm/shmobile/shmob_drm_drv.c
+++ b/kernel/drivers/gpu/drm/shmobile/shmob_drm_drv.c
@@ -231,7 +231,7 @@ static irqreturn_t shmob_drm_irq(int irq, void *arg)
return IRQ_HANDLED;
}
-static int shmob_drm_enable_vblank(struct drm_device *dev, int crtc)
+static int shmob_drm_enable_vblank(struct drm_device *dev, unsigned int pipe)
{
struct shmob_drm_device *sdev = dev->dev_private;
@@ -240,7 +240,7 @@ static int shmob_drm_enable_vblank(struct drm_device *dev, int crtc)
return 0;
}
-static void shmob_drm_disable_vblank(struct drm_device *dev, int crtc)
+static void shmob_drm_disable_vblank(struct drm_device *dev, unsigned int pipe)
{
struct shmob_drm_device *sdev = dev->dev_private;
@@ -269,7 +269,7 @@ static struct drm_driver shmob_drm_driver = {
.preclose = shmob_drm_preclose,
.set_busid = drm_platform_set_busid,
.irq_handler = shmob_drm_irq,
- .get_vblank_counter = drm_vblank_count,
+ .get_vblank_counter = drm_vblank_no_hw_counter,
.enable_vblank = shmob_drm_enable_vblank,
.disable_vblank = shmob_drm_disable_vblank,
.gem_free_object = drm_gem_cma_free_object,