diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-08-13 10:08:02 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-08-13 10:08:02 -0700 |
| commit | 2f03ba4aad1718a36168550b6a146b79540252e6 (patch) | |
| tree | 7bc55a8948f00c60ad2354171dd345e35e6ff741 /shared-core/i915_irq.c | |
| parent | 085df6491e4975681a6e17ff9a67d01268aa7553 (diff) | |
| parent | b0e68829462aad00ce68be998da6313bca754e9a (diff) | |
Merge branch 'master' into modesetting-gem
Conflicts:
libdrm/Makefile.am
libdrm/xf86drm.h
shared-core/i915_dma.c
shared-core/i915_irq.c
Diffstat (limited to 'shared-core/i915_irq.c')
| -rw-r--r-- | shared-core/i915_irq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c index 1b294bbd..28fa35fd 100644 --- a/shared-core/i915_irq.c +++ b/shared-core/i915_irq.c @@ -1119,6 +1119,7 @@ int i915_driver_irq_postinstall(struct drm_device * dev) DRM_SPININIT(&dev_priv->user_irq_lock, "userirq"); dev_priv->user_irq_refcount = 0; + dev_priv->irq_mask_reg = ~0; ret = drm_vblank_init(dev, num_pipes); if (ret) |