aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_vblank.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/drm_vblank.c')
-rw-r--r--drivers/gpu/drm/drm_vblank.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c
index f135b79593dd..d30e2f2b8f3c 100644
--- a/drivers/gpu/drm/drm_vblank.c
+++ b/drivers/gpu/drm/drm_vblank.c
@@ -209,9 +209,12 @@ static u32 __get_vblank_counter(struct drm_device *dev, unsigned int pipe)
if (crtc->funcs->get_vblank_counter)
return crtc->funcs->get_vblank_counter(crtc);
- } else if (dev->driver->get_vblank_counter) {
+ }
+#ifdef CONFIG_DRM_LEGACY
+ else if (dev->driver->get_vblank_counter) {
return dev->driver->get_vblank_counter(dev, pipe);
}
+#endif
return drm_vblank_no_hw_counter(dev, pipe);
}
@@ -429,9 +432,12 @@ static void __disable_vblank(struct drm_device *dev, unsigned int pipe)
if (crtc->funcs->disable_vblank)
crtc->funcs->disable_vblank(crtc);
- } else {
+ }
+#ifdef CONFIG_DRM_LEGACY
+ else {
dev->driver->disable_vblank(dev, pipe);
}
+#endif
}
/*
@@ -1096,9 +1102,12 @@ static int __enable_vblank(struct drm_device *dev, unsigned int pipe)
if (crtc->funcs->enable_vblank)
return crtc->funcs->enable_vblank(crtc);
- } else if (dev->driver->enable_vblank) {
+ }
+#ifdef CONFIG_DRM_LEGACY
+ else if (dev->driver->enable_vblank) {
return dev->driver->enable_vblank(dev, pipe);
}
+#endif
return -EINVAL;
}