summaryrefslogtreecommitdiff
path: root/linux-core/via_fence.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2008-02-13 15:19:42 +1000
committerDave Airlie <airlied@redhat.com>2008-02-13 15:19:42 +1000
commit0fbee62ec14d08714dbc558dd20cc00b9a79c042 (patch)
tree95d631c4a6d1bc0b42a4094c1340095d36b0cf96 /linux-core/via_fence.c
parentdb85ed25afc616acfaadb21facf6066354f9d490 (diff)
major port of multi-master ideas into modesetting
Diffstat (limited to 'linux-core/via_fence.c')
-rw-r--r--linux-core/via_fence.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-core/via_fence.c b/linux-core/via_fence.c
index 9af1bf3b..b853df5c 100644
--- a/linux-core/via_fence.c
+++ b/linux-core/via_fence.c
@@ -69,7 +69,7 @@ static uint32_t via_perform_flush(struct drm_device *dev, uint32_t class)
if (!dev_priv->have_idlelock) {
- drm_idlelock_take(&dev->lock);
+ drm_idlelock_take(&dev->primary->master->lock);
dev_priv->have_idlelock = 1;
}
@@ -95,7 +95,7 @@ static uint32_t via_perform_flush(struct drm_device *dev, uint32_t class)
if (signaled_flush_types) {
pending_flush_types &= ~signaled_flush_types;
if (!pending_flush_types && dev_priv->have_idlelock) {
- drm_idlelock_release(&dev->lock);
+ drm_idlelock_release(&dev->primary->master->lock);
dev_priv->have_idlelock = 0;
}
drm_fence_handler(dev, 0, dev_priv->emit_0_sequence,