diff options
author | Marcin Slusarz <marcin.slusarz@gmail.com> | 2012-12-25 11:50:43 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2013-02-20 01:00:34 -0500 |
commit | a4cea27b6950885a743a4a000d5f2ea3fd445d25 (patch) | |
tree | a33de13c94bb3222bd72cb549b677c5e5b9e691a /drivers/gpu/drm/nouveau/nv10_fence.c | |
parent | a624bafbf11c098a859dba4118a33605bfd25788 (diff) |
drm/nouveau: share fence structures between nv10+ and nv50 implementations
We already rely on them having the same fields and layout.
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv10_fence.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nv10_fence.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/gpu/drm/nouveau/nv10_fence.c b/drivers/gpu/drm/nouveau/nv10_fence.c index 03017f24d593..a8ea4af3ca76 100644 --- a/drivers/gpu/drm/nouveau/nv10_fence.c +++ b/drivers/gpu/drm/nouveau/nv10_fence.c | |||
@@ -27,18 +27,7 @@ | |||
27 | 27 | ||
28 | #include "nouveau_drm.h" | 28 | #include "nouveau_drm.h" |
29 | #include "nouveau_dma.h" | 29 | #include "nouveau_dma.h" |
30 | #include "nouveau_fence.h" | 30 | #include "nv10_fence.h" |
31 | |||
32 | struct nv10_fence_chan { | ||
33 | struct nouveau_fence_chan base; | ||
34 | }; | ||
35 | |||
36 | struct nv10_fence_priv { | ||
37 | struct nouveau_fence_priv base; | ||
38 | struct nouveau_bo *bo; | ||
39 | spinlock_t lock; | ||
40 | u32 sequence; | ||
41 | }; | ||
42 | 31 | ||
43 | int | 32 | int |
44 | nv10_fence_emit(struct nouveau_fence *fence) | 33 | nv10_fence_emit(struct nouveau_fence *fence) |