summaryrefslogtreecommitdiff
path: root/linux-core/i915_drv.c
diff options
context:
space:
mode:
authorStephane Marchesin <marchesin@icps.u-strasbg.fr>2006-10-15 00:12:13 +0200
committerStephane Marchesin <marchesin@icps.u-strasbg.fr>2006-10-15 00:12:13 +0200
commit93fee5cf222ad6d97e0dcb85e13a8d8b84dba81f (patch)
tree4e62581041c93f6ab51e6cafd804e81b5172040f /linux-core/i915_drv.c
parent2c5b91aecf3d21684ffca758c034cd9a8ed2155d (diff)
parenta9f57a2b9c5897cbf568bf75342204b780566de0 (diff)
Merge branch 'master' of git://anongit.freedesktop.org/git/mesa/drm into nouveau-1
Diffstat (limited to 'linux-core/i915_drv.c')
-rw-r--r--linux-core/i915_drv.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index c6e25f9b..209500be 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -45,12 +45,14 @@ static struct drm_driver driver = {
*/
.driver_features =
DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | /* DRIVER_USE_MTRR | */
- DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_IRQ_VBL,
+ DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_IRQ_VBL |
+ DRIVER_IRQ_VBL2,
.load = i915_driver_load,
.lastclose = i915_driver_lastclose,
.preclose = i915_driver_preclose,
.device_is_agp = i915_driver_device_is_agp,
.vblank_wait = i915_driver_vblank_wait,
+ .vblank_wait2 = i915_driver_vblank_wait2,
.irq_preinstall = i915_driver_irq_preinstall,
.irq_postinstall = i915_driver_irq_postinstall,
.irq_uninstall = i915_driver_irq_uninstall,