diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2012-04-19 21:54:33 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2012-05-24 02:31:58 -0400 |
commit | d58086deaa32dc5e630aab222851b282f77e00bb (patch) | |
tree | 2fab5eec82dcc5fa89d7d4e876cc6e561a30cc53 /drivers/gpu/drm/nouveau/nouveau_drv.h | |
parent | a8f81837c506aba186b42f0c67633e85851395b1 (diff) |
drm/nv40-50/gr: restructure grctx/prog generation
The conditional definition of the generation helper functions apparently
confuses some IDEs....
Reported-by: Marcin Slusarz <marcin.slusarz@gmail.com>
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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index 7dd344a597a8..87619a94fa42 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h | |||
@@ -1286,13 +1286,15 @@ extern int nv20_graph_create(struct drm_device *); | |||
1286 | 1286 | ||
1287 | /* nv40_graph.c */ | 1287 | /* nv40_graph.c */ |
1288 | extern int nv40_graph_create(struct drm_device *); | 1288 | extern int nv40_graph_create(struct drm_device *); |
1289 | extern void nv40_grctx_init(struct nouveau_grctx *); | 1289 | extern void nv40_grctx_init(struct drm_device *, u32 *size); |
1290 | extern void nv40_grctx_fill(struct drm_device *, struct nouveau_gpuobj *); | ||
1290 | 1291 | ||
1291 | /* nv50_graph.c */ | 1292 | /* nv50_graph.c */ |
1292 | extern int nv50_graph_create(struct drm_device *); | 1293 | extern int nv50_graph_create(struct drm_device *); |
1293 | extern int nv50_grctx_init(struct nouveau_grctx *); | ||
1294 | extern struct nouveau_enum nv50_data_error_names[]; | 1294 | extern struct nouveau_enum nv50_data_error_names[]; |
1295 | extern int nv50_graph_isr_chid(struct drm_device *dev, u64 inst); | 1295 | extern int nv50_graph_isr_chid(struct drm_device *dev, u64 inst); |
1296 | extern int nv50_grctx_init(struct drm_device *, u32 *, u32, u32 *, u32 *); | ||
1297 | extern void nv50_grctx_fill(struct drm_device *, struct nouveau_gpuobj *); | ||
1296 | 1298 | ||
1297 | /* nvc0_graph.c */ | 1299 | /* nvc0_graph.c */ |
1298 | extern int nvc0_graph_create(struct drm_device *); | 1300 | extern int nvc0_graph_create(struct drm_device *); |