aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_drv.h
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-03-17 20:25:59 -0400
committerBen Skeggs <bskeggs@redhat.com>2011-05-15 20:48:48 -0400
commit7ff5441e55feb1f6f38c39f32f31aa8a0e8f4b69 (patch)
tree59c10167be68dcca3e71a5215246502feb51f4a2 /drivers/gpu/drm/nouveau/nouveau_drv.h
parenta82dd49f14742e2529f79feb6360e0993277e788 (diff)
drm/nva3: implement support for copy engine
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.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index 3f90f3891f59..78db2850d9ea 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -151,6 +151,8 @@ enum nouveau_flags {
151#define NVOBJ_ENGINE_SW 0 151#define NVOBJ_ENGINE_SW 0
152#define NVOBJ_ENGINE_GR 1 152#define NVOBJ_ENGINE_GR 1
153#define NVOBJ_ENGINE_CRYPT 2 153#define NVOBJ_ENGINE_CRYPT 2
154#define NVOBJ_ENGINE_COPY0 3
155#define NVOBJ_ENGINE_COPY1 4
154#define NVOBJ_ENGINE_DISPLAY 15 156#define NVOBJ_ENGINE_DISPLAY 15
155#define NVOBJ_ENGINE_NR 16 157#define NVOBJ_ENGINE_NR 16
156 158
@@ -1137,6 +1139,7 @@ extern void nv40_grctx_init(struct nouveau_grctx *);
1137extern int nv50_graph_create(struct drm_device *); 1139extern int nv50_graph_create(struct drm_device *);
1138extern int nv50_grctx_init(struct nouveau_grctx *); 1140extern int nv50_grctx_init(struct nouveau_grctx *);
1139extern struct nouveau_enum nv50_data_error_names[]; 1141extern struct nouveau_enum nv50_data_error_names[];
1142extern int nv50_graph_isr_chid(struct drm_device *dev, u64 inst);
1140 1143
1141/* nvc0_graph.c */ 1144/* nvc0_graph.c */
1142extern int nvc0_graph_create(struct drm_device *); 1145extern int nvc0_graph_create(struct drm_device *);
@@ -1144,6 +1147,12 @@ extern int nvc0_graph_create(struct drm_device *);
1144/* nv84_crypt.c */ 1147/* nv84_crypt.c */
1145extern int nv84_crypt_create(struct drm_device *); 1148extern int nv84_crypt_create(struct drm_device *);
1146 1149
1150/* nva3_copy.c */
1151extern int nva3_copy_create(struct drm_device *dev);
1152
1153/* nvc0_copy.c */
1154extern int nvc0_copy_create(struct drm_device *dev, int engine);
1155
1147/* nv04_instmem.c */ 1156/* nv04_instmem.c */
1148extern int nv04_instmem_init(struct drm_device *); 1157extern int nv04_instmem_init(struct drm_device *);
1149extern void nv04_instmem_takedown(struct drm_device *); 1158extern void nv04_instmem_takedown(struct drm_device *);