diff options
author | =?utf-8?q?Michel_D=C3=A4nzer?= <michel@tungstengraphics.com> | 2006-10-24 08:28:51 -0400 |
---|---|---|
committer | airlied <airlied@linux.ie> | 2006-12-06 23:53:28 -0500 |
commit | 68815bad7239989d92f315c10d9ef65a11945a75 (patch) | |
tree | 148ae38036feb708147022a8ecc57daa1b61d9c6 /drivers/char/drm/i915_drv.c | |
parent | 776c9443e28dddbde9b513db6cb8221c45b3a269 (diff) |
drm: add support for secondary vertical blank interrupt to i915
When the vertical blank interrupt is enabled for both pipes, pipe A is
considered primary and pipe B secondary. When it's only enabled for one pipe,
it's always considered primary for backwards compatibility.
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/i915_drv.c')
-rw-r--r-- | drivers/char/drm/i915_drv.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/char/drm/i915_drv.c b/drivers/char/drm/i915_drv.c index 8e2e6095c4b3..85bcc276f804 100644 --- a/drivers/char/drm/i915_drv.c +++ b/drivers/char/drm/i915_drv.c | |||
@@ -44,12 +44,14 @@ static struct drm_driver driver = { | |||
44 | */ | 44 | */ |
45 | .driver_features = | 45 | .driver_features = |
46 | DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | /* DRIVER_USE_MTRR |*/ | 46 | DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | /* DRIVER_USE_MTRR |*/ |
47 | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_IRQ_VBL, | 47 | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_IRQ_VBL | |
48 | DRIVER_IRQ_VBL2, | ||
48 | .load = i915_driver_load, | 49 | .load = i915_driver_load, |
49 | .lastclose = i915_driver_lastclose, | 50 | .lastclose = i915_driver_lastclose, |
50 | .preclose = i915_driver_preclose, | 51 | .preclose = i915_driver_preclose, |
51 | .device_is_agp = i915_driver_device_is_agp, | 52 | .device_is_agp = i915_driver_device_is_agp, |
52 | .vblank_wait = i915_driver_vblank_wait, | 53 | .vblank_wait = i915_driver_vblank_wait, |
54 | .vblank_wait2 = i915_driver_vblank_wait2, | ||
53 | .irq_preinstall = i915_driver_irq_preinstall, | 55 | .irq_preinstall = i915_driver_irq_preinstall, |
54 | .irq_postinstall = i915_driver_irq_postinstall, | 56 | .irq_postinstall = i915_driver_irq_postinstall, |
55 | .irq_uninstall = i915_driver_irq_uninstall, | 57 | .irq_uninstall = i915_driver_irq_uninstall, |