summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorDave Airlie <airlied@pegasus.(none)>2007-07-25 14:32:15 +1000
committerDave Airlie <airlied@pegasus.(none)>2007-08-01 10:12:36 +1000
commitc395d27a725f170645704bfc0d27b1e935b53c83 (patch)
treeab7e124d5f28b86e145453b2097ea3af72368fbd /linux-core
parent283eaa25594347267df4e6e5eedbb9d17bb3682c (diff)
drm/fence: shut up lockdep
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/drm_fence.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/linux-core/drm_fence.c b/linux-core/drm_fence.c
index fdb2a4db..2f16f7ef 100644
--- a/linux-core/drm_fence.c
+++ b/linux-core/drm_fence.c
@@ -520,9 +520,10 @@ void drm_fence_manager_init(struct drm_device * dev)
struct drm_fence_class_manager *class;
struct drm_fence_driver *fed = dev->driver->fence_driver;
int i;
+ unsigned long flags;
rwlock_init(&fm->lock);
- write_lock(&fm->lock);
+ write_lock_irqsave(&fm->lock, flags);
fm->initialized = 0;
if (!fed)
goto out_unlock;
@@ -541,7 +542,7 @@ void drm_fence_manager_init(struct drm_device * dev)
atomic_set(&fm->count, 0);
out_unlock:
- write_unlock(&fm->lock);
+ write_unlock_irqrestore(&fm->lock, flags);
}
void drm_fence_manager_takedown(struct drm_device * dev)