diff options
author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-05-05 13:13:16 -0700 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2009-06-05 14:22:31 +0000 |
commit | 42c2798b35b95c471877133e19ccc3cab00e9b65 (patch) | |
tree | cb0753984d1bc5bd335c99d6ef30c3de103412fd /drivers/gpu/drm/i915/i915_dma.c | |
parent | 70aa96ca2d8d938fc036ef8fd189b0151f4fc3ba (diff) | |
download | op-kernel-dev-42c2798b35b95c471877133e19ccc3cab00e9b65.zip op-kernel-dev-42c2798b35b95c471877133e19ccc3cab00e9b65.tar.gz |
drm/i915: apply G45 vblank count code to all G4x chips and fix max_frame_count
All G4x and newer chips use the new style frame count register, with a
full 32 bit frame count. Update the code to reflect this.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 5d36059..68e882c 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1161,8 +1161,11 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) #endif dev->driver->get_vblank_counter = i915_get_vblank_counter; - if (IS_GM45(dev)) + dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */ + if (IS_G4X(dev)) { + dev->max_vblank_count = 0xffffffff; /* full 32 bit counter */ dev->driver->get_vblank_counter = gm45_get_vblank_counter; + } i915_gem_load(dev); |