aboutsummaryrefslogtreecommitdiff
path: root/shared-core/i915_irq.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2004-11-11 11:09:11 +0000
committerDave Airlie <airlied@linux.ie>2004-11-11 11:09:11 +0000
commitf0a86288fa4d7b951f33f7b1a6ef36106c7df788 (patch)
tree8707efa038d18e563a4e2e415e5ba9c5249f5925 /shared-core/i915_irq.c
parent4b4df875b26bd08ae62f26b8ced6a050425752ac (diff)
patch from bug 1803 - will try and push to kernel soon
Diffstat (limited to 'shared-core/i915_irq.c')
-rw-r--r--shared-core/i915_irq.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c
index 04c627b9..bd649383 100644
--- a/shared-core/i915_irq.c
+++ b/shared-core/i915_irq.c
@@ -91,10 +91,7 @@ int i915_irq_emit(DRM_IOCTL_ARGS)
drm_i915_irq_emit_t emit;
int result;
- if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
- DRM_ERROR("i915_irq_emit called without lock held\n");
- return DRM_ERR(EINVAL);
- }
+ LOCK_TEST_WITH_RETURN(dev, filp);
if (!dev_priv) {
DRM_ERROR("%s called with no initialization\n", __FUNCTION__);