summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nv10_fence.c
diff options
context:
space:
mode:
authorMarcin Slusarz <marcin.slusarz@gmail.com>2012-12-25 17:50:43 +0100
committerBen Skeggs <bskeggs@redhat.com>2013-02-20 16:00:34 +1000
commita4cea27b6950885a743a4a000d5f2ea3fd445d25 (patch)
treea33de13c94bb3222bd72cb549b677c5e5b9e691a /drivers/gpu/drm/nouveau/nv10_fence.c
parenta624bafbf11c098a859dba4118a33605bfd25788 (diff)
downloadop-kernel-dev-a4cea27b6950885a743a4a000d5f2ea3fd445d25.zip
op-kernel-dev-a4cea27b6950885a743a4a000d5f2ea3fd445d25.tar.gz
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.c13
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 03017f2..a8ea4af 100644
--- a/drivers/gpu/drm/nouveau/nv10_fence.c
+++ b/drivers/gpu/drm/nouveau/nv10_fence.c
@@ -27,18 +27,7 @@
#include "nouveau_drm.h"
#include "nouveau_dma.h"
-#include "nouveau_fence.h"
-
-struct nv10_fence_chan {
- struct nouveau_fence_chan base;
-};
-
-struct nv10_fence_priv {
- struct nouveau_fence_priv base;
- struct nouveau_bo *bo;
- spinlock_t lock;
- u32 sequence;
-};
+#include "nv10_fence.h"
int
nv10_fence_emit(struct nouveau_fence *fence)
OpenPOWER on IntegriCloud