summaryrefslogtreecommitdiffstats
path: root/sys/dev/drm/i915_dma.c
diff options
context:
space:
mode:
authorrnoland <rnoland@FreeBSD.org>2009-02-25 20:24:13 +0000
committerrnoland <rnoland@FreeBSD.org>2009-02-25 20:24:13 +0000
commit35f0e5ba8fbb4c47932378b8941120b11386e5ae (patch)
tree65bf3123733437cb4e8c62cdb4ab7e774c5a898e /sys/dev/drm/i915_dma.c
parent4abf3eb20011187bff9c7381d361fc9f7fef90bf (diff)
downloadFreeBSD-src-35f0e5ba8fbb4c47932378b8941120b11386e5ae.zip
FreeBSD-src-35f0e5ba8fbb4c47932378b8941120b11386e5ae.tar.gz
The GM45 handles vblank differently. Pull the changes from Intel in.
MFC after: 2 Weeks
Diffstat (limited to 'sys/dev/drm/i915_dma.c')
-rw-r--r--sys/dev/drm/i915_dma.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sys/dev/drm/i915_dma.c b/sys/dev/drm/i915_dma.c
index 241e9dd..a59aa38 100644
--- a/sys/dev/drm/i915_dma.c
+++ b/sys/dev/drm/i915_dma.c
@@ -868,6 +868,12 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
ret = drm_addmap(dev, base, size, _DRM_REGISTERS,
_DRM_KERNEL | _DRM_DRIVER, &dev_priv->mmio_map);
+
+ if (IS_GM45(dev))
+ dev->driver->get_vblank_counter = gm45_get_vblank_counter;
+ else
+ dev->driver->get_vblank_counter = i915_get_vblank_counter;
+
#ifdef I915_HAVE_GEM
i915_gem_load(dev);
#endif
OpenPOWER on IntegriCloud