Revert "Fix pipe<->plane mapping vs. vblank handling (again)"

This reverts commit bfc29606e4.

This regresses i915 here for me I can't get greater than 0.333 fps with gears
This commit is contained in:
Dave Airlie 2008-01-22 14:39:28 +11:00
parent 616cef5ec8
commit 5231a524f5

View file

@ -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.