From c80d21df349f8db6fbeb585a4c657a2d6864c674 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Fri, 6 Feb 2009 13:04:49 -0800
Subject: [PATCH] --- yaml --- r: 131147 b: refs/heads/master c:
 14d200c5e5bd19219d930bbb9a5a22758c8f5bec h: refs/heads/master i:   131145:
 be6b4f60b731632f39894fdd34c6e03df4484005   131143:
 e65289b4c1d34549aae8d62d7156eac4c643e45c v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/gpu/drm/drm_irq.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2262d5db11cc..2420d0c45956 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d8d58b23fd01e60ed44d8d8c10b2df86e638faa
+refs/heads/master: 14d200c5e5bd19219d930bbb9a5a22758c8f5bec
diff --git a/trunk/drivers/gpu/drm/drm_irq.c b/trunk/drivers/gpu/drm/drm_irq.c
index 69aa0ab28403..3795dbc0f50c 100644
--- a/trunk/drivers/gpu/drm/drm_irq.c
+++ b/trunk/drivers/gpu/drm/drm_irq.c
@@ -276,6 +276,7 @@ int drm_irq_uninstall(struct drm_device * dev)
 	for (i = 0; i < dev->num_crtcs; i++) {
 		DRM_WAKEUP(&dev->vbl_queue[i]);
 		dev->vblank_enabled[i] = 0;
+		dev->last_vblank[i] = dev->driver->get_vblank_counter(dev, i);
 	}
 	spin_unlock_irqrestore(&dev->vbl_lock, irqflags);