summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2010-10-18 03:01:34 +0200
committerBen Skeggs <bskeggs@redhat.com>2010-12-03 15:06:40 +1000
commit36c952e8b3bad911ef13111058f0a5c4b361027e (patch)
tree1066c8048834958a44ef47cf4f9a03e5a699ed2b
parentfeeb0aecfb73b5b7699c0a85ba1650e6f9c50be2 (diff)
downloadblackbird-op-linux-36c952e8b3bad911ef13111058f0a5c4b361027e.tar.gz
blackbird-op-linux-36c952e8b3bad911ef13111058f0a5c4b361027e.zip
drm/nouveau: Fix lock unbalance on card take down.
Signed-off-by: Francisco Jerez <currojerez@riseup.net> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_state.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index 1a4ba6ccafb1..af203cc5d7ad 100644
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -714,7 +714,7 @@ static void nouveau_card_takedown(struct drm_device *dev)
if (!engine->graph.accel_blocked) {
nouveau_fence_fini(dev);
- nouveau_channel_put(&dev_priv->channel);
+ nouveau_channel_put_unlocked(&dev_priv->channel);
}
if (!nouveau_noaccel) {
OpenPOWER on IntegriCloud