diff options
| author | Eric Anholt <eric@anholt.net> | 2009-10-02 12:07:42 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-10-02 12:07:42 -0700 |
| commit | 8d23adf7610f2c000c08abe3941c493952d21a61 (patch) | |
| tree | 5a793a37ec9d71493d2f7ea70e13aee3137cc911 /drivers/gpu/drm/i915/i915_irq.c | |
| parent | 4781f20f29926ec68715f5cc930273a79fc0a9eb (diff) | |
| parent | 9d34e5db07303c9609053e2e651aa6d1fc74e923 (diff) | |
| download | kernel_goldelico_gta04-8d23adf7610f2c000c08abe3941c493952d21a61.zip kernel_goldelico_gta04-8d23adf7610f2c000c08abe3941c493952d21a61.tar.gz kernel_goldelico_gta04-8d23adf7610f2c000c08abe3941c493952d21a61.tar.bz2 | |
Merge commit 'ickle/for-anholt' into drm-intel-next
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 4dfeec7..c3ceffa 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -725,6 +725,16 @@ void i915_user_irq_put(struct drm_device *dev) spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags); } +void i915_trace_irq_get(struct drm_device *dev, u32 seqno) +{ + drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; + + if (dev_priv->trace_irq_seqno == 0) + i915_user_irq_get(dev); + + dev_priv->trace_irq_seqno = seqno; +} + static int i915_wait_irq(struct drm_device * dev, int irq_nr) { drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; |