diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 20:47:41 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 20:47:41 +0000 |
| commit | 58a273745fbb2fbd01d26e7a60f0acc8c1d99469 (patch) | |
| tree | bc16200f3b6ea150b298422754e32959eaa339bc /drivers/gpu/drm/nouveau/nouveau_channel.c | |
| parent | 951c486f62490e032da0ad17e93270b0cfb6687f (diff) | |
| parent | 0116da4fcc1ae8a80d9002441e98768f2a6fa2fe (diff) | |
Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_channel.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_channel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c index a319d5646ea9..bb6ec9ef8676 100644 --- a/drivers/gpu/drm/nouveau/nouveau_channel.c +++ b/drivers/gpu/drm/nouveau/nouveau_channel.c @@ -158,6 +158,7 @@ nouveau_channel_alloc(struct drm_device *dev, struct nouveau_channel **chan_ret, INIT_LIST_HEAD(&chan->nvsw.vbl_wait); INIT_LIST_HEAD(&chan->nvsw.flip); INIT_LIST_HEAD(&chan->fence.pending); + spin_lock_init(&chan->fence.lock); /* setup channel's memory and vm */ ret = nouveau_gpuobj_channel_init(chan, vram_handle, gart_handle); |