aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_drv.h
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-03-31 23:10:45 -0400
committerBen Skeggs <bskeggs@redhat.com>2011-05-15 20:48:33 -0400
commit96c50082904c7cefa3b01356f62268ee6d9e9f38 (patch)
treea735093f5a7a9f4489bae195bd0809e714ba70a2 /drivers/gpu/drm/nouveau/nouveau_drv.h
parent4976986bd4f51368890f57b964176ec532972543 (diff)
drm/nouveau: move set_tile_region to nouveau_exec_engine
In the very least VPE (PMPEG and friends) also has this style of tile region regs, lets make them just work if/when they get added. 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.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index fb33d4f096c5..413e2ba5e4d8 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -302,6 +302,7 @@ struct nouveau_exec_engine {
302 void (*context_del)(struct nouveau_channel *, int engine); 302 void (*context_del)(struct nouveau_channel *, int engine);
303 int (*object_new)(struct nouveau_channel *, int engine, 303 int (*object_new)(struct nouveau_channel *, int engine,
304 u32 handle, u16 class); 304 u32 handle, u16 class);
305 void (*set_tile_region)(struct drm_device *dev, int i);
305 void (*tlb_flush)(struct drm_device *, int engine); 306 void (*tlb_flush)(struct drm_device *, int engine);
306}; 307};
307 308
@@ -393,7 +394,6 @@ struct nouveau_pgraph_engine {
393 int (*object_new)(struct nouveau_channel *chan, u32 handle, u16 class); 394 int (*object_new)(struct nouveau_channel *chan, u32 handle, u16 class);
394 void (*tlb_flush)(struct drm_device *dev); 395 void (*tlb_flush)(struct drm_device *dev);
395 396
396 void (*set_tile_region)(struct drm_device *dev, int i);
397}; 397};
398 398
399struct nouveau_display_engine { 399struct nouveau_display_engine {
@@ -1151,18 +1151,15 @@ extern struct nouveau_bitfield nv04_graph_nsource[];
1151/* nv10_graph.c */ 1151/* nv10_graph.c */
1152extern int nv10_graph_create(struct drm_device *); 1152extern int nv10_graph_create(struct drm_device *);
1153extern struct nouveau_channel *nv10_graph_channel(struct drm_device *); 1153extern struct nouveau_channel *nv10_graph_channel(struct drm_device *);
1154extern void nv10_graph_set_tile_region(struct drm_device *dev, int i);
1155extern struct nouveau_bitfield nv10_graph_intr[]; 1154extern struct nouveau_bitfield nv10_graph_intr[];
1156extern struct nouveau_bitfield nv10_graph_nstatus[]; 1155extern struct nouveau_bitfield nv10_graph_nstatus[];
1157 1156
1158/* nv20_graph.c */ 1157/* nv20_graph.c */
1159extern int nv20_graph_create(struct drm_device *); 1158extern int nv20_graph_create(struct drm_device *);
1160extern void nv20_graph_set_tile_region(struct drm_device *dev, int i);
1161 1159
1162/* nv40_graph.c */ 1160/* nv40_graph.c */
1163extern int nv40_graph_create(struct drm_device *); 1161extern int nv40_graph_create(struct drm_device *);
1164extern void nv40_grctx_init(struct nouveau_grctx *); 1162extern void nv40_grctx_init(struct nouveau_grctx *);
1165extern void nv40_graph_set_tile_region(struct drm_device *dev, int i);
1166 1163
1167/* nv50_graph.c */ 1164/* nv50_graph.c */
1168extern int nv50_graph_create(struct drm_device *); 1165extern int nv50_graph_create(struct drm_device *);