aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2011-08-12 17:05:54 -0700
committerKeith Packard <keithp@keithp.com>2011-08-15 12:10:26 -0700
commitc3613de92ebea302137d21d8938421c3f88d8741 (patch)
treec16dc4a75c6ea2877dcd6be6e1a6ab7393d6dcd0 /drivers
parentaaa6fd2a004147bf32fce05720938236de3361d9 (diff)
downloadautogen-c3613de92ebea302137d21d8938421c3f88d8741.tar.gz
autogen-c3613de92ebea302137d21d8938421c3f88d8741.tar.xz
autogen-c3613de92ebea302137d21d8938421c3f88d8741.zip
drm/i915: Can't do accurate vblank timestamps with UMS
Disable this feature when KMS is not running by setting the driver->get_vblank_timestamp function pointer to NULL. Signed-off-by: Keith Packard <keithp@keithp.com> Tested-by: Justin P. Mattock <justinmattock@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/i915_irq.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 02f96fd0d52..9cbb0cd8f46 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2058,8 +2058,10 @@ void intel_irq_init(struct drm_device *dev)
dev->driver->get_vblank_counter = gm45_get_vblank_counter;
}
-
- dev->driver->get_vblank_timestamp = i915_get_vblank_timestamp;
+ if (drm_core_check_feature(dev, DRIVER_MODESET))
+ dev->driver->get_vblank_timestamp = i915_get_vblank_timestamp;
+ else
+ dev->driver->get_vblank_timestamp = NULL;
dev->driver->get_scanout_position = i915_get_crtc_scanoutpos;
if (IS_IVYBRIDGE(dev)) {