diff options
-rw-r--r-- | drivers/gpu/drm/drm_irq.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 372085561f02..5078984568b0 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c | |||
@@ -1639,10 +1639,9 @@ int drm_wait_vblank(struct drm_device *dev, void *data, | |||
1639 | DRM_DEBUG("waiting on vblank count %u, crtc %u\n", | 1639 | DRM_DEBUG("waiting on vblank count %u, crtc %u\n", |
1640 | vblwait->request.sequence, pipe); | 1640 | vblwait->request.sequence, pipe); |
1641 | DRM_WAIT_ON(ret, vblank->queue, 3 * HZ, | 1641 | DRM_WAIT_ON(ret, vblank->queue, 3 * HZ, |
1642 | (((drm_vblank_count(dev, pipe) - | 1642 | (drm_vblank_count(dev, pipe) - |
1643 | vblwait->request.sequence) <= (1 << 23)) || | 1643 | vblwait->request.sequence) <= (1 << 23) || |
1644 | !READ_ONCE(vblank->enabled) || | 1644 | !READ_ONCE(vblank->enabled)); |
1645 | !dev->irq_enabled)); | ||
1646 | } | 1645 | } |
1647 | 1646 | ||
1648 | if (ret != -EINTR) { | 1647 | if (ret != -EINTR) { |