diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-07-19 04:51:42 +0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-10-03 07:12:54 +0400 |
| commit | e193b1d42c390bf1bff7fa02a5a1202b98e75601 (patch) | |
| tree | c31143ea95c00e8b49c12571b10a1b9a200bd490 /drivers/gpu/drm/nouveau/nouveau_drv.h | |
| parent | 66f247234d1c47da480f687b8104d8935d05b404 (diff) | |
| download | linux-e193b1d42c390bf1bff7fa02a5a1202b98e75601.tar.xz | |
drm/nouveau/fence: un-port from nouveau_exec_engine interfaces
Still the same code, but not an "engine" anymore. The fence code is more of
a policy decision rather than exposing mechanisms, so it's not appropriate
to port it to the new engine subsystem.
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.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index 290b7c2e2f79..42ea8ad5b911 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h @@ -133,7 +133,6 @@ enum nouveau_flags { #define NVOBJ_ENGINE_BSP 6 #define NVOBJ_ENGINE_VP 7 #define NVOBJ_ENGINE_FIFO 14 -#define NVOBJ_ENGINE_FENCE 15 #define NVOBJ_ENGINE_NR 16 #define NVOBJ_ENGINE_DISPLAY (NVOBJ_ENGINE_NR + 0) /*XXX*/ @@ -189,6 +188,7 @@ struct nouveau_channel { /* Execution engine contexts */ void *engctx[NVOBJ_ENGINE_NR]; + void *fence; /* NV50 VM */ struct nouveau_vm *vm; @@ -448,6 +448,7 @@ struct drm_nouveau_private { u32 crystal; struct nouveau_exec_engine *eng[NVOBJ_ENGINE_NR]; + struct list_head classes; struct nouveau_bo *vga_ram; @@ -467,6 +468,7 @@ struct drm_nouveau_private { } ttm; struct { + void *func; spinlock_t lock; struct drm_mm heap; struct nouveau_bo *bo; |