aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_drv.h
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-05-30 22:00:43 -0400
committerBen Skeggs <bskeggs@redhat.com>2010-07-12 20:14:04 -0400
commit047d1d3cae2c4fc5be4fa20a97c8f5ba4fea1c56 (patch)
tree3deb5577cf97e1b9ce4f9ebb57fed56302be6e25 /drivers/gpu/drm/nouveau/nouveau_drv.h
parentca6adb8a217fc2a6f20a50b400ba676481a90945 (diff)
drm/nouveau: reduce usage of fence spinlock to when absolutely necessary
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drv.h')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_drv.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index 47fa28ddec7..587a0ab1fe6 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -188,7 +188,7 @@ struct nouveau_channel {
188 struct list_head pending; 188 struct list_head pending;
189 uint32_t sequence; 189 uint32_t sequence;
190 uint32_t sequence_ack; 190 uint32_t sequence_ack;
191 uint32_t last_sequence_irq; 191 atomic_t last_sequence_irq;
192 } fence; 192 } fence;
193 193
194 /* DMA push buffer */ 194 /* DMA push buffer */
@@ -1111,7 +1111,6 @@ extern int nouveau_fence_wait(void *obj, void *arg, bool lazy, bool intr);
1111extern int nouveau_fence_flush(void *obj, void *arg); 1111extern int nouveau_fence_flush(void *obj, void *arg);
1112extern void nouveau_fence_unref(void **obj); 1112extern void nouveau_fence_unref(void **obj);
1113extern void *nouveau_fence_ref(void *obj); 1113extern void *nouveau_fence_ref(void *obj);
1114extern void nouveau_fence_handler(struct drm_device *dev, int channel);
1115 1114
1116/* nouveau_gem.c */ 1115/* nouveau_gem.c */
1117extern int nouveau_gem_new(struct drm_device *, struct nouveau_channel *, 1116extern int nouveau_gem_new(struct drm_device *, struct nouveau_channel *,