diff --git a/[refs] b/[refs]
index 94814281adea..c2e745a59616 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b95a207c1fd552e7d017837c5eaf1b0173a48c9
+refs/heads/master: 7bd4d7be5c8c35a401b1589201e5d43a64d3f05b
diff --git a/trunk/drivers/gpu/drm/drm_crtc.c b/trunk/drivers/gpu/drm/drm_crtc.c
index ac2fa193072b..3bc870d38a97 100644
--- a/trunk/drivers/gpu/drm/drm_crtc.c
+++ b/trunk/drivers/gpu/drm/drm_crtc.c
@@ -2527,7 +2527,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
 			goto out;
 		}
 
-		e->event.base.type = DRM_EVENT_VBLANK;
+		e->event.base.type = DRM_EVENT_FLIP_COMPLETE;
 		e->event.base.length = sizeof e->event;
 		e->event.user_data = page_flip->user_data;
 		e->base.event = &e->event.base;
diff --git a/trunk/include/drm/drm.h b/trunk/include/drm/drm.h
index 3919a4f792ae..309d0a5ed68d 100644
--- a/trunk/include/drm/drm.h
+++ b/trunk/include/drm/drm.h
@@ -718,6 +718,7 @@ struct drm_event {
 };
 
 #define DRM_EVENT_VBLANK 0x01
+#define DRM_EVENT_FLIP_COMPLETE 0x02
 
 struct drm_event_vblank {
 	struct drm_event base;