summaryrefslogtreecommitdiff
path: root/include/drm/drm.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2009-12-08 07:03:47 +0300
committerDave Airlie <airlied@redhat.com>2009-12-08 07:03:47 +0300
commit3ff99164f67aae78a2bd2313f65ad55bddb1ffea (patch)
treed6bba03616d1be6ab9e6d9e92641a6f4047e1e15 /include/drm/drm.h
parent1bd049fa895f9c6743f38b52ce14775f5a31ea63 (diff)
parentf2b115e69d46344ae7afcaad5823496d2a0d8650 (diff)
downloadlinux-3ff99164f67aae78a2bd2313f65ad55bddb1ffea.tar.xz
Merge remote branch 'anholt/drm-intel-next' into drm-linus
This merges the upstream Intel tree and fixes up numerous conflicts due to patches merged into Linus tree later in -rc cycle. Conflicts: drivers/char/agp/intel-agp.c drivers/gpu/drm/drm_dp_i2c_helper.c drivers/gpu/drm/i915/i915_irq.c drivers/gpu/drm/i915/i915_suspend.c
Diffstat (limited to 'include/drm/drm.h')
-rw-r--r--include/drm/drm.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/drm/drm.h b/include/drm/drm.h
index 43a35b092f04..e3f46e0cb7dc 100644
--- a/include/drm/drm.h
+++ b/include/drm/drm.h
@@ -728,6 +728,7 @@ struct drm_event {
};
#define DRM_EVENT_VBLANK 0x01
+#define DRM_EVENT_FLIP_COMPLETE 0x02
struct drm_event_vblank {
struct drm_event base;