diff options
| author | Ben Skeggs | 2010-10-06 08:16:59 +0200 |
|---|---|---|
| committer | Ben Skeggs | 2010-12-03 06:05:18 +0100 |
| commit | cff5c1332486ced8ff4180e957e04983cb72a39e (patch) | |
| tree | ec1f6687156277632aef96693c1b8eca0c022b7c /drivers/gpu/drm/nouveau/nouveau_notifier.c | |
| parent | drm/nouveau: add per-channel mutex, use to lock access to drm's channel (diff) | |
| download | kernel-qcow2-linux-cff5c1332486ced8ff4180e957e04983cb72a39e.tar.gz kernel-qcow2-linux-cff5c1332486ced8ff4180e957e04983cb72a39e.tar.xz kernel-qcow2-linux-cff5c1332486ced8ff4180e957e04983cb72a39e.zip | |
drm/nouveau: add more fine-grained locking to channel list + structures
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_notifier.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_notifier.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_notifier.c b/drivers/gpu/drm/nouveau/nouveau_notifier.c index 2cc59f8c658b..2c5a1f66f7f0 100644 --- a/drivers/gpu/drm/nouveau/nouveau_notifier.c +++ b/drivers/gpu/drm/nouveau/nouveau_notifier.c @@ -185,11 +185,11 @@ nouveau_ioctl_notifier_alloc(struct drm_device *dev, void *data, struct nouveau_channel *chan; int ret; - NOUVEAU_GET_USER_CHANNEL_WITH_RETURN(na->channel, file_priv, chan); + chan = nouveau_channel_get(dev, file_priv, na->channel); + if (IS_ERR(chan)) + return PTR_ERR(chan); ret = nouveau_notifier_alloc(chan, na->handle, na->size, &na->offset); - if (ret) - return ret; - - return 0; + nouveau_channel_put(&chan); + return ret; } |