diff options
author | Ben Skeggs | 2011-04-06 05:28:35 +0200 |
---|---|---|
committer | Ben Skeggs | 2011-04-20 00:50:14 +0200 |
commit | 04eb34a43ce5168e05e2748bd46a62a09289cdde (patch) | |
tree | 4a5bfe56c631889075416d18b6b513d1eaeb37ed /drivers/gpu/drm/nouveau/nouveau_state.c | |
parent | drm/radeon/kms: adjust evergreen display watermark setup (diff) | |
download | kernel-qcow2-linux-04eb34a43ce5168e05e2748bd46a62a09289cdde.tar.gz kernel-qcow2-linux-04eb34a43ce5168e05e2748bd46a62a09289cdde.tar.xz kernel-qcow2-linux-04eb34a43ce5168e05e2748bd46a62a09289cdde.zip |
drm/nouveau: split ramin_lock into two locks, one hardirq safe
Fixes a possible lock ordering reversal between context_switch_lock
and ramin_lock.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_state.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_state.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index 6e2b1a6caa2d..a30adec5beaa 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c @@ -608,6 +608,7 @@ nouveau_card_init(struct drm_device *dev) spin_lock_init(&dev_priv->channels.lock); spin_lock_init(&dev_priv->tile.lock); spin_lock_init(&dev_priv->context_switch_lock); + spin_lock_init(&dev_priv->vm_lock); /* Make the CRTCs and I2C buses accessible */ ret = engine->display.early_init(dev); |