diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-01-22 14:39:28 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-01-22 14:42:48 +1100 |
| commit | 5231a524f53babd127a576d7567671dafb29651b (patch) | |
| tree | 2cfaefb8dae9a81f182292ff9099b7ee5a622c98 /shared-core | |
| parent | 616cef5ec84b97eb676ee7cc6699451d778fad3b (diff) | |
Revert "Fix pipe<->plane mapping vs. vblank handling (again)"
This reverts commit bfc29606e4a818897eebca46a5e23bbe7bc3ce25.
This regresses i915 here for me I can't get greater than 0.333 fps with gears
Diffstat (limited to 'shared-core')
| -rw-r--r-- | shared-core/i915_irq.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c index 75952001..4a968002 100644 --- a/shared-core/i915_irq.c +++ b/shared-core/i915_irq.c @@ -455,25 +455,12 @@ static int i915_driver_vblank_do_wait(struct drm_device *dev, int i915_driver_vblank_wait(struct drm_device *dev, unsigned int *sequence) { - atomic_t *counter; - - if (i915_get_pipe(dev, 0) == 0) - counter = &dev->vbl_received; - else - counter = &dev->vbl_received2; - return i915_driver_vblank_do_wait(dev, sequence, counter); + return i915_driver_vblank_do_wait(dev, sequence, &dev->vbl_received); } int i915_driver_vblank_wait2(struct drm_device *dev, unsigned int *sequence) { - atomic_t *counter; - - if (i915_get_pipe(dev, 1) == 0) - counter = &dev->vbl_received; - else - counter = &dev->vbl_received2; - - return i915_driver_vblank_do_wait(dev, sequence, counter); + return i915_driver_vblank_do_wait(dev, sequence, &dev->vbl_received2); } /* Needs the lock as it touches the ring. |