diff options
| author | Robert Noland <rnoland@2hip.net> | 2009-02-25 14:19:01 -0600 |
|---|---|---|
| committer | Robert Noland <rnoland@2hip.net> | 2009-02-25 14:20:52 -0600 |
| commit | 948af0bd9b9eade489599d7ec160d42706331779 (patch) | |
| tree | 36af5c0f616f32ea251015f25f49ce3ae138a9e0 /shared-core/i915_dma.c | |
| parent | efa485b2cf2f1f46760a3d9297ba1a73a2dbcd05 (diff) | |
i915: Backport jbarnes gm45 vblank counter patch.
Diffstat (limited to 'shared-core/i915_dma.c')
| -rw-r--r-- | shared-core/i915_dma.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c index 7f458c79..b97b576f 100644 --- a/shared-core/i915_dma.c +++ b/shared-core/i915_dma.c @@ -864,6 +864,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 |