diff options
| author | Jesse Barnes <jbarnes@hobbes.lan> | 2008-06-10 17:31:54 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-06-10 17:31:54 -0700 |
| commit | a1d96007241a78dd2b4a718df8e0568fe7994c22 (patch) | |
| tree | b7a4bfaa77ddf957a6ade0c47d91e14a45b91659 /linux-core/drm_irq.c | |
| parent | c987e76d953b6aecbfb69058fc4c387aa3fb33c9 (diff) | |
| parent | 500c81d194115fb3c4b97d742519689478eeb4e8 (diff) | |
Merge commit 'origin/drm-gem' into modesetting-gem
Passed the compile test; it's ready to ship.
Conflicts:
libdrm/Makefile.am
linux-core/Makefile.kernel
linux-core/drmP.h
linux-core/drm_memrange.c
linux-core/drm_stub.c
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
Diffstat (limited to 'linux-core/drm_irq.c')
| -rw-r--r-- | linux-core/drm_irq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linux-core/drm_irq.c b/linux-core/drm_irq.c index e1c93054..c6024d95 100644 --- a/linux-core/drm_irq.c +++ b/linux-core/drm_irq.c @@ -133,6 +133,7 @@ int drm_vblank_init(struct drm_device *dev, int num_crtcs) setup_timer(&dev->vblank_disable_timer, vblank_disable_fn, (unsigned long)dev); + init_timer_deferrable(&dev->vblank_disable_timer); spin_lock_init(&dev->vbl_lock); atomic_set(&dev->vbl_signal_pending, 0); dev->num_crtcs = num_crtcs; |